Makefile

@@ -4,7 +4,7 @@ KUSTOMIZEFLAGS = --enable-alpha-plugins
 KUBECTL = kubectl
 KUBECTLFLAGS = 
 KUBECTLDIFFFLAGS =
-KUBECTLAPPLYFLAGS = --server-side=true --force-conflicts --prune
+KUBECTLAPPLYFLAGS = --prune
 
 SRC := $(shell find kustomize/ -type f)
 OUTDIR = build

kustomize/bases/grafana-agent/kustomization.yaml

@@ -6,7 +6,7 @@ commonLabels:
   app.kubernetes.io/name: grafana-agent
   app.kubernetes.io/part-of: monitoring
 
-patches:
+patchesJson6902:
   - target:
       version: v1
       kind: StatefulSet

kustomize/bases/nextcloud/kustomization.yaml

@@ -7,8 +7,8 @@ resources:
 commonLabels:
   app.kubernetes.io/name: nextcloud
 
-patches:
-- patch: |-
+patchesStrategicMerge:
+  - |-
     apiVersion: external-secrets.io/v1beta1
     kind: ExternalSecret
     metadata:
@@ -24,7 +24,7 @@ patches:
         - secretKey: password
           remoteRef:
             key: /k3s/prod/nextcloud/postgres/password
-- patch: |-
+  - |-
     apiVersion: external-secrets.io/v1beta1
     kind: ExternalSecret
     metadata:

kustomize/bases/prometheus-operator/kustomization.yaml

@@ -1,5 +1,5 @@
 resources:
-  - https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.63.0/bundle.yaml
+  - https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.50/bundle.yaml
 
 namespace: kube-system
 

kustomize/overlays/prod/kustomization.yaml

@@ -63,7 +63,7 @@ secretGenerator:
 commonLabels:
   app.kubernetes.io/managed-by: kustomize
 
-patches:
+patchesJson6902:
   - target: 
       version: v1
       kind: Deployment