Merge branch 'main' of https://github.com/KBTG-Kampus-ClassNest-SE-Ja…

…va/workshop-group-4
KBTG-Kampus-ClassNest-SE-Java · Mar 24, 2024 · 90755c3 · 90755c3
2 parents fc6a658 + c36a283
commit 90755c3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/infra/gitops/dev/configmap.yml b/infra/gitops/dev/configmap.yml
@@ -8,4 +8,5 @@ data:
   db.username: "postgres"
   db.password: "YGSQOnBlYd+6"
   enabled.feature.promotion.list.api: "true"
+  enabled.shipping.fee: "true"
 
diff --git a/infra/gitops/dev/deployment.yml b/infra/gitops/dev/deployment.yml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: kbazaar-api
-          image: ghcr.io/kbtg-kampus-classnest-se-java/workshop-group-4:9e1e291a5bdce40e00cfd967bb1061611a5496a3
+          image: ghcr.io/kbtg-kampus-classnest-se-java/workshop-group-4:2813dfdc69068a041c985c2d480b4217196acfe4
           imagePullPolicy: Always
           ports:
             - containerPort: 8080
@@ -40,6 +40,11 @@ spec:
                 configMapKeyRef:
                   name: app-config
                   key: enabled.feature.promotion.list.api
+            - name: ENABLE_SHIPPING_FEE
+              valueFrom:
+                configMapKeyRef:
+                  name: app-config
+                  key: enabled.shipping.fee
           resources:
             limits:
               cpu: "1"

diff --git a/infra/gitops/prod/configmap.yml b/infra/gitops/prod/configmap.yml
@@ -7,4 +7,5 @@ data:
   db.url: "jdbc:postgresql://ec2-13-250-18-96.ap-southeast-1.compute.amazonaws.com/prod-group-4"
   db.username: "postgres"
   db.password: "YGSQOnBlYd+6"
-  enabled.feature.promotion.list.api: "true"
+  enabled.feature.promotion.list.api: "true"
+  enabled.shipping.fee: "true"
diff --git a/infra/gitops/prod/deployment.yml b/infra/gitops/prod/deployment.yml
@@ -40,6 +40,11 @@ spec:
                 configMapKeyRef:
                   name: app-config
                   key: enabled.feature.promotion.list.api
+            - name: ENABLE_SHIPPING_FEE
+              valueFrom:
+                configMapKeyRef:
+                  name: app-config
+                  key: enabled.shipping.fee
           resources:
             limits:
               cpu: "1"