From f6a877bc6d270e40d55ca033c78ce7f05e9f3ce4 Mon Sep 17 00:00:00 2001 From: Miles-Garnsey Date: Wed, 16 Feb 2022 11:03:53 +1100 Subject: [PATCH 1/5] Don't apply `single-namespace` component in data-plane as data plane is derived from `control-plane` kustomizations which already apply it. --- .../data-plane/cass-operator-dev/kustomization.yaml | 3 +-- config/deployments/data-plane/cluster-scope/kustomization.yaml | 3 +-- config/deployments/data-plane/kustomization.yaml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/config/deployments/data-plane/cass-operator-dev/kustomization.yaml b/config/deployments/data-plane/cass-operator-dev/kustomization.yaml index bf50a6b5b..ad3e41ead 100644 --- a/config/deployments/data-plane/cass-operator-dev/kustomization.yaml +++ b/config/deployments/data-plane/cass-operator-dev/kustomization.yaml @@ -5,5 +5,4 @@ resources: - ../../default - ../../../cass-operator/ns-scoped components: - - ../../../components/data-plane - - ../../../components/single-namespace \ No newline at end of file + - ../../../components/data-plane \ No newline at end of file diff --git a/config/deployments/data-plane/cluster-scope/kustomization.yaml b/config/deployments/data-plane/cluster-scope/kustomization.yaml index 83d826d55..fca094f2e 100644 --- a/config/deployments/data-plane/cluster-scope/kustomization.yaml +++ b/config/deployments/data-plane/cluster-scope/kustomization.yaml @@ -7,5 +7,4 @@ resources: components: - ../../../components/cluster-scope - - ../../../components/data-plane - - ../../../components/single-namespace \ No newline at end of file + - ../../../components/data-plane \ No newline at end of file diff --git a/config/deployments/data-plane/kustomization.yaml b/config/deployments/data-plane/kustomization.yaml index a90f7a88c..93de055a2 100644 --- a/config/deployments/data-plane/kustomization.yaml +++ b/config/deployments/data-plane/kustomization.yaml @@ -5,5 +5,4 @@ resources: - ../control-plane components: - - ../../components/data-plane - - ../../components/single-namespace \ No newline at end of file + - ../../components/data-plane \ No newline at end of file From ac7758d2970dd064f18eb91753f7d62851c7b55e Mon Sep 17 00:00:00 2001 From: Miles-Garnsey Date: Wed, 16 Feb 2022 11:22:45 +1100 Subject: [PATCH 2/5] Revert all single-namespace changes. --- .../components/single-namespace/kustomization.yaml | 14 +++++++------- .../cass-operator-dev/kustomization.yaml | 3 ++- .../data-plane/cluster-scope/kustomization.yaml | 3 ++- config/deployments/data-plane/kustomization.yaml | 3 ++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/config/components/single-namespace/kustomization.yaml b/config/components/single-namespace/kustomization.yaml index cbded00a4..4e7e5dce5 100644 --- a/config/components/single-namespace/kustomization.yaml +++ b/config/components/single-namespace/kustomization.yaml @@ -22,11 +22,11 @@ replacements: kind: ValidatingWebhookConfiguration fieldPaths: - webhooks.0.clientConfig.service.namespace -patchesStrategicMerge: -- |- - apiVersion: v1 - kind: Namespace - metadata: - name: cass-operator - $patch: delete +# patchesStrategicMerge: +# - |- +# apiVersion: v1 +# kind: Namespace +# metadata: +# name: cass-operator +# $patch: delete \ No newline at end of file diff --git a/config/deployments/data-plane/cass-operator-dev/kustomization.yaml b/config/deployments/data-plane/cass-operator-dev/kustomization.yaml index ad3e41ead..0c0152c48 100644 --- a/config/deployments/data-plane/cass-operator-dev/kustomization.yaml +++ b/config/deployments/data-plane/cass-operator-dev/kustomization.yaml @@ -5,4 +5,5 @@ resources: - ../../default - ../../../cass-operator/ns-scoped components: - - ../../../components/data-plane \ No newline at end of file + - ../../../components/data-plane + - ../../components/single-namespace \ No newline at end of file diff --git a/config/deployments/data-plane/cluster-scope/kustomization.yaml b/config/deployments/data-plane/cluster-scope/kustomization.yaml index fca094f2e..b6848c00d 100644 --- a/config/deployments/data-plane/cluster-scope/kustomization.yaml +++ b/config/deployments/data-plane/cluster-scope/kustomization.yaml @@ -7,4 +7,5 @@ resources: components: - ../../../components/cluster-scope - - ../../../components/data-plane \ No newline at end of file + - ../../../components/data-plane + - ../../components/single-namespace \ No newline at end of file diff --git a/config/deployments/data-plane/kustomization.yaml b/config/deployments/data-plane/kustomization.yaml index 93de055a2..a90f7a88c 100644 --- a/config/deployments/data-plane/kustomization.yaml +++ b/config/deployments/data-plane/kustomization.yaml @@ -5,4 +5,5 @@ resources: - ../control-plane components: - - ../../components/data-plane \ No newline at end of file + - ../../components/data-plane + - ../../components/single-namespace \ No newline at end of file From 63571a28b677810f0a5a2b1a8202536dc50f0ce4 Mon Sep 17 00:00:00 2001 From: Miles-Garnsey Date: Wed, 16 Feb 2022 14:59:58 +1100 Subject: [PATCH 3/5] Fix `config/deployments/{data-plane,control-plane}/cass-operator-dev/` kustomizations. --- .../control-plane/cass-operator-dev/kustomization.yaml | 3 ++- .../data-plane/cass-operator-dev/kustomization.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/deployments/control-plane/cass-operator-dev/kustomization.yaml b/config/deployments/control-plane/cass-operator-dev/kustomization.yaml index d14af84db..0f5bd4dec 100644 --- a/config/deployments/control-plane/cass-operator-dev/kustomization.yaml +++ b/config/deployments/control-plane/cass-operator-dev/kustomization.yaml @@ -3,5 +3,6 @@ kind: Kustomization resources: - ../../default - - ../../cass-operator/ns-scoped + - ../../../cass-operator/ns-scoped +components: - ../../../components/single-namespace \ No newline at end of file diff --git a/config/deployments/data-plane/cass-operator-dev/kustomization.yaml b/config/deployments/data-plane/cass-operator-dev/kustomization.yaml index 0c0152c48..bf50a6b5b 100644 --- a/config/deployments/data-plane/cass-operator-dev/kustomization.yaml +++ b/config/deployments/data-plane/cass-operator-dev/kustomization.yaml @@ -6,4 +6,4 @@ resources: - ../../../cass-operator/ns-scoped components: - ../../../components/data-plane - - ../../components/single-namespace \ No newline at end of file + - ../../../components/single-namespace \ No newline at end of file From 167728218837d6cced9b4388bc2cf2a60250c687 Mon Sep 17 00:00:00 2001 From: Miles-Garnsey Date: Wed, 16 Feb 2022 15:09:10 +1100 Subject: [PATCH 4/5] Fix deployments data-plane/cass-operator-dev, data-plane/cluster-scope. --- .../data-plane/cass-operator-dev/kustomization.yaml | 3 +-- config/deployments/data-plane/cluster-scope/kustomization.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/deployments/data-plane/cass-operator-dev/kustomization.yaml b/config/deployments/data-plane/cass-operator-dev/kustomization.yaml index bf50a6b5b..ad3e41ead 100644 --- a/config/deployments/data-plane/cass-operator-dev/kustomization.yaml +++ b/config/deployments/data-plane/cass-operator-dev/kustomization.yaml @@ -5,5 +5,4 @@ resources: - ../../default - ../../../cass-operator/ns-scoped components: - - ../../../components/data-plane - - ../../../components/single-namespace \ No newline at end of file + - ../../../components/data-plane \ No newline at end of file diff --git a/config/deployments/data-plane/cluster-scope/kustomization.yaml b/config/deployments/data-plane/cluster-scope/kustomization.yaml index b6848c00d..fca094f2e 100644 --- a/config/deployments/data-plane/cluster-scope/kustomization.yaml +++ b/config/deployments/data-plane/cluster-scope/kustomization.yaml @@ -7,5 +7,4 @@ resources: components: - ../../../components/cluster-scope - - ../../../components/data-plane - - ../../components/single-namespace \ No newline at end of file + - ../../../components/data-plane \ No newline at end of file From 1070e11cf41e35e7f5f1bbf7c43276ffd2d1ffe2 Mon Sep 17 00:00:00 2001 From: Miles-Garnsey Date: Wed, 16 Feb 2022 15:44:10 +1100 Subject: [PATCH 5/5] Reinstate cass-operator namespace deletion and fix config/deployments/data-plane. --- .../components/single-namespace/kustomization.yaml | 14 +++++++------- config/deployments/data-plane/kustomization.yaml | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/config/components/single-namespace/kustomization.yaml b/config/components/single-namespace/kustomization.yaml index 4e7e5dce5..cbded00a4 100644 --- a/config/components/single-namespace/kustomization.yaml +++ b/config/components/single-namespace/kustomization.yaml @@ -22,11 +22,11 @@ replacements: kind: ValidatingWebhookConfiguration fieldPaths: - webhooks.0.clientConfig.service.namespace -# patchesStrategicMerge: -# - |- -# apiVersion: v1 -# kind: Namespace -# metadata: -# name: cass-operator -# $patch: delete +patchesStrategicMerge: +- |- + apiVersion: v1 + kind: Namespace + metadata: + name: cass-operator + $patch: delete \ No newline at end of file diff --git a/config/deployments/data-plane/kustomization.yaml b/config/deployments/data-plane/kustomization.yaml index a90f7a88c..93de055a2 100644 --- a/config/deployments/data-plane/kustomization.yaml +++ b/config/deployments/data-plane/kustomization.yaml @@ -5,5 +5,4 @@ resources: - ../control-plane components: - - ../../components/data-plane - - ../../components/single-namespace \ No newline at end of file + - ../../components/data-plane \ No newline at end of file