saved working code

.github/workflows/bootstrap-argocd.yml

@@ -26,10 +26,10 @@ jobs:
         include:
           - environment: dev
             cluster: eks-dev-cluster
-          # - environment: staging
-          #   cluster: eks-staging-cluster
-          # - environment: prod
-          #   cluster: eks-prod-cluster
+          - environment: staging
+            cluster: eks-staging-cluster
+          - environment: prod
+            cluster: eks-prod-cluster
 
     steps:
       - uses: actions/checkout@v4

apps/order-service/overlays/dev/kustomization.yaml

@@ -10,7 +10,7 @@ namespace: dev
 images:
   - name: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/order-service
     newName: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/order-service
-    newTag: 75c566e3063d58803f614facda8a3a6e0df6e812
+    newTag: 28693b4fcc780e82605d4368b13dc437037b4567
 
 replicas:
 - count: 1

apps/order-service/overlays/prod/external-secret.yaml

@@ -2,7 +2,39 @@ apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
   name: order-db-secret
+  namespace: prod
+
 spec:
-  dataFrom:
-    - extract:
-        key: /prod/order/db
+  secretStoreRef:
+    name: aws-secretsmanager
+    kind: ClusterSecretStore
+
+  target:
+    name: order-db-secret
+    creationPolicy: Owner
+
+  data:
+    - secretKey: host
+      remoteRef:
+        key: /prod/order/db
+        property: host
+
+    - secretKey: port
+      remoteRef:
+        key: /prod/order/db
+        property: port
+
+    - secretKey: database
+      remoteRef:
+        key: /prod/order/db
+        property: database
+
+    - secretKey: username
+      remoteRef:
+        key: /prod/order/db
+        property: username
+
+    - secretKey: password
+      remoteRef:
+        key: /prod/order/db
+        property: password

apps/order-service/overlays/prod/kustomization.yaml

@@ -1,14 +1,18 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
-  - ../../base
-  - external-secret.yaml
+- ../../base
+- external-secret.yaml
 
 namespace: prod
 
 images:
   - name: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/order-service
-    newTag: ${GITHUB_SHA}
-
+    newName: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/order-service
+    newTag: 28693b4fcc780e82605d4368b13dc437037b4567
 
 replicas:
-  - name: order-service
-    count: 1
+- count: 1
+  name: order-service
+

apps/order-service/overlays/staging/external-secret.yaml

@@ -2,7 +2,39 @@ apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
   name: order-db-secret
+  namespace: staging
+
 spec:
-  dataFrom:
-    - extract:
-        key: /staging/order/db
+  secretStoreRef:
+    name: aws-secretsmanager
+    kind: ClusterSecretStore
+
+  target:
+    name: order-db-secret
+    creationPolicy: Owner
+
+  data:
+    - secretKey: host
+      remoteRef:
+        key: /staging/order/db
+        property: host
+
+    - secretKey: port
+      remoteRef:
+        key: /staging/order/db
+        property: port
+
+    - secretKey: database
+      remoteRef:
+        key: /staging/order/db
+        property: database
+
+    - secretKey: username
+      remoteRef:
+        key: /staging/order/db
+        property: username
+
+    - secretKey: password
+      remoteRef:
+        key: /staging/order/db
+        property: password

apps/order-service/overlays/staging/kustomization.yaml

@@ -1,14 +1,18 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
-  - ../../base
-  - external-secret.yaml
+- ../../base
+- external-secret.yaml
 
 namespace: staging
 
 images:
   - name: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/order-service
-    newTag: ${GITHUB_SHA}
-
+    newName: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/order-service
+    newTag: 28693b4fcc780e82605d4368b13dc437037b4567
 
 replicas:
-  - name: order-service
-    count: 1
+- count: 1
+  name: order-service
+

apps/payment-service/overlays/dev/kustomization.yaml

@@ -7,7 +7,7 @@ namespace: dev
 images:
   - name: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/payment-service
     newName: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/payment-service
-    newTag: 75c566e3063d58803f614facda8a3a6e0df6e812
+    newTag: 28693b4fcc780e82605d4368b13dc437037b4567
 
 
 

apps/payment-service/overlays/prod/external-secret.yaml

@@ -1,8 +1,40 @@
-apiVersion: external-secrets.io/v1beta1
+apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
   name: payment-db-secret
+  namespace: prod
+
 spec:
