From 86ffc1ea74410c641f05546957ce070880d44b65 Mon Sep 17 00:00:00 2001
From: Tony Chia <tchia04@gmail.com>
Date: Sat, 20 Jul 2024 19:41:45 -0700
Subject: [PATCH 1/2] fix various kustomize issue

---
 .../kustomize/application/configmap.yaml      | 20 +++++------
 .../kustomize/application/kustomization.yaml  | 12 ++++---
 .../development/kustomization.yaml            | 11 +++---
 .../production/kustomization.yaml             | 34 ++++++++++---------
 4 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/kubernetes/kustomize/application/configmap.yaml b/kubernetes/kustomize/application/configmap.yaml
index 78cefd6a2..4bd3ad6fd 100644
--- a/kubernetes/kustomize/application/configmap.yaml
+++ b/kubernetes/kustomize/application/configmap.yaml
@@ -1,10 +1,10 @@
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: example-config
-#   namespace: example
-# 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/application/kustomization.yaml b/kubernetes/kustomize/application/kustomization.yaml
index dd0ecda3f..772faeb69 100644
--- a/kubernetes/kustomize/application/kustomization.yaml
+++ b/kubernetes/kustomize/application/kustomization.yaml
@@ -1,5 +1,7 @@
-resources:
-  - namespace.yaml
-  - deployment.yaml
-  - service.yaml
-  - configmap.yaml
\ No newline at end of file
+resources:
+- namespace.yaml
+- deployment.yaml
+- service.yaml
+- configmap.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
diff --git a/kubernetes/kustomize/environments/development/kustomization.yaml b/kubernetes/kustomize/environments/development/kustomization.yaml
index c7e3dadde..682e9d9d4 100644
--- a/kubernetes/kustomize/environments/development/kustomization.yaml
+++ b/kubernetes/kustomize/environments/development/kustomization.yaml
@@ -1,4 +1,7 @@
-bases:
-  - ../../application
-patches:
-  - replica_count.yaml
\ No newline at end of file
+#patches:
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../application
+patches:
+- path: replica_count.yaml
diff --git a/kubernetes/kustomize/environments/production/kustomization.yaml b/kubernetes/kustomize/environments/production/kustomization.yaml
index 3f45601c6..5384ce5bc 100644
--- a/kubernetes/kustomize/environments/production/kustomization.yaml
+++ b/kubernetes/kustomize/environments/production/kustomization.yaml
@@ -1,16 +1,18 @@
-bases:
-  - ../../application
-patches:
-  - replica_count.yaml
-  - resource_limits.yaml
-configMapGenerator:
-- name: example-config
-  namespace: example
-  #behavior: replace
-  files:
-    - configs/config.json
-patchesStrategicMerge:
-  - env.yaml
-images:
-- name: aimvector/python
-  newTag: 1.0.1
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../application
+patches:
+- path: replica_count.yaml
+- path: resource_limits.yaml
+- path: env.yaml
+
+configMapGenerator:
+  - name: example-config
+    namespace: example
+    behavior: replace
+    files:
+    - configs/config.json
+images:
+- name: aimvector/python
+  newTag: 1.0.1

From 0171046ca40543fb3e0957c48b6205c44dbf7687 Mon Sep 17 00:00:00 2001
From: Tony Chia <tchia04@gmail.com>
Date: Sat, 20 Jul 2024 19:48:07 -0700
Subject: [PATCH 2/2] chore: cleanup

---
 kubernetes/kustomize/application/kustomization.yaml           | 4 ++--
 .../kustomize/environments/development/kustomization.yaml     | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/kubernetes/kustomize/application/kustomization.yaml b/kubernetes/kustomize/application/kustomization.yaml
index 772faeb69..19dfec24e 100644
--- a/kubernetes/kustomize/application/kustomization.yaml
+++ b/kubernetes/kustomize/application/kustomization.yaml
@@ -1,7 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
 - namespace.yaml
 - deployment.yaml
 - service.yaml
 - configmap.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
diff --git a/kubernetes/kustomize/environments/development/kustomization.yaml b/kubernetes/kustomize/environments/development/kustomization.yaml
index 682e9d9d4..ac5ae9e4d 100644
--- a/kubernetes/kustomize/environments/development/kustomization.yaml
+++ b/kubernetes/kustomize/environments/development/kustomization.yaml
@@ -1,4 +1,3 @@
-#patches:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources: