issue-759: wip

cybozu-go · Nov 25, 2024 · efc1c66 · efc1c66
1 parent 389ae12
commit efc1c66
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/charts/moco/templates/_helpers.tpl b/charts/moco/templates/_helpers.tpl
@@ -23,3 +23,14 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
+
+{{/*
+Return the appropriate apiVersion for admissionregistration based on Kubernetes minor version.
+*/}}
+{{- define "admissionregistration.apiVersion" -}}
+{{- if (lt (int .Capabilities.KubeVersion.Minor) 30) }}
+admissionregistration.k8s.io/v1beta1
+{{- else }}
+admissionregistration.k8s.io/v1
+{{- end }}
+{{- end }}
diff --git a/charts/moco/templates/generated/generated.yaml b/charts/moco/templates/generated/generated.yaml
@@ -372,7 +372,7 @@ spec:
     app.kubernetes.io/component: moco-controller
     app.kubernetes.io/name: '{{ include "moco.name" . }}'
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: '{{ include "admissionregistration.apiVersion" . }}'
 kind: ValidatingAdmissionPolicy
 metadata:
   labels:
@@ -400,7 +400,7 @@ spec:
         !(oldObject.metadata.annotations["moco.cybozu.com/prevent-delete"] == "true")
       messageExpression: oldObject.metadata.name + ' is protected from deletion'
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: '{{ include "admissionregistration.apiVersion" . }}'
 kind: ValidatingAdmissionPolicyBinding
 metadata:
   labels:

diff --git a/config/kustomize-to-helm/overlays/templates/kustomization.yaml b/config/kustomize-to-helm/overlays/templates/kustomization.yaml
@@ -14,3 +14,14 @@ patchesStrategicMerge:
 
 transformers:
   - label-transformer.yaml
+
+patchesJson6902:
+  - target:
+      group: admissionregistration.k8s.io
+      version: v1beta1
+      kind: 'ValidatingAdmissionPolicy|ValidatingAdmissionPolicyBinding'
+      name: '.*'
+    patch: |-
+      - op: replace
+        path: "/apiVersion"
+        value: '{{ include "admissionregistration.apiVersion" . }}'
diff --git a/config/webhook/validate_preventdelete.yaml b/config/webhook/validate_preventdelete.yaml
@@ -1,4 +1,4 @@
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: '{{ include "admissionregistration.apiVersion" . }}'
 kind: ValidatingAdmissionPolicy
 metadata:
   name: delete-validator
@@ -17,7 +17,7 @@ spec:
         !(oldObject.metadata.annotations["moco.cybozu.com/prevent-delete"] == "true")
       messageExpression: oldObject.metadata.name + ' is protected from deletion'
 ---
-apiVersion: admissionregistration.k8s.io/v1beta1
+apiVersion: '{{ include "admissionregistration.apiVersion" . }}'
 kind: ValidatingAdmissionPolicyBinding
 metadata:
   name: delete-validator