Clean up e2e-test kustomizations and add `ValidatingWebhookConfigurat…

…ion` to them.
k8ssandra · Feb 16, 2022 · e7fce60 · e7fce60
1 parent 66747bb
commit e7fce60
Showing 1 changed file with 8 additions and 34 deletions.
diff --git a/test/framework/e2e_framework.go b/test/framework/e2e_framework.go
@@ -208,6 +208,11 @@ replacements:
       kind: ClusterRoleBinding
     fieldPaths:
       - subjects.0.namespace
+  - select:
+      name: cass-operator-validating-webhook-configuration
+      kind: ValidatingWebhookConfiguration
+    fieldPaths:
+      - webhooks.0.clientConfig.service.namespace
 `
 
 	dataPlaneTmpl := `
@@ -249,42 +254,11 @@ replacements:
       kind: ClusterRoleBinding
     fieldPaths:
       - subjects.0.namespace
-replacements:
-- source: 
-    kind: Namespace
-    name: {{ .Namespace }}
-    fieldPath: metadata.name
-  targets:
-  - select:
-      namespace: cass-operator
-    fieldPaths:
-      - metadata.namespace
-  - select:
-      namespace: k8ssandra-operator
-    fieldPaths:
-      - metadata.namespace
-  - select:
-      kind: ClusterRoleBinding
-    fieldPaths:
-      - subjects.0.namespace
-replacements:
-- source: 
-    kind: Namespace
-    name: {{ .Namespace }}
-    fieldPath: metadata.name
-  targets:
   - select:
-      namespace: cass-operator
-    fieldPaths:
-      - metadata.namespace
-  - select:
-      namespace: k8ssandra-operator
-    fieldPaths:
-    - metadata.namespace
-  - select:
-      kind: ClusterRoleBinding
+      name: cass-operator-validating-webhook-configuration
+      kind: ValidatingWebhookConfiguration
     fieldPaths:
-    - subjects.0.namespace
+	  - webhooks.0.clientConfig.service.namespace
 `
 
 	k := Kustomization{Namespace: config.Namespace, ImageTag: config.ImageTag}