Reintroduce the removal of validation.openAPIV3Schema.type

elastic · Jan 29, 2020 · e16b65b · e16b65b
1 parent f43e49e
commit e16b65b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/config/crds/all-crds.yaml b/config/crds/all-crds.yaml
@@ -393,7 +393,6 @@ spec:
                 connect to.
               type: string
           type: object
-      type: object
   version: v1
   versions:
   - name: v1
@@ -1123,7 +1122,6 @@ spec:
                 is in from the controller point of view.
               type: string
           type: object
-      type: object
   version: v1
   versions:
   - name: v1
@@ -1526,7 +1524,6 @@ spec:
               description: KibanaHealth expresses the status of the Kibana instances.
               type: string
           type: object
-      type: object
   version: v1
   versions:
   - name: v1

diff --git a/config/crds/patches/apm-kibana-patches.yaml b/config/crds/patches/apm-kibana-patches.yaml
@@ -8,6 +8,12 @@
   path: /spec/validation
 - op: remove
   path: /spec/versions/1/schema
+# Remove validation.openAPIV3Schema.type that causes failures on k8s 1.11.
+# This should have been fixed with https://github.com/kubernetes-sigs/controller-tools/pull/72, but it looks like
+# this commit has been lost in history. See https://github.com/kubernetes-sigs/controller-tools/issues/296.
+# TODO: remove once fixed in controller-tools
+- op: remove
+  path: /spec/validation/openAPIV3Schema/type
 # Using `kubectl apply` stores the complete CRD file as an annotation,
 # which may be too big for the annotations size limit.
 # One way to mitigate this problem is to remove the (huge) podTemplate properties from the CRD.

diff --git a/config/crds/patches/elasticsearch-patches.yaml b/config/crds/patches/elasticsearch-patches.yaml
@@ -8,6 +8,12 @@
   path: /spec/validation
 - op: remove
   path: /spec/versions/1/schema
+# Remove validation.openAPIV3Schema.type that causes failures on k8s 1.11.
+# This should have been fixed with https://github.com/kubernetes-sigs/controller-tools/pull/72, but it looks like
+# this commit has been lost in history. See https://github.com/kubernetes-sigs/controller-tools/issues/296.
+# TODO: remove once fixed in controller-tools
+- op: remove
+  path: /spec/validation/openAPIV3Schema/type
 # Using `kubectl apply` stores the complete CRD file as an annotation,
 # which may be too big for the annotations size limit.
 # One way to mitigate this problem is to remove the (huge) podTemplate properties from the CRD.