Merge pull request #332 from larsks/fix/remove-patchesstrategicmerge

Remove deprecated syntax
OCP-on-NERC · Dec 5, 2023 · 6cd469c · 6cd469c
2 parents 9251d3b + 69f9828
commit 6cd469c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/acct-mgt/overlays/nerc-ocp-prod/kustomization.yaml b/acct-mgt/overlays/nerc-ocp-prod/kustomization.yaml
@@ -4,6 +4,6 @@ namespace: acct-mgt
 resources:
   - ../../base
   - externalsecret.yaml
-patchesStrategicMerge:
-  - patches/configmap_patch.yaml
-  - patches/deployment_patch.yaml
+patches:
+  - path: patches/configmap_patch.yaml
+  - path: patches/deployment_patch.yaml
diff --git a/dex/overlays/nerc-ocp-infra/kustomization.yaml b/dex/overlays/nerc-ocp-infra/kustomization.yaml
@@ -4,5 +4,5 @@ namespace: dex
 resources:
   - ../../base
   - configmaps
-patchesStrategicMerge:
-  - externalsecrets/dex-clients_patch.yaml
+patches:
+  - path: externalsecrets/dex-clients_patch.yaml
diff --git a/logging/overlays/nerc-ocp-infra/kustomization.yaml b/logging/overlays/nerc-ocp-infra/kustomization.yaml
@@ -4,5 +4,5 @@ kind: Kustomization
 resources:
 - ../../base
 
-patchesStrategicMerge:
-  - externalsecrets/openshift-logging-lokistack-gateway-bearer-token_patch.yaml
+patches:
+  - path: externalsecrets/openshift-logging-lokistack-gateway-bearer-token_patch.yaml
diff --git a/logging/overlays/nerc-ocp-prod/kustomization.yaml b/logging/overlays/nerc-ocp-prod/kustomization.yaml
@@ -4,6 +4,6 @@ kind: Kustomization
 resources:
 - ../../base
 
-patchesStrategicMerge:
-  - externalsecrets/openshift-logging-lokistack-gateway-bearer-token_patch.yaml
-  - clusterlogforwarders/instance_patch.yaml
+patches:
+  - path: externalsecrets/openshift-logging-lokistack-gateway-bearer-token_patch.yaml
+  - path: clusterlogforwarders/instance_patch.yaml
diff --git a/loki/overlays/nerc-ocp-infra/kustomization.yaml b/loki/overlays/nerc-ocp-infra/kustomization.yaml
@@ -4,5 +4,5 @@ kind: Kustomization
 resources:
 - ../../base
 
-patchesStrategicMerge:
-  - externalsecrets/loki-thanos-object-storage_patch.yaml
+patches:
+  - path: externalsecrets/loki-thanos-object-storage_patch.yaml