From be27d81223655d2fbe03469cba72fda854ec2b40 Mon Sep 17 00:00:00 2001 From: nitin-koshti11 Date: Thu, 20 Mar 2025 12:04:56 +0530 Subject: [PATCH 1/2] Removed depricated caBundle --- chart/templates/webhook.yaml | 49 +++++++++++------------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/chart/templates/webhook.yaml b/chart/templates/webhook.yaml index 50543bcdb..9dc2993d1 100644 --- a/chart/templates/webhook.yaml +++ b/chart/templates/webhook.yaml @@ -18,11 +18,8 @@ metadata: name: chaos-controller webhooks: - clientConfig: - {{- if not .Values.controller.webhook.generateCert }} - caBundle: Cg== - {{- else }} - caBundle: {{ b64enc $ca.Cert }} - {{- end }} + # must NOT specify caBundle here, as of k8s 1.31: + # Updates to CustomResourceDefinition are no longer allowed to transition a valid `caBundle` field to an invalid `caBundle` field service: name: chaos-controller-webhook-service namespace: {{ .Values.chaosNamespace }} @@ -54,11 +51,8 @@ metadata: name: chaos-controller-disruptioncrons webhooks: - clientConfig: - {{- if not .Values.controller.webhook.generateCert }} - caBundle: Cg== - {{- else }} - caBundle: {{ b64enc $ca.Cert }} - {{- end }} + # must NOT specify caBundle here, as of k8s 1.31: + # Updates to CustomResourceDefinition are no longer allowed to transition a valid `caBundle` field to an invalid `caBundle` field service: name: chaos-controller-webhook-service namespace: {{ .Values.chaosNamespace }} @@ -90,11 +84,8 @@ metadata: name: chaos-controller-disruptioncrons webhooks: - clientConfig: - {{- if not .Values.controller.webhook.generateCert }} - caBundle: Cg== - {{- else }} - caBundle: {{ b64enc $ca.Cert }} - {{- end }} + # must NOT specify caBundle here, as of k8s 1.31: + # Updates to CustomResourceDefinition are no longer allowed to transition a valid `caBundle` field to an invalid `caBundle` field service: name: chaos-controller-webhook-service namespace: {{ .Values.chaosNamespace }} @@ -123,11 +114,8 @@ metadata: name: chaos-controller webhooks: - clientConfig: - {{- if not .Values.controller.webhook.generateCert }} - caBundle: Cg== - {{- else }} - caBundle: {{ b64enc $ca.Cert }} - {{- end }} + # must NOT specify caBundle here, as of k8s 1.31: + # Updates to CustomResourceDefinition are no longer allowed to transition a valid `caBundle` field to an invalid `caBundle` field service: name: chaos-controller-webhook-service namespace: {{ .Values.chaosNamespace }} @@ -157,11 +145,8 @@ metadata: name: chaos-controller-pod-chaos-handler webhooks: - clientConfig: - {{- if not .Values.controller.webhook.generateCert }} - caBundle: Cg== - {{- else }} - caBundle: {{ b64enc $ca.Cert }} - {{- end }} + # must NOT specify caBundle here, as of k8s 1.31: + # Updates to CustomResourceDefinition are no longer allowed to transition a valid `caBundle` field to an invalid `caBundle` field service: name: chaos-controller-webhook-service namespace: {{ .Values.chaosNamespace }} @@ -196,11 +181,8 @@ metadata: name: chaos-controller-user-info webhooks: - clientConfig: - {{- if not .Values.controller.webhook.generateCert }} - caBundle: Cg== - {{- else }} - caBundle: {{ b64enc $ca.Cert }} - {{- end }} + # must NOT specify caBundle here, as of k8s 1.31: + # Updates to CustomResourceDefinition are no longer allowed to transition a valid `caBundle` field to an invalid `caBundle` field service: name: chaos-controller-webhook-service namespace: {{ .Values.chaosNamespace }} @@ -237,11 +219,8 @@ metadata: name: chaos-controller-disruption-span-context webhooks: - clientConfig: - {{- if not .Values.controller.webhook.generateCert }} - caBundle: Cg== - {{- else }} - caBundle: {{ b64enc $ca.Cert }} - {{- end }} + # must NOT specify caBundle here, as of k8s 1.31: + # Updates to CustomResourceDefinition are no longer allowed to transition a valid `caBundle` field to an invalid `caBundle` field service: name: chaos-controller-webhook-service namespace: {{ .Values.chaosNamespace }} From c17b73dce0f79604fcfc967cb8e266e93840c9d6 Mon Sep 17 00:00:00 2001 From: nitin-koshti11 Date: Thu, 27 Mar 2025 09:59:30 +0530 Subject: [PATCH 2/2] Empty-Commit