From 1be71d26580f42bc24ca06bd965b36f02ec9e4a9 Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Thu, 27 Feb 2025 14:47:25 +0100
Subject: syz-cluster: configure workflow-controller-configmap

Make sure the patches are correctly stacked up.
For now, use strategic patch merge.
---
 syz-cluster/overlays/common/kustomization.yaml             | 12 ++----------
 .../common/patch-workflow-controller-configmap.yaml        | 12 ++++++++++++
 syz-cluster/overlays/minikube/kustomization.yaml           | 14 ++------------
 .../minikube/patch-workflow-controller-configmap.yaml      | 13 +++++++++++++
 4 files changed, 29 insertions(+), 22 deletions(-)
 create mode 100644 syz-cluster/overlays/common/patch-workflow-controller-configmap.yaml
 create mode 100644 syz-cluster/overlays/minikube/patch-workflow-controller-configmap.yaml

diff --git a/syz-cluster/overlays/common/kustomization.yaml b/syz-cluster/overlays/common/kustomization.yaml
index 8c0ae3f85..23982f7b5 100644
--- a/syz-cluster/overlays/common/kustomization.yaml
+++ b/syz-cluster/overlays/common/kustomization.yaml
@@ -14,8 +14,9 @@ resources:
   - network-policy-git-access.yaml
   - workflow-roles.yaml
 
-patches:
+patchesStrategicMerge:
   - patch-argo-controller.yaml
+  - patch-workflow-controller-configmap.yaml
 
 patches:
   - target:
@@ -24,12 +25,3 @@ patches:
       - op: replace
         path: /spec/template/spec/containers/0/imagePullPolicy
         value: IfNotPresent
-  - target:
-      kind: ConfigMap
-      name: workflow-controller-configmap
-    patch: |-
-      - op: replace
-        path: /data
-        value:
-          workflowDefaults:
-            serviceAccountName: argo-executor-ksa
diff --git a/syz-cluster/overlays/common/patch-workflow-controller-configmap.yaml b/syz-cluster/overlays/common/patch-workflow-controller-configmap.yaml
new file mode 100644
index 000000000..0ff55f9bb
--- /dev/null
+++ b/syz-cluster/overlays/common/patch-workflow-controller-configmap.yaml
@@ -0,0 +1,12 @@
+# Copyright 2025 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: workflow-controller-configmap
+  namespace: argo
+data:
+  workflowDefaults: |
+        spec:
+            serviceAccountName: argo-executor-ksa
diff --git a/syz-cluster/overlays/minikube/kustomization.yaml b/syz-cluster/overlays/minikube/kustomization.yaml
index a41562037..abf621734 100644
--- a/syz-cluster/overlays/minikube/kustomization.yaml
+++ b/syz-cluster/overlays/minikube/kustomization.yaml
@@ -9,15 +9,5 @@ resources:
   - network-policy-spanner.yaml
   - workflow-artifacts.yaml
 
-patches:
-  - target:
-      kind: ConfigMap
-      name: workflow-controller-configmap
-    patch: |-
-      - op: replace
-        path: /data
-        value:
-          executor: |
-              env:
-                - name: STORAGE_EMULATOR_HOST
-                  value: http://fake-gcs-server.default.svc.cluster.local:4443
+patchesStrategicMerge:
+  - patch-workflow-controller-configmap.yaml
diff --git a/syz-cluster/overlays/minikube/patch-workflow-controller-configmap.yaml b/syz-cluster/overlays/minikube/patch-workflow-controller-configmap.yaml
new file mode 100644
index 000000000..503b50318
--- /dev/null
+++ b/syz-cluster/overlays/minikube/patch-workflow-controller-configmap.yaml
@@ -0,0 +1,13 @@
+# Copyright 2025 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: workflow-controller-configmap
+  namespace: argo
+data:
+  executor: |
+      env:
+         - name: STORAGE_EMULATOR_HOST
+           value: http://fake-gcs-server.default.svc.cluster.local:4443
-- 
cgit mrf-deployment