From e1f7121f37777f09e50f7cc2c4a7187399a657f2 Mon Sep 17 00:00:00 2001
From: Matthew Christopher <matthchr@users.noreply.github.com>
Date: Tue, 29 Sep 2020 11:39:13 -0700
Subject: [PATCH] Remove unneeded caBundle value from webhook patch

  - Only removing in v3 as v2 isn't accepting changes.
---
 .../project/config/crd/patches/webhook_in_cronjobs.yaml        | 3 ---
 .../testdata/project/config/webhook/manifests.yaml             | 2 --
 .../project/config/crd/patches/webhook_in_cronjobs.yaml        | 3 ---
 .../internal/templates/config/crd/enablewebhook_patch.go       | 3 ---
 .../config/crd/patches/webhook_in_admirals.yaml                | 3 ---
 .../config/crd/patches/webhook_in_captains.yaml                | 3 ---
 .../config/crd/patches/webhook_in_firstmates.yaml              | 3 ---
 .../config/crd/patches/webhook_in_captains.yaml                | 3 ---
 .../config/crd/patches/webhook_in_cruisers.yaml                | 3 ---
 .../config/crd/patches/webhook_in_destroyers.yaml              | 3 ---
 .../config/crd/patches/webhook_in_frigates.yaml                | 3 ---
 .../config/crd/patches/webhook_in_healthcheckpolicies.yaml     | 3 ---
 .../config/crd/patches/webhook_in_krakens.yaml                 | 3 ---
 .../config/crd/patches/webhook_in_lakers.yaml                  | 3 ---
 .../config/crd/patches/webhook_in_leviathans.yaml              | 3 ---
 .../project-v3/config/crd/patches/webhook_in_admirals.yaml     | 3 ---
 .../project-v3/config/crd/patches/webhook_in_captains.yaml     | 3 ---
 .../project-v3/config/crd/patches/webhook_in_firstmates.yaml   | 3 ---
 18 files changed, 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
index a4a48931f85..92dfb4031fd 100644
--- 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
index ac54dbc35c8..be0a530ea28 100644
--- 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/docs/book/src/multiversion-tutorial/testdata/project/config/crd/patches/webhook_in_cronjobs.yaml b/docs/book/src/multiversion-tutorial/testdata/project/config/crd/patches/webhook_in_cronjobs.yaml
index a4a48931f85..92dfb4031fd 100644
--- a/docs/book/src/multiversion-tutorial/testdata/project/config/crd/patches/webhook_in_cronjobs.yaml
+++ b/docs/book/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
index 99d464201a5..8e8784feffa 100644
--- 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
index 2b9bf612404..a8865b0b87d 100644
--- 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
index c515517131e..69ee3459f4e 100644
--- 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
index 05c23fd1e8b..585eccf7af6 100644
--- 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
index c515517131e..69ee3459f4e 100644
--- 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
index ba4b3924279..8d71c0cb96a 100644
--- 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
index 6413f3706fc..3d1c6aa20fc 100644
--- 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
index 206145f1ba2..75ca2bfdbb3 100644
--- 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
index 2f64333c88a..19c3aa92048 100644
--- 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
index 4e00143d00c..174fae0f998 100644
--- 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
index f8adcbb0966..ed67a5763b8 100644
--- 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
index 9746df71926..32dfa89ffe3 100644
--- 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
index 2b9bf612404..a8865b0b87d 100644
--- 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
index c515517131e..69ee3459f4e 100644
--- 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
index 05c23fd1e8b..585eccf7af6 100644
--- 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