-  dataFrom:
-    - extract:
-        key: /prod/payment/db
+  secretStoreRef:
+    name: aws-secretsmanager
+    kind: ClusterSecretStore
+
+  target:
+    name: payment-db-secret
+    creationPolicy: Owner
+
+  data:
+    - secretKey: host
+      remoteRef:
+        key: /prod/payment/db
+        property: host
+
+    - secretKey: port
+      remoteRef:
+        key: /prod/payment/db
+        property: port
+
+    - secretKey: database
+      remoteRef:
+        key: /prod/payment/db
+        property: database
+
+    - secretKey: username
+      remoteRef:
+        key: /prod/payment/db
+        property: username
+
+    - secretKey: password
+      remoteRef:
+        key: /prod/payment/db
+        property: password

apps/payment-service/overlays/prod/kustomization.yaml

@@ -1,14 +1,18 @@
 resources:
-  - ../../base
-  - external-secret.yaml
+- ../../base
+- external-secret.yaml
 
 namespace: prod
 
 images:
   - name: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/payment-service
-    newTag: ${GITHUB_SHA}
+    newName: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/payment-service
+    newTag: 28693b4fcc780e82605d4368b13dc437037b4567
+
 
 
 replicas:
-  - name: payment-service
-    count: 1
+- count: 1
+  name: payment-service
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization

apps/payment-service/overlays/staging/external-secret.yaml

@@ -1,8 +1,40 @@
-apiVersion: external-secrets.io/v1beta1
+apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
   name: payment-db-secret
+  namespace: staging
+
 spec:
-  dataFrom:
-    - extract:
-        key: /staging/payment/db
+  secretStoreRef:
+    name: aws-secretsmanager
+    kind: ClusterSecretStore
+
+  target:
+    name: payment-db-secret
+    creationPolicy: Owner
+
+  data:
+    - secretKey: host
+      remoteRef:
+        key: /staging/payment/db
+        property: host
+
+    - secretKey: port
+      remoteRef:
+        key: /staging/payment/db
+        property: port
+
+    - secretKey: database
+      remoteRef:
+        key: /staging/payment/db
+        property: database
+
+    - secretKey: username
+      remoteRef:
+        key: /staging/payment/db
+        property: username
+
+    - secretKey: password
+      remoteRef:
+        key: /staging/payment/db
+        property: password

apps/payment-service/overlays/staging/kustomization.yaml

@@ -1,14 +1,18 @@
 resources:
-  - ../../base
-  - external-secret.yaml
+- ../../base
+- external-secret.yaml
 
 namespace: staging
 
 images:
   - name: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/payment-service
-    newTag: ${GITHUB_SHA}
+    newName: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/payment-service
+    newTag: 28693b4fcc780e82605d4368b13dc437037b4567
+
 
 
 replicas:
-  - name: payment-service
-    count: 1
+- count: 1
+  name: payment-service
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization

apps/product-service/overlays/dev/kustomization.yaml

@@ -7,7 +7,7 @@ namespace: dev
 images:
   - name: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/product-service
     newName: 579871530627.dkr.ecr.us-east-1.amazonaws.com/ja-mics-ap/product-service
-    newTag: 75c566e3063d58803f614facda8a3a6e0df6e812
+    newTag: 28693b4fcc780e82605d4368b13dc437037b4567
 
 
 

apps/product-service/overlays/prod/external-secret.yaml

@@ -1,8 +1,40 @@
-apiVersion: external-secrets.io/v1beta1
+apiVersion: external-secrets.io/v1
 kind: ExternalSecret
 metadata:
   name: product-db-secret
+  namespace: prod
+
 spec:
-  dataFrom:
-    - extract:
-        key: /prod/product/db
+  secretStoreRef:
+    name: aws-secretsmanager
+    kind: ClusterSecretStore
+
+  target:
+    name: product-db-secret
+    creationPolicy: Owner
+
+  data:
+    - secretKey: host
+      remoteRef:
+        key: /prod/product/db
+        property: host
+
+    - secretKey: port
+      remoteRef:
+        key: /prod/product/db
+        property: port
+
+    - secretKey: database
+      remoteRef:
+        key: /prod/product/db
+        property: database
+
+    - secretKey: username
+      remoteRef:
+        key: /prod/product/db
+        property: username
+
+    - secretKey: password
+      remoteRef:
+        key: /prod/product/db
+        property: password