syz-cluster: move more configs to common

8 files changed, 20 insertions, 18 deletions

diff --git a/syz-cluster/Makefile b/syz-cluster/Makefile
index b3227e15c..58237cece 100644
--- a/syz-cluster/Makefile
+++ b/syz-cluster/Makefile
@@ -64,4 +64,4 @@ restart-spanner: build-db-mgmt
 	./run-local.sh db-mgmt migrate
 
 k8s-config-dev:
-	@kubectl kustomize ./overlays/dev/ | IMAGE_PREFIX=${IMAGE_PREFIX} IMAGE_TAG=${IMAGE_TAG} envsubst
+	@kubectl kustomize ./overlays/minikube/ | IMAGE_PREFIX=${IMAGE_PREFIX} IMAGE_TAG=${IMAGE_TAG} envsubst
diff --git a/syz-cluster/overlays/common/kustomization.yaml b/syz-cluster/overlays/common/kustomization.yaml
index 32eb3672e..c6ff1cb67 100644
--- a/syz-cluster/overlays/common/kustomization.yaml
+++ b/syz-cluster/overlays/common/kustomization.yaml
@@ -2,6 +2,22 @@
 # Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 resources:
+  - ../../controller
+  - ../../dashboard
+  - ../../series-tracker
+  - ../../kernel-disk
+  - ../../reporter
+  - ../../workflow
+  - https://github.com/argoproj/argo-workflows/releases/download/v3.6.2/install.yaml
   - network-deny-all.yaml
   - network-policy-controller.yaml
   - network-policy-git-access.yaml
+  - workflow-roles.yaml
+
+patches:
+  - target:
+      kind: Deployment
+    patch: |-
+      - op: replace
+        path: /spec/template/spec/containers/0/imagePullPolicy
+        value: IfNotPresent
diff --git a/syz-cluster/overlays/dev/workflow-roles.yaml b/syz-cluster/overlays/common/workflow-roles.yaml
index 44655c8e1..44655c8e1 100644
--- a/syz-cluster/overlays/dev/workflow-roles.yaml
+++ b/syz-cluster/overlays/common/workflow-roles.yaml
diff --git a/syz-cluster/overlays/dev/fake-gcs.yaml b/syz-cluster/overlays/minikube/fake-gcs.yaml
index b5af7594c..64084fe82 100644
--- a/syz-cluster/overlays/dev/fake-gcs.yaml
+++ b/syz-cluster/overlays/minikube/fake-gcs.yaml
@@ -18,7 +18,7 @@ spec:
       initContainers:
       - name: create-test-bucket
         image: busybox
-        command: ["sh", "-c", "mkdir -p /data/test-bucket /data/blobs"]
+        command: ["sh", "-c", "mkdir -p /data/workflow-artifacts /data/blobs"]
         volumeMounts:
         - name: data-volume
           mountPath: /data
diff --git a/syz-cluster/overlays/dev/global-config.yaml b/syz-cluster/overlays/minikube/global-config.yaml
index 83293e81e..83293e81e 100644
--- a/syz-cluster/overlays/dev/global-config.yaml
+++ b/syz-cluster/overlays/minikube/global-config.yaml
diff --git a/syz-cluster/overlays/dev/kustomization.yaml b/syz-cluster/overlays/minikube/kustomization.yaml
index ff4e93d20..c5e7b3e9d 100644
--- a/syz-cluster/overlays/dev/kustomization.yaml
+++ b/syz-cluster/overlays/minikube/kustomization.yaml
@@ -2,28 +2,14 @@
 # Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
 resources:
-  - ../../controller
-  - ../../dashboard
-  - ../../series-tracker
-  - ../../kernel-disk
-  - ../../reporter
   - ../common
-  - ../../workflow
   - global-config.yaml
-  - https://github.com/argoproj/argo-workflows/releases/download/v3.6.2/install.yaml
-  - workflow-roles.yaml
   - fake-gcs.yaml
-  - workflow-artifacts.yaml
   - network-policy-spanner.yaml
+  - workflow-artifacts.yaml
 
 patches:
   - target:
-      kind: Deployment
-    patch: |-
-      - op: replace
-        path: /spec/template/spec/containers/0/imagePullPolicy
-        value: IfNotPresent
-  - target:
       kind: ConfigMap
       name: workflow-controller-configmap
     patch: |-
diff --git a/syz-cluster/overlays/dev/network-policy-spanner.yaml b/syz-cluster/overlays/minikube/network-policy-spanner.yaml
index bfda8c609..bfda8c609 100644
--- a/syz-cluster/overlays/dev/network-policy-spanner.yaml
+++ b/syz-cluster/overlays/minikube/network-policy-spanner.yaml
diff --git a/syz-cluster/overlays/dev/workflow-artifacts.yaml b/syz-cluster/overlays/minikube/workflow-artifacts.yaml
index fe34bf84d..690ae176a 100644
--- a/syz-cluster/overlays/dev/workflow-artifacts.yaml
+++ b/syz-cluster/overlays/minikube/workflow-artifacts.yaml
@@ -10,4 +10,4 @@ metadata:
 data:
   gcs-repo: |
     gcs:
-      bucket: test-bucket
+      bucket: workflow-artifacts