Merge pull request #18 from bcgov/deprecating-deployment-configs

Distinguish between environment between matchLabels
bcgov · Nov 19, 2024 · 06b4896 · 06b4896
2 parents faf4e12 + e7c61a7
commit 06b4896
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/tools/config/update-configmap.sh b/tools/config/update-configmap.sh
@@ -27,8 +27,3 @@ oc create -n "$OPENSHIFT_NAMESPACE" configmap \
   --from-file="appsettings.json=/tmp/appsettings.json" \
   --dry-run -o yaml | oc apply -f -
 
-echo
-echo Setting environment variables for "$APP_NAME-d365api-$ENV_VAL" application
-oc -n "$OPENSHIFT_NAMESPACE" set env \
-  --from="configmap/$APP_NAME-d365api-$ENV_VAL-config-map" \
-  "dc/$APP_NAME-d365api-$ENV_VAL"
diff --git a/tools/openshift/d365api.deployment.yaml b/tools/openshift/d365api.deployment.yaml
@@ -12,13 +12,13 @@ objects:
     annotations:
       openshift.io/generated-by: OpenShiftNewApp
     labels:
-      app: "${APP_NAME}-d365api-deployment"
+      app: "${APP_NAME}-d365api-${APP_ENVIRONMENT}-deployment"
     name: "${APP_NAME}-d365api-${APP_ENVIRONMENT}"
   spec:
     replicas: ${{MIN_REPLICAS}}
     selector:
       matchLabels:
-        app: "${APP_NAME}-d365api-deployment"
+        app: "${APP_NAME}-d365api-${APP_ENVIRONMENT}-deployment"
     strategy:
       type: RollingUpdate
       rollingUpdate:
@@ -29,7 +29,7 @@ objects:
         annotations:
           openshift.io/generated-by: OpenShiftNewApp
         labels:
-          app: "${APP_NAME}-d365api-deployment"
+          app: "${APP_NAME}-d365api-${APP_ENVIRONMENT}-deployment"
       spec:
         containers:
         - image: image-registry.openshift-image-registry.svc:5000/${NAMESPACE}/${REPO_NAME}-d365api-${BRANCH}:${TAG}
@@ -93,7 +93,7 @@ objects:
       service.alpha.openshift.io/serving-cert-secret-name: "ccof-backend-cert"
       openshift.io/generated-by: OpenShiftNewApp
     labels:
-      app: "${APP_NAME}-d365api-deployment"
+      app: "${APP_NAME}-d365api-${APP_ENVIRONMENT}-deployment"
     name: "${APP_NAME}-d365api-${APP_ENVIRONMENT}"
   spec:
     ports:
@@ -103,10 +103,10 @@ objects:
       targetPort: 5091
     - name: 443-https
       port: 443
-      protocol: TCP 
+      protocol: TCP
       targetPort: 443
     selector:
-      app: "${APP_NAME}-d365api-deployment"
+      app: "${APP_NAME}-d365api-${APP_ENVIRONMENT}-deployment"
 - apiVersion: autoscaling/v2
   kind: HorizontalPodAutoscaler
   metadata: