New crd version

ExpediaGroup · Jan 30, 2024 · 2984d0b · 2984d0b
1 parent 012b188
commit 2984d0b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/api/v1beta1/groupversion_info.go b/api/v1beta1/groupversion_info.go
@@ -15,7 +15,7 @@
 // Package v1alpha2 contains API Schema definitions for the core v1alpha2 API group
 // +kubebuilder:object:generate=true
 // +groupName=core.expediagroup.com
-// +versionName:=v1alpha2
+// +versionName:=v1beta1
 package v1beta1
 
 import (
@@ -25,7 +25,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "core.expediagroup.com", Version: "v1alpha2"}
+	GroupVersion = schema.GroupVersion{Group: "core.expediagroup.com", Version: "v1beta1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/config/crd/bases/core.expediagroup.com_applications.yaml b/config/crd/bases/core.expediagroup.com_applications.yaml
@@ -18,15 +18,6 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .status.conditions[?(@.type=="Ready")].status
-      name: Ready
-      type: string
-    - jsonPath: .status.conditions[?(@.type=="Ready")].message
-      name: Status
-      type: string
-    - jsonPath: .metadata.creationTimestamp
-      name: Age
-      type: date
     - jsonPath: .status.conditions[?(@.type=="Ready")].status
       name: Ready
       type: string
@@ -1076,10 +1067,20 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
-  - name: v1alpha2
+  - additionalPrinterColumns:
+    - jsonPath: .status.conditions[?(@.type=="Ready")].status
+      name: Ready
+      type: string
+    - jsonPath: .status.conditions[?(@.type=="Ready")].message
+      name: Status
+      type: string
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: Application is the Schema for the applications API
@@ -2137,7 +2138,9 @@ spec:
             type: object
         type: object
     served: true
-    storage: false
+    storage: true
+    subresources:
+      status: {}
 status:
   acceptedNames:
     kind: ""

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -17,6 +17,7 @@ package controllers
 import (
 	"context"
 	"github.com/ExpediaGroup/overwhelm/api/v1alpha2"
+	"github.com/ExpediaGroup/overwhelm/api/v1beta1"
 	"github.com/fluxcd/helm-controller/api/v2beta2"
 	"k8s.io/client-go/kubernetes/scheme"
 	"path/filepath"
@@ -68,6 +69,8 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	err = v1alpha2.AddToScheme(k8sManager.GetScheme())
 	Expect(err).NotTo(HaveOccurred())
+	err = v1beta1.AddToScheme(k8sManager.GetScheme())
+	Expect(err).NotTo(HaveOccurred())
 
 	//+kubebuilder:scaffold:scheme
 	k8sClient, err = client.New(cfg, client.Options{Scheme: k8sManager.GetScheme()})