From ca98b0ca20b200d21676dd5db71095f2f0e5cfae Mon Sep 17 00:00:00 2001 From: Michael Morello Date: Thu, 19 Aug 2021 07:47:01 +0200 Subject: [PATCH] CRD: Remove x-kubernetes-preserve-unknown-fields from volumeClaimTemplates (#4768) (#4772) --- config/crds/v1/all-crds.yaml | 1 - .../bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml | 1 - .../bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml | 1 - config/crds/v1beta1/patches/elasticsearch-patches.yaml | 4 +--- .../charts/eck-operator-crds/templates/all-crds.yaml | 1 - pkg/apis/elasticsearch/v1/elasticsearch_types.go | 1 - 6 files changed, 1 insertion(+), 8 deletions(-) diff --git a/config/crds/v1/all-crds.yaml b/config/crds/v1/all-crds.yaml index 0d9c2ab6c7..bb99309988 100644 --- a/config/crds/v1/all-crds.yaml +++ b/config/crds/v1/all-crds.yaml @@ -3894,7 +3894,6 @@ spec: type: object type: object type: array - x-kubernetes-preserve-unknown-fields: true required: - name type: object diff --git a/config/crds/v1/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml b/config/crds/v1/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml index aa2ed0bd42..776d4a595b 100644 --- a/config/crds/v1/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml +++ b/config/crds/v1/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml @@ -8057,7 +8057,6 @@ spec: type: object type: object type: array - x-kubernetes-preserve-unknown-fields: true required: - name type: object diff --git a/config/crds/v1beta1/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml b/config/crds/v1beta1/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml index 501c5f94ad..12f5dabe9e 100644 --- a/config/crds/v1beta1/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml +++ b/config/crds/v1beta1/bases/elasticsearch.k8s.elastic.co_elasticsearches.yaml @@ -7988,7 +7988,6 @@ spec: type: object type: object type: array - x-kubernetes-preserve-unknown-fields: true required: - name type: object diff --git a/config/crds/v1beta1/patches/elasticsearch-patches.yaml b/config/crds/v1beta1/patches/elasticsearch-patches.yaml index 14aafd5712..3f086a228d 100644 --- a/config/crds/v1beta1/patches/elasticsearch-patches.yaml +++ b/config/crds/v1beta1/patches/elasticsearch-patches.yaml @@ -70,6 +70,4 @@ - op: remove path: /spec/validation/openAPIV3Schema/properties/spec/properties/nodeSets/items/properties/config/x-kubernetes-preserve-unknown-fields - op: remove - path: /spec/validation/openAPIV3Schema/properties/spec/properties/nodeSets/items/properties/podTemplate/x-kubernetes-preserve-unknown-fields -- op: remove - path: /spec/validation/openAPIV3Schema/properties/spec/properties/nodeSets/items/properties/volumeClaimTemplates/x-kubernetes-preserve-unknown-fields \ No newline at end of file + path: /spec/validation/openAPIV3Schema/properties/spec/properties/nodeSets/items/properties/podTemplate/x-kubernetes-preserve-unknown-fields \ No newline at end of file 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 index 638d18ac81..07574277fa 100644 --- a/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml +++ b/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml @@ -3927,7 +3927,6 @@ spec: type: object type: object type: array - x-kubernetes-preserve-unknown-fields: true required: - name type: object diff --git a/pkg/apis/elasticsearch/v1/elasticsearch_types.go b/pkg/apis/elasticsearch/v1/elasticsearch_types.go index 564411d139..a4dc1b982c 100644 --- a/pkg/apis/elasticsearch/v1/elasticsearch_types.go +++ b/pkg/apis/elasticsearch/v1/elasticsearch_types.go @@ -284,7 +284,6 @@ type NodeSet struct { // Every claim in this list must have a matching volumeMount in one of the containers defined in the PodTemplate. // Items defined here take precedence over any default claims added by the operator with the same name. // +kubebuilder:validation:Optional - // +kubebuilder:pruning:PreserveUnknownFields VolumeClaimTemplates []corev1.PersistentVolumeClaim `json:"volumeClaimTemplates,omitempty"` }