From 58e8d6c4b86ead75232b876b88237a51c98326f8 Mon Sep 17 00:00:00 2001 From: dkwon17 Date: Thu, 10 Oct 2024 11:24:15 -0400 Subject: [PATCH 1/2] fix: remove dummy caBundle from CRDs Signed-off-by: dkwon17 --- .../bundle/manifests/workspace.devfile.io_devworkspaces.yaml | 1 - .../manifests/workspace.devfile.io_devworkspacetemplates.yaml | 1 - deploy/deployment/kubernetes/combined.yaml | 2 -- ...kspaces.workspace.devfile.io.CustomResourceDefinition.yaml | 1 - ...mplates.workspace.devfile.io.CustomResourceDefinition.yaml | 1 - deploy/deployment/openshift/combined.yaml | 2 -- ...kspaces.workspace.devfile.io.CustomResourceDefinition.yaml | 1 - ...mplates.workspace.devfile.io.CustomResourceDefinition.yaml | 1 - deploy/templates/cert-manager/crd_webhooks_patch.yaml | 4 ++-- deploy/templates/olm/crd_webhooks_patch.yaml | 4 ++-- deploy/templates/service-ca/crd_webhooks_patch.yaml | 4 ++-- 11 files changed, 6 insertions(+), 16 deletions(-) diff --git a/deploy/bundle/manifests/workspace.devfile.io_devworkspaces.yaml b/deploy/bundle/manifests/workspace.devfile.io_devworkspaces.yaml index aaf4861f6..576047239 100644 --- a/deploy/bundle/manifests/workspace.devfile.io_devworkspaces.yaml +++ b/deploy/bundle/manifests/workspace.devfile.io_devworkspaces.yaml @@ -11,7 +11,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: devworkspace-controller-manager-service namespace: system diff --git a/deploy/bundle/manifests/workspace.devfile.io_devworkspacetemplates.yaml b/deploy/bundle/manifests/workspace.devfile.io_devworkspacetemplates.yaml index ab3d47c90..273f78ec5 100644 --- a/deploy/bundle/manifests/workspace.devfile.io_devworkspacetemplates.yaml +++ b/deploy/bundle/manifests/workspace.devfile.io_devworkspacetemplates.yaml @@ -11,7 +11,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: devworkspace-controller-manager-service namespace: system diff --git a/deploy/deployment/kubernetes/combined.yaml b/deploy/deployment/kubernetes/combined.yaml index 7735896ee..576e35bac 100644 --- a/deploy/deployment/kubernetes/combined.yaml +++ b/deploy/deployment/kubernetes/combined.yaml @@ -7495,7 +7495,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: devworkspace-controller-manager-service namespace: devworkspace-controller @@ -16750,7 +16749,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: devworkspace-controller-manager-service namespace: devworkspace-controller diff --git a/deploy/deployment/kubernetes/objects/devworkspaces.workspace.devfile.io.CustomResourceDefinition.yaml b/deploy/deployment/kubernetes/objects/devworkspaces.workspace.devfile.io.CustomResourceDefinition.yaml index 57dfd7f7e..1849f51cd 100644 --- a/deploy/deployment/kubernetes/objects/devworkspaces.workspace.devfile.io.CustomResourceDefinition.yaml +++ b/deploy/deployment/kubernetes/objects/devworkspaces.workspace.devfile.io.CustomResourceDefinition.yaml @@ -12,7 +12,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: devworkspace-controller-manager-service namespace: devworkspace-controller diff --git a/deploy/deployment/kubernetes/objects/devworkspacetemplates.workspace.devfile.io.CustomResourceDefinition.yaml b/deploy/deployment/kubernetes/objects/devworkspacetemplates.workspace.devfile.io.CustomResourceDefinition.yaml index 7478fa1db..6952bca26 100644 --- a/deploy/deployment/kubernetes/objects/devworkspacetemplates.workspace.devfile.io.CustomResourceDefinition.yaml +++ b/deploy/deployment/kubernetes/objects/devworkspacetemplates.workspace.devfile.io.CustomResourceDefinition.yaml @@ -12,7 +12,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: devworkspace-controller-manager-service namespace: devworkspace-controller diff --git a/deploy/deployment/openshift/combined.yaml b/deploy/deployment/openshift/combined.yaml index 4ebbbd66e..1e340c9c6 100644 --- a/deploy/deployment/openshift/combined.yaml +++ b/deploy/deployment/openshift/combined.yaml @@ -7495,7 +7495,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: devworkspace-controller-manager-service namespace: devworkspace-controller @@ -16750,7 +16749,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: devworkspace-controller-manager-service namespace: devworkspace-controller diff --git a/deploy/deployment/openshift/objects/devworkspaces.workspace.devfile.io.CustomResourceDefinition.yaml b/deploy/deployment/openshift/objects/devworkspaces.workspace.devfile.io.CustomResourceDefinition.yaml index 22836c65d..9976f6ffd 100644 --- a/deploy/deployment/openshift/objects/devworkspaces.workspace.devfile.io.CustomResourceDefinition.yaml +++ b/deploy/deployment/openshift/objects/devworkspaces.workspace.devfile.io.CustomResourceDefinition.yaml @@ -12,7 +12,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: devworkspace-controller-manager-service namespace: devworkspace-controller diff --git a/deploy/deployment/openshift/objects/devworkspacetemplates.workspace.devfile.io.CustomResourceDefinition.yaml b/deploy/deployment/openshift/objects/devworkspacetemplates.workspace.devfile.io.CustomResourceDefinition.yaml index 0918ecbca..74f43fcdc 100644 --- a/deploy/deployment/openshift/objects/devworkspacetemplates.workspace.devfile.io.CustomResourceDefinition.yaml +++ b/deploy/deployment/openshift/objects/devworkspacetemplates.workspace.devfile.io.CustomResourceDefinition.yaml @@ -12,7 +12,6 @@ spec: strategy: Webhook webhook: clientConfig: - caBundle: Cg== service: name: devworkspace-controller-manager-service namespace: devworkspace-controller diff --git a/deploy/templates/cert-manager/crd_webhooks_patch.yaml b/deploy/templates/cert-manager/crd_webhooks_patch.yaml index 3bb841e3a..653cbd7ec 100644 --- a/deploy/templates/cert-manager/crd_webhooks_patch.yaml +++ b/deploy/templates/cert-manager/crd_webhooks_patch.yaml @@ -17,7 +17,7 @@ spec: path: /convert port: 443 # caBundle will be filled by cert-manager on creation - caBundle: Cg== + # caBundle: Cg== --- # Add webhooks to the devfile/api CRDs apiVersion: apiextensions.k8s.io/v1 @@ -38,4 +38,4 @@ spec: path: /convert port: 443 # caBundle will be filled by cert-manager on creation - caBundle: Cg== + # caBundle: Cg== diff --git a/deploy/templates/olm/crd_webhooks_patch.yaml b/deploy/templates/olm/crd_webhooks_patch.yaml index 64a263571..2da725fe1 100644 --- a/deploy/templates/olm/crd_webhooks_patch.yaml +++ b/deploy/templates/olm/crd_webhooks_patch.yaml @@ -15,7 +15,7 @@ spec: path: /convert port: 443 # caBundle will be filled by Service CA operator - caBundle: Cg== + # caBundle: Cg== --- # Add webhooks to the devfile/api CRDs apiVersion: apiextensions.k8s.io/v1 @@ -34,4 +34,4 @@ spec: path: /convert port: 443 # caBundle will be filled by Service CA operator - caBundle: Cg== + # caBundle: Cg== diff --git a/deploy/templates/service-ca/crd_webhooks_patch.yaml b/deploy/templates/service-ca/crd_webhooks_patch.yaml index 933b4c188..464a65c8f 100644 --- a/deploy/templates/service-ca/crd_webhooks_patch.yaml +++ b/deploy/templates/service-ca/crd_webhooks_patch.yaml @@ -17,7 +17,7 @@ spec: path: /convert port: 443 # caBundle will be filled by Service CA operator - caBundle: Cg== + # caBundle: Cg== --- # Add webhooks to the devfile/api CRDs apiVersion: apiextensions.k8s.io/v1 @@ -38,4 +38,4 @@ spec: path: /convert port: 443 # caBundle will be filled by Service CA operator - caBundle: Cg== + # caBundle: Cg== From 94d5feb76cf7588baf70dfba36fc869a49ee9607 Mon Sep 17 00:00:00 2001 From: dkwon17 Date: Thu, 10 Oct 2024 16:34:38 -0400 Subject: [PATCH 2/2] Remove commented-out caBundle field Signed-off-by: dkwon17 --- deploy/templates/cert-manager/crd_webhooks_patch.yaml | 2 -- deploy/templates/olm/crd_webhooks_patch.yaml | 2 -- deploy/templates/service-ca/crd_webhooks_patch.yaml | 2 -- 3 files changed, 6 deletions(-) diff --git a/deploy/templates/cert-manager/crd_webhooks_patch.yaml b/deploy/templates/cert-manager/crd_webhooks_patch.yaml index 653cbd7ec..e176faf94 100644 --- a/deploy/templates/cert-manager/crd_webhooks_patch.yaml +++ b/deploy/templates/cert-manager/crd_webhooks_patch.yaml @@ -17,7 +17,6 @@ spec: path: /convert port: 443 # caBundle will be filled by cert-manager on creation - # caBundle: Cg== --- # Add webhooks to the devfile/api CRDs apiVersion: apiextensions.k8s.io/v1 @@ -38,4 +37,3 @@ spec: path: /convert port: 443 # caBundle will be filled by cert-manager on creation - # caBundle: Cg== diff --git a/deploy/templates/olm/crd_webhooks_patch.yaml b/deploy/templates/olm/crd_webhooks_patch.yaml index 2da725fe1..350601d1c 100644 --- a/deploy/templates/olm/crd_webhooks_patch.yaml +++ b/deploy/templates/olm/crd_webhooks_patch.yaml @@ -15,7 +15,6 @@ spec: path: /convert port: 443 # caBundle will be filled by Service CA operator - # caBundle: Cg== --- # Add webhooks to the devfile/api CRDs apiVersion: apiextensions.k8s.io/v1 @@ -34,4 +33,3 @@ spec: path: /convert port: 443 # caBundle will be filled by Service CA operator - # caBundle: Cg== diff --git a/deploy/templates/service-ca/crd_webhooks_patch.yaml b/deploy/templates/service-ca/crd_webhooks_patch.yaml index 464a65c8f..1f708fe20 100644 --- a/deploy/templates/service-ca/crd_webhooks_patch.yaml +++ b/deploy/templates/service-ca/crd_webhooks_patch.yaml @@ -17,7 +17,6 @@ spec: path: /convert port: 443 # caBundle will be filled by Service CA operator - # caBundle: Cg== --- # Add webhooks to the devfile/api CRDs apiVersion: apiextensions.k8s.io/v1 @@ -38,4 +37,3 @@ spec: path: /convert port: 443 # caBundle will be filled by Service CA operator - # caBundle: Cg==