Add v1alpha1/[es|kb|apm] versions in v1 crds (#4679) (#4681)

elastic · Jul 26, 2021 · 6a838bf · 6a838bf
1 parent c1c184f
commit 6a838bf
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 4 deletions.
diff --git a/config/crds/v1/all-crds.yaml b/config/crds/v1/all-crds.yaml
@@ -2048,6 +2048,15 @@ spec:
     storage: false
     subresources:
       status: {}
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: to not break compatibility when upgrading from previous versions
+          of the CRD
+        properties: {}
+        type: object
+    served: false
+    storage: false
 status:
   acceptedNames:
     kind: ""
@@ -5519,6 +5528,15 @@ spec:
     storage: false
     subresources:
       status: {}
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: to not break compatibility when upgrading from previous versions
+          of the CRD
+        properties: {}
+        type: object
+    served: false
+    storage: false
 status:
   acceptedNames:
     kind: ""
@@ -7975,6 +7993,15 @@ spec:
     storage: false
     subresources:
       status: {}
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: to not break compatibility when upgrading from previous versions
+          of the CRD
+        properties: {}
+        type: object
+    served: false
+    storage: false
 status:
   acceptedNames:
     kind: ""

diff --git a/config/crds/v1/patches/add-empty-v1alpha1-patch.yaml b/config/crds/v1/patches/add-empty-v1alpha1-patch.yaml
@@ -0,0 +1,13 @@
+# Add v1alpha1 to the list of versions, to not break compatibility when upgrading from previous versions of the CRD
+# that list the v1alpha1 version in their status.storedVersions. We mark it as `served: false` so it cannot be used.
+- op: add
+  path: /spec/versions/-
+  value:
+    name: v1alpha1
+    served: false
+    storage: false
+    schema:
+      openAPIV3Schema:
+        properties: {}
+        type: object
+        description: "to not break compatibility when upgrading from previous versions of the CRD"
diff --git a/config/crds/v1/patches/kustomization.yaml b/config/crds/v1/patches/kustomization.yaml
@@ -2,6 +2,25 @@ bases:
   - ../bases
 
 patchesJson6902:
+  # patch that apply to CRDS which might have been installed in v1alpha1 version
+  - target:
+      group: apiextensions.k8s.io
+      version: v1
+      kind: CustomResourceDefinition
+      name: apmservers.apm.k8s.elastic.co
+    path: add-empty-v1alpha1-patch.yaml
+  - target:
+      group: apiextensions.k8s.io
+      version: v1
+      kind: CustomResourceDefinition
+      name: elasticsearches.elasticsearch.k8s.elastic.co
+    path: add-empty-v1alpha1-patch.yaml
+  - target:
+      group: apiextensions.k8s.io
+      version: v1
+      kind: CustomResourceDefinition
+      name: kibanas.kibana.k8s.elastic.co
+    path: add-empty-v1alpha1-patch.yaml
   # custom patches for APM
   - target:
       group: apiextensions.k8s.io

diff --git a/config/crds/v1beta1/patches/all-patches.yaml → ...ta1/patches/add-empty-v1alpha1-patch.yaml b/config/crds/v1beta1/patches/all-patches.yaml → ...ta1/patches/add-empty-v1alpha1-patch.yaml
diff --git a/config/crds/v1beta1/patches/kustomization.yaml b/config/crds/v1beta1/patches/kustomization.yaml
@@ -2,25 +2,25 @@ bases:
   - ../bases
 
 patchesJson6902:
-  # patches that apply to all CRDS
+  # patch that apply to CRDS which might have been installed in v1alpha1 version
   - target:
       group: apiextensions.k8s.io
       version: v1beta1
       kind: CustomResourceDefinition
       name: apmservers.apm.k8s.elastic.co
-    path: all-patches.yaml
+    path: add-empty-v1alpha1-patch.yaml
   - target:
       group: apiextensions.k8s.io
       version: v1beta1
       kind: CustomResourceDefinition
       name: elasticsearches.elasticsearch.k8s.elastic.co
-    path: all-patches.yaml
+    path: add-empty-v1alpha1-patch.yaml
   - target:
       group: apiextensions.k8s.io
       version: v1beta1
       kind: CustomResourceDefinition
       name: kibanas.kibana.k8s.elastic.co
-    path: all-patches.yaml
+    path: add-empty-v1alpha1-patch.yaml
   # custom patches for apm
   - target:
       group: apiextensions.k8s.io

diff --git a/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml b/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml
@@ -2063,6 +2063,15 @@ spec:
     storage: false
     subresources:
       status: {}
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: to not break compatibility when upgrading from previous versions
+          of the CRD
+        properties: {}
+        type: object
+    served: false
+    storage: false
 status:
   acceptedNames:
     kind: ""
@@ -5552,6 +5561,15 @@ spec:
     storage: false
     subresources:
       status: {}
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: to not break compatibility when upgrading from previous versions
+          of the CRD
+        properties: {}
+        type: object
+    served: false
+    storage: false
 status:
   acceptedNames:
     kind: ""
@@ -8020,6 +8038,15 @@ spec:
     storage: false
     subresources:
       status: {}
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        description: to not break compatibility when upgrading from previous versions
+          of the CRD
+        properties: {}
+        type: object
+    served: false
+    storage: false
 status:
   acceptedNames:
     kind: ""