From 2aeec5f8d242c79b8c26ac4646a72590712e5993 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Tue, 26 Sep 2023 14:05:25 +0100 Subject: [PATCH] UPSTREAM 1686: Move webhook CA injection into webhook resource (cherry picked from commit 298f12af3802c788072e4858a8e031a7dfadfb79) --- config/default/kustomization.yaml | 13 ------------- config/{default => webhook}/cainjection_patch.yaml | 0 config/webhook/kustomization.yaml | 8 ++++++++ 3 files changed, 8 insertions(+), 13 deletions(-) rename config/{default => webhook}/cainjection_patch.yaml (100%) diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index bf9f8a6aed..758f21ef30 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -19,19 +19,6 @@ patches: - path: manager_pull_policy.yaml # Enable webhook. - path: manager_webhook_patch.yaml - # Inject certificate in the webhook definition. -- target: - group: admissionregistration.k8s.io - version: v1 - kind: MutatingWebhookConfiguration - name: mutating-webhook-configuration - path: cainjection_patch.yaml -- target: - group: admissionregistration.k8s.io - version: v1 - kind: ValidatingWebhookConfiguration - name: validating-webhook-configuration - path: cainjection_patch.yaml vars: - name: CERTIFICATE_NAMESPACE # namespace of the certificate CR diff --git a/config/default/cainjection_patch.yaml b/config/webhook/cainjection_patch.yaml similarity index 100% rename from config/default/cainjection_patch.yaml rename to config/webhook/cainjection_patch.yaml diff --git a/config/webhook/kustomization.yaml b/config/webhook/kustomization.yaml index 9cf26134e4..eb9bf3d616 100644 --- a/config/webhook/kustomization.yaml +++ b/config/webhook/kustomization.yaml @@ -4,3 +4,11 @@ resources: configurations: - kustomizeconfig.yaml + +patches: +# Inject certificate in the webhook definition. +- target: + group: admissionregistration.k8s.io + version: v1 + name: mutating-webhook-configuration|validating-webhook-configuration + path: cainjection_patch.yaml