From ae9be6e6766f9de85a1da1bcf066c68353871520 Mon Sep 17 00:00:00 2001
From: Massaki Archambault <marchambault@badjware.dev>
Date: Mon, 20 Feb 2023 09:26:17 -0500
Subject: [PATCH] replace use of patchesStrategicMerge and patchesJson6902

---
 kustomize/bases/grafana-agent/kustomization.yaml | 2 +-
 kustomize/bases/nextcloud/kustomization.yaml     | 6 +++---
 kustomize/overlays/prod/kustomization.yaml       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kustomize/bases/grafana-agent/kustomization.yaml b/kustomize/bases/grafana-agent/kustomization.yaml
index 635d2a6..73303e4 100644
--- a/kustomize/bases/grafana-agent/kustomization.yaml
+++ b/kustomize/bases/grafana-agent/kustomization.yaml
@@ -6,7 +6,7 @@ commonLabels:
   app.kubernetes.io/name: grafana-agent
   app.kubernetes.io/part-of: monitoring
 
-patchesJson6902:
+patches:
   - target:
       version: v1
       kind: StatefulSet
diff --git a/kustomize/bases/nextcloud/kustomization.yaml b/kustomize/bases/nextcloud/kustomization.yaml
index 67636f8..e44f312 100644
--- a/kustomize/bases/nextcloud/kustomization.yaml
+++ b/kustomize/bases/nextcloud/kustomization.yaml
@@ -7,8 +7,8 @@ resources:
 commonLabels:
   app.kubernetes.io/name: nextcloud
 
-patchesStrategicMerge:
-  - |-
+patches:
+- patch: |-
     apiVersion: external-secrets.io/v1beta1
     kind: ExternalSecret
     metadata:
@@ -24,7 +24,7 @@ patchesStrategicMerge:
         - secretKey: password
           remoteRef:
             key: /k3s/prod/nextcloud/postgres/password
-  - |-
+- patch: |-
     apiVersion: external-secrets.io/v1beta1
     kind: ExternalSecret
     metadata:
diff --git a/kustomize/overlays/prod/kustomization.yaml b/kustomize/overlays/prod/kustomization.yaml
index f856eaa..7a43aa7 100644
--- a/kustomize/overlays/prod/kustomization.yaml
+++ b/kustomize/overlays/prod/kustomization.yaml
@@ -63,7 +63,7 @@ secretGenerator:
 commonLabels:
   app.kubernetes.io/managed-by: kustomize
 
-patchesJson6902:
+patches:
   - target: 
       version: v1
       kind: Deployment