Browse Source

fix: remove the conversion hook completely (#4675)

Gergely Brautigam 1 year ago
parent
commit
8d037d197c
3 changed files with 1 additions and 26 deletions
  1. 0 20
      deploy/crds/bundle.yaml
  2. 1 3
      hack/crd.generate.sh
  3. 0 3
      hack/helm.generate.sh

+ 0 - 20
deploy/crds/bundle.yaml

@@ -1453,7 +1453,6 @@ spec:
       storage: false
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -1970,7 +1969,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -10137,7 +10135,6 @@ spec:
       storage: false
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -11346,7 +11343,6 @@ spec:
       storage: false
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -11821,7 +11817,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -19988,7 +19983,6 @@ spec:
       storage: false
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -20196,7 +20190,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -21958,7 +21951,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -22154,7 +22146,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -22221,7 +22212,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -22355,7 +22345,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -22459,7 +22448,6 @@ spec:
       served: true
       storage: true
       subresources: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -22573,7 +22561,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -22706,7 +22693,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -22795,7 +22781,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -22884,7 +22869,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -23094,7 +23078,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -23146,7 +23129,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -24001,7 +23983,6 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -24154,4 +24135,3 @@ spec:
       storage: true
       subresources:
         status: {}
-  conversion: {}

+ 1 - 3
hack/crd.generate.sh

@@ -33,6 +33,4 @@ for f in "${CRD_DIR}"/bases/*.yaml; do
 done
 
 shopt -s extglob
-yq e \
-    '.spec.conversion = {}' \
-    "${CRD_DIR}"/bases/!(kustomization).yaml > "${BUNDLE_YAML}"
+yq e "${CRD_DIR}"/bases/!(kustomization).yaml > "${BUNDLE_YAML}"

+ 0 - 3
hack/helm.generate.sh

@@ -40,8 +40,5 @@ for i in "${HELM_DIR}"/templates/crds/*.yml; do
   $SEDPRG -i 's/name: kubernetes/name: {{ include "external-secrets.fullname" . }}-webhook/g' "$i"
   $SEDPRG -i 's/namespace: default/namespace: {{ .Release.Namespace | quote }}/g' "$i"
   $SEDPRG -i '0,/annotations/!b;//a\    {{- with .Values.crds.annotations }}\n    {{- toYaml . | nindent 4}}\n    {{- end }}\n    {{- if and .Values.crds.conversion.enabled .Values.webhook.certManager.enabled .Values.webhook.certManager.addInjectorAnnotations }}\n    cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "external-secrets.fullname" . }}-webhook\n    {{- end }}' "$i"
-
-  $SEDPRG -i '/  conversion:/i{{- if .Values.crds.conversion.enabled }}' "$i"
-  echo "{{- end }}" >> "$i"
   mv "$i" "${i%.yml}.yaml"
 done