From 08b4bf72c200729d4d8a49d6607c49a2701c0201 Mon Sep 17 00:00:00 2001 From: jmicanek Date: Wed, 5 Jun 2024 12:53:12 +0200 Subject: [PATCH 1/2] Fixup kustomize fields ArgoCD sync is failing due to incorrect field naming. Fixes done by running "kustomize edit fix" in the dev/ and prod/ dirs --- kustom-webapp/overlays/dev/kustomization.yaml | 15 +++++++++------ kustom-webapp/overlays/prod/kustomization.yaml | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/kustom-webapp/overlays/dev/kustomization.yaml b/kustom-webapp/overlays/dev/kustomization.yaml index 21c1717e..16320917 100644 --- a/kustom-webapp/overlays/dev/kustomization.yaml +++ b/kustom-webapp/overlays/dev/kustomization.yaml @@ -1,9 +1,12 @@ -bases: -- ../../base -patches: - - replicas.yaml +patchesStrategicMerge: +- replicas.yaml configMapGenerator: -- name: mykustom-map - env: config.properties \ No newline at end of file +- envs: + - config.properties + name: mykustom-map +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base diff --git a/kustom-webapp/overlays/prod/kustomization.yaml b/kustom-webapp/overlays/prod/kustomization.yaml index 21c1717e..16320917 100644 --- a/kustom-webapp/overlays/prod/kustomization.yaml +++ b/kustom-webapp/overlays/prod/kustomization.yaml @@ -1,9 +1,12 @@ -bases: -- ../../base -patches: - - replicas.yaml +patchesStrategicMerge: +- replicas.yaml configMapGenerator: -- name: mykustom-map - env: config.properties \ No newline at end of file +- envs: + - config.properties + name: mykustom-map +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base From a517f63a072692f836d71fddd52814d9669f6960 Mon Sep 17 00:00:00 2001 From: Jakub Micanek Date: Fri, 7 Jun 2024 09:13:49 +0200 Subject: [PATCH 2/2] Update values-dev.yaml --- helm-webapp/values-dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-webapp/values-dev.yaml b/helm-webapp/values-dev.yaml index a53c0b2f..f578b84b 100644 --- a/helm-webapp/values-dev.yaml +++ b/helm-webapp/values-dev.yaml @@ -1,5 +1,5 @@ -replicas: 5 +replicas: 3 configmap: data: