From 4ff45560dfd64d06d62febea304ed070ce49152c Mon Sep 17 00:00:00 2001 From: Maximilian Rink Date: Fri, 23 Aug 2024 09:43:50 +0200 Subject: [PATCH 1/2] Remove the invalid caBundle, required for 1.31 Signed-off-by: Maximilian Rink --- config/crd/patches/webhook_in_addonproviders.yaml | 1 - config/crd/patches/webhook_in_bootstrapproviders.yaml | 1 - config/crd/patches/webhook_in_controlplaneproviders.yaml | 1 - config/crd/patches/webhook_in_coreproviders.yaml | 1 - config/crd/patches/webhook_in_infrastructureproviders.yaml | 1 - config/crd/patches/webhook_in_ipamproviders.yaml | 1 - config/crd/patches/webhook_in_runtimeextensionproviders.yaml | 1 - 7 files changed, 7 deletions(-) diff --git a/config/crd/patches/webhook_in_addonproviders.yaml b/config/crd/patches/webhook_in_addonproviders.yaml index 841af444c..ace8a284a 100644 --- a/config/crd/patches/webhook_in_addonproviders.yaml +++ b/config/crd/patches/webhook_in_addonproviders.yaml @@ -12,7 +12,6 @@ spec: clientConfig: # 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/config/crd/patches/webhook_in_bootstrapproviders.yaml b/config/crd/patches/webhook_in_bootstrapproviders.yaml index 873563b99..36289fcb2 100644 --- a/config/crd/patches/webhook_in_bootstrapproviders.yaml +++ b/config/crd/patches/webhook_in_bootstrapproviders.yaml @@ -12,7 +12,6 @@ spec: clientConfig: # 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/config/crd/patches/webhook_in_controlplaneproviders.yaml b/config/crd/patches/webhook_in_controlplaneproviders.yaml index 770153646..08e7c9eff 100644 --- a/config/crd/patches/webhook_in_controlplaneproviders.yaml +++ b/config/crd/patches/webhook_in_controlplaneproviders.yaml @@ -12,7 +12,6 @@ spec: clientConfig: # 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/config/crd/patches/webhook_in_coreproviders.yaml b/config/crd/patches/webhook_in_coreproviders.yaml index 784b5c4c9..523bf342c 100644 --- a/config/crd/patches/webhook_in_coreproviders.yaml +++ b/config/crd/patches/webhook_in_coreproviders.yaml @@ -12,7 +12,6 @@ spec: clientConfig: # 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/config/crd/patches/webhook_in_infrastructureproviders.yaml b/config/crd/patches/webhook_in_infrastructureproviders.yaml index b0423ac00..54cee5ec7 100644 --- a/config/crd/patches/webhook_in_infrastructureproviders.yaml +++ b/config/crd/patches/webhook_in_infrastructureproviders.yaml @@ -12,7 +12,6 @@ spec: clientConfig: # 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/config/crd/patches/webhook_in_ipamproviders.yaml b/config/crd/patches/webhook_in_ipamproviders.yaml index ba4ba3def..a043348a8 100644 --- a/config/crd/patches/webhook_in_ipamproviders.yaml +++ b/config/crd/patches/webhook_in_ipamproviders.yaml @@ -12,7 +12,6 @@ spec: clientConfig: # 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/config/crd/patches/webhook_in_runtimeextensionproviders.yaml b/config/crd/patches/webhook_in_runtimeextensionproviders.yaml index bc968acf4..43a887d33 100644 --- a/config/crd/patches/webhook_in_runtimeextensionproviders.yaml +++ b/config/crd/patches/webhook_in_runtimeextensionproviders.yaml @@ -12,7 +12,6 @@ spec: clientConfig: # 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 From b4ae7f70a46c2f1e1451147b2676009a08986b5e Mon Sep 17 00:00:00 2001 From: Maximilian Rink Date: Thu, 5 Sep 2024 10:09:19 +0200 Subject: [PATCH 2/2] Remove the invalid caBundle also from test files Signed-off-by: Maximilian Rink --- test/e2e/resources/full-chart-install.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/e2e/resources/full-chart-install.yaml b/test/e2e/resources/full-chart-install.yaml index 3325b7fc7..1abfe4327 100644 --- a/test/e2e/resources/full-chart-install.yaml +++ b/test/e2e/resources/full-chart-install.yaml @@ -24,7 +24,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: capi-operator-webhook-service namespace: 'default' @@ -3035,7 +3034,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: capi-operator-webhook-service namespace: 'default' @@ -7631,7 +7629,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: capi-operator-webhook-service namespace: 'default' @@ -12230,7 +12227,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: capi-operator-webhook-service namespace: 'default' @@ -16826,7 +16822,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: capi-operator-webhook-service namespace: 'default' @@ -21425,7 +21420,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: capi-operator-webhook-service namespace: 'default' @@ -24436,7 +24430,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: capi-operator-webhook-service namespace: 'default'