From 5c64dd7c9a245b9a1cdba134219c36245c2fa0ff Mon Sep 17 00:00:00 2001 From: marcel-dempers Date: Wed, 8 Jul 2020 12:19:27 +1000 Subject: [PATCH] updates --- .../kustomize/application/configmap.yaml | 19 ++++++++++--------- .../development/kustomization.yaml | 5 +---- .../production/configs/config.json | 4 ++-- .../production/kustomization.yaml | 7 +++++-- kubernetes/kustomize/kustomization.yaml | 5 ----- 5 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 kubernetes/kustomize/kustomization.yaml diff --git a/kubernetes/kustomize/application/configmap.yaml b/kubernetes/kustomize/application/configmap.yaml index 7037911..78cefd6 100644 --- a/kubernetes/kustomize/application/configmap.yaml +++ b/kubernetes/kustomize/application/configmap.yaml @@ -1,9 +1,10 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: example-config -data: - config.json: | - { - "environment" : "dev" - } +# apiVersion: v1 +# kind: ConfigMap +# metadata: +# name: example-config +# namespace: example +# data: +# config.json: | +# { +# "environment" : "dev" +# } diff --git a/kubernetes/kustomize/environments/development/kustomization.yaml b/kubernetes/kustomize/environments/development/kustomization.yaml index c5dcb7d..c7e3dad 100644 --- a/kubernetes/kustomize/environments/development/kustomization.yaml +++ b/kubernetes/kustomize/environments/development/kustomization.yaml @@ -1,7 +1,4 @@ bases: - ../../application patches: - - replica_count.yaml -images: -- name: aimvector/python - newTag: 1.0.1 \ No newline at end of file + - replica_count.yaml \ No newline at end of file diff --git a/kubernetes/kustomize/environments/production/configs/config.json b/kubernetes/kustomize/environments/production/configs/config.json index 2d60ccf..2ce7ad2 100644 --- a/kubernetes/kustomize/environments/production/configs/config.json +++ b/kubernetes/kustomize/environments/production/configs/config.json @@ -1,4 +1,4 @@ { "environment" : "prod", - "new" : "123" - } \ No newline at end of file + "hello": "world" +} \ No newline at end of file diff --git a/kubernetes/kustomize/environments/production/kustomization.yaml b/kubernetes/kustomize/environments/production/kustomization.yaml index 2ed2ae7..3f45601 100644 --- a/kubernetes/kustomize/environments/production/kustomization.yaml +++ b/kubernetes/kustomize/environments/production/kustomization.yaml @@ -6,8 +6,11 @@ patches: configMapGenerator: - name: example-config namespace: example - behavior: replace + #behavior: replace files: - configs/config.json patchesStrategicMerge: - - env.yaml \ No newline at end of file + - env.yaml +images: +- name: aimvector/python + newTag: 1.0.1 \ No newline at end of file diff --git a/kubernetes/kustomize/kustomization.yaml b/kubernetes/kustomize/kustomization.yaml deleted file mode 100644 index e296040..0000000 --- a/kubernetes/kustomize/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -resources: - - application/namespace.yaml - - application/deployment.yaml - - application/service.yaml - - application/configmap.yaml \ No newline at end of file