Fix conversionReviewVersions for CRDs

giantswarm · Jul 9, 2024 · 352c6fe · 352c6fe
1 parent 4ec7509
commit 352c6fe
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Stop overwriting `conversionReviewVersions` in CRDs and use the upstream versions.
+
 ## [1.20.0] - 2024-06-11
 
 ### Changed

diff --git a/config/helm/patches/crds/bootstrap.yaml b/config/helm/patches/crds/bootstrap.yaml
@@ -11,9 +11,6 @@ spec:
   conversion:
     strategy: Webhook
     webhook:
-      conversionReviewVersions:
-      - v1
-      - v1beta1
       clientConfig:
         caBundle: Cg==
         service:

diff --git a/config/helm/patches/crds/controlplane.yaml b/config/helm/patches/crds/controlplane.yaml
@@ -11,9 +11,6 @@ spec:
   conversion:
     strategy: Webhook
     webhook:
-      conversionReviewVersions:
-      - v1
-      - v1beta1
       clientConfig:
         caBundle: Cg==
         service:

diff --git a/config/helm/patches/crds/core.yaml b/config/helm/patches/crds/core.yaml
@@ -11,9 +11,6 @@ spec:
   conversion:
     strategy: Webhook
     webhook:
-      conversionReviewVersions:
-      - v1
-      - v1beta1
       clientConfig:
         caBundle: Cg==
         service:

diff --git a/helm/cluster-api/files/core/bases/extensionconfigs.runtime.cluster.x-k8s.io.yaml b/helm/cluster-api/files/core/bases/extensionconfigs.runtime.cluster.x-k8s.io.yaml
@@ -27,9 +27,6 @@ spec:
           namespace: '{{ .Release.Namespace }}'
           path: /convert
           port: 443
-      conversionReviewVersions:
-        - v1
-        - v1beta1
   group: runtime.cluster.x-k8s.io
   names:
     categories:

diff --git a/helm/cluster-api/files/core/bases/ipaddressclaims.ipam.cluster.x-k8s.io.yaml b/helm/cluster-api/files/core/bases/ipaddressclaims.ipam.cluster.x-k8s.io.yaml
@@ -27,9 +27,6 @@ spec:
           namespace: '{{ .Release.Namespace }}'
           path: /convert
           port: 443
-      conversionReviewVersions:
-        - v1
-        - v1beta1
   group: ipam.cluster.x-k8s.io
   names:
     categories:

diff --git a/helm/cluster-api/files/core/bases/ipaddresses.ipam.cluster.x-k8s.io.yaml b/helm/cluster-api/files/core/bases/ipaddresses.ipam.cluster.x-k8s.io.yaml
@@ -27,9 +27,6 @@ spec:
           namespace: '{{ .Release.Namespace }}'
           path: /convert
           port: 443
-      conversionReviewVersions:
-        - v1
-        - v1beta1
   group: ipam.cluster.x-k8s.io
   names:
     categories: