From 591cb7813f2e60535b360f2cc7baee9553ae83a0 Mon Sep 17 00:00:00 2001 From: Keller Fuchs Date: Wed, 3 May 2023 15:16:46 +0000 Subject: [PATCH 1/2] kustomize/advanced: kustomize v5 compatibility The bare `patches` attribute was apparently a legacy thing, which v5 attributed new meaning to; see kustomize#4911. patchesStrategicMerge should work on both v4 and v5. Closes: #5 --- kustomize/advanced/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kustomize/advanced/kustomization.yaml b/kustomize/advanced/kustomization.yaml index e0e1bc4..52406af 100644 --- a/kustomize/advanced/kustomization.yaml +++ b/kustomize/advanced/kustomization.yaml @@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../base/ -patches: +patchesStrategicMerge: - use-advanced.patch.yaml From c47ec975fa0a46f5e7671750254380dfa39c6fc2 Mon Sep 17 00:00:00 2001 From: Queer Supervillainess Date: Thu, 4 May 2023 15:01:56 +0000 Subject: [PATCH 2/2] kustomize/advanced: Use kustomize v5's new syntax instead By request of daurnimator & dgrove. Co-authored-by: daurnimator --- kustomize/advanced/kustomization.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kustomize/advanced/kustomization.yaml b/kustomize/advanced/kustomization.yaml index 52406af..ef5c80a 100644 --- a/kustomize/advanced/kustomization.yaml +++ b/kustomize/advanced/kustomization.yaml @@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../base/ -patchesStrategicMerge: - - use-advanced.patch.yaml +patches: + - path: use-advanced.patch.yaml