refactor: v1beta3 as storage version

Signed-off-by: KevFan <[email protected]>
Kuadrant · Oct 3, 2024 · ae2dc81 · ae2dc81
1 parent 7df9885
commit ae2dc81
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -155,7 +155,7 @@ report-benchmarks:
 cover: ## Shows test coverage
 	go tool cover -html=cover.out
 
-AUTHCONFIG_VERSION ?= v1beta2
+AUTHCONFIG_VERSION ?= v1beta3
 VERBOSE ?= 0
 e2e: ## Runs the end-to-end tests on a local environment setup
 	$(MAKE) local-setup NAMESPACE=authorino KIND_CLUSTER_NAME=authorino-e2e AUTHORINO_IMAGE=$(AUTHORINO_IMAGE) TLS_ENABLED=$(TLS_ENABLED) OPERATOR_BRANCH=$(OPERATOR_BRANCH) AUTHORINO_MANIFESTS=$(AUTHORINO_MANIFESTS) AUTHORINO_INSTANCE=$(AUTHORINO_INSTANCE) ENVOY_OVERLAY=$(ENVOY_OVERLAY) DEPLOY_KEYCLOAK=1 FF=1

diff --git a/api/v1beta2/auth_config_types.go b/api/v1beta2/auth_config_types.go
@@ -91,7 +91,6 @@ type StatusConditionType string
 // AuthConfig is the schema for Authorino's AuthConfig API
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:storageversion
 // +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.summary.ready`,description="Ready for all hosts"
 // +kubebuilder:printcolumn:name="Hosts",type=string,JSONPath=`.status.summary.numHostsReady`,description="Number of hosts ready"
 // +kubebuilder:printcolumn:name="Authentication",type=integer,JSONPath=`.status.summary.numIdentitySources`,description="Number of trusted identity sources",priority=2

diff --git a/api/v1beta3/auth_config_types.go b/api/v1beta3/auth_config_types.go
@@ -91,6 +91,7 @@ type StatusConditionType string
 // AuthConfig is the schema for Authorino's AuthConfig API
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:storageversion
 // +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.summary.ready`,description="Ready for all hosts"
 // +kubebuilder:printcolumn:name="Hosts",type=string,JSONPath=`.status.summary.numHostsReady`,description="Number of hosts ready"
 // +kubebuilder:printcolumn:name="Authentication",type=integer,JSONPath=`.status.summary.numIdentitySources`,description="Number of trusted identity sources",priority=2

diff --git a/controllers/auth_config_controller.go b/controllers/auth_config_controller.go
@@ -22,7 +22,7 @@ import (
 	"sort"
 	"sync"
 
-	api "github.com/kuadrant/authorino/api/v1beta2"
+	api "github.com/kuadrant/authorino/api/v1beta3"
 	"github.com/kuadrant/authorino/pkg/auth"
 	"github.com/kuadrant/authorino/pkg/evaluators"
 	authorization_evaluators "github.com/kuadrant/authorino/pkg/evaluators/authorization"

diff --git a/controllers/auth_config_controller_test.go b/controllers/auth_config_controller_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	api "github.com/kuadrant/authorino/api/v1beta2"
+	api "github.com/kuadrant/authorino/api/v1beta3"
 	"github.com/kuadrant/authorino/pkg/evaluators"
 	"github.com/kuadrant/authorino/pkg/httptest"
 	"github.com/kuadrant/authorino/pkg/index"

diff --git a/controllers/auth_config_status_updater.go b/controllers/auth_config_status_updater.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 	"strings"
 
-	api "github.com/kuadrant/authorino/api/v1beta2"
+	api "github.com/kuadrant/authorino/api/v1beta3"
 	"github.com/kuadrant/authorino/pkg/log"
 	"github.com/kuadrant/authorino/pkg/utils"
 

diff --git a/controllers/auth_config_status_updater_test.go b/controllers/auth_config_status_updater_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	api "github.com/kuadrant/authorino/api/v1beta2"
+	api "github.com/kuadrant/authorino/api/v1beta3"
 	"github.com/kuadrant/authorino/pkg/log"
 
 	"github.com/golang/mock/gomock"

diff --git a/install/crd/authorino.kuadrant.io_authconfigs.yaml b/install/crd/authorino.kuadrant.io_authconfigs.yaml
@@ -2313,7 +2313,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
   - additionalPrinterColumns:
@@ -4615,6 +4615,6 @@ spec:
             type: object
         type: object
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
diff --git a/install/manifests.yaml b/install/manifests.yaml
@@ -2544,7 +2544,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
   - additionalPrinterColumns:
@@ -5078,7 +5078,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
 ---