Merge pull request #1699 from matthchr/feature/fix-cabundle

🐛 Remove unneeded caBundle value from webhook patches (V3 only)
kubernetes-sigs · Oct 20, 2020 · 1c04fab · 1c04fab
2 parents 49f7a5e + e1f7121
commit 1c04fab
Show file tree

Hide file tree

Showing 18 changed files with 0 additions and 53 deletions.
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/crd/patches/webhook_in_cronjobs.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/crd/patches/webhook_in_cronjobs.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/webhook/manifests.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/webhook/manifests.yaml
@@ -7,7 +7,6 @@ metadata:
   name: mutating-webhook-configuration
 webhooks:
 - clientConfig:
-    caBundle: Cg==
     service:
       name: webhook-service
       namespace: system
@@ -33,7 +32,6 @@ metadata:
   name: validating-webhook-configuration
 webhooks:
 - clientConfig:
-    caBundle: Cg==
     service:
       name: webhook-service
       namespace: system

diff --git a/...ok/src/multiversion-tutorial/testdata/project/config/crd/patches/webhook_in_cronjobs.yaml b/...ok/src/multiversion-tutorial/testdata/project/config/crd/patches/webhook_in_cronjobs.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/pkg/plugin/v3/scaffolds/internal/templates/config/crd/enablewebhook_patch.go b/pkg/plugin/v3/scaffolds/internal/templates/config/crd/enablewebhook_patch.go
@@ -52,9 +52,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3-addon/config/crd/patches/webhook_in_admirals.yaml b/testdata/project-v3-addon/config/crd/patches/webhook_in_admirals.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3-addon/config/crd/patches/webhook_in_captains.yaml b/testdata/project-v3-addon/config/crd/patches/webhook_in_captains.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3-addon/config/crd/patches/webhook_in_firstmates.yaml b/testdata/project-v3-addon/config/crd/patches/webhook_in_firstmates.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_captains.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_captains.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_cruisers.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_cruisers.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_destroyers.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_destroyers.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_frigates.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_frigates.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_healthcheckpolicies.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_healthcheckpolicies.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_krakens.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_krakens.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_lakers.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_lakers.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_leviathans.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_leviathans.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3/config/crd/patches/webhook_in_admirals.yaml b/testdata/project-v3/config/crd/patches/webhook_in_admirals.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3/config/crd/patches/webhook_in_captains.yaml b/testdata/project-v3/config/crd/patches/webhook_in_captains.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service

diff --git a/testdata/project-v3/config/crd/patches/webhook_in_firstmates.yaml b/testdata/project-v3/config/crd/patches/webhook_in_firstmates.yaml
@@ -8,9 +8,6 @@ spec:
   conversion:
     strategy: Webhook
     webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
       service:
         namespace: system
         name: webhook-service