fix: specificity of matchLabels in frontend

bcgov · Dec 5, 2024 · 33a98c0 · 33a98c0
1 parent ad11982
commit 33a98c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/tools/openshift/frontend-tls.deployment.yaml b/tools/openshift/frontend-tls.deployment.yaml
@@ -13,14 +13,14 @@ objects:
         openshift.io/generated-by: OpenShiftNewApp
       creationTimestamp:
       labels:
-        app: '${APP_NAME}-frontend-${BRANCH}'
+        app: '${APP_NAME}-frontend-${ENVIRONMENT}-${BRANCH}'
         branch: '${BRANCH}'
       name: '${APP_NAME}-frontend-${ENVIRONMENT}'
     spec:
       replicas: ${{MIN_REPLICAS}}
       selector:
         matchLabels:
-          app: '${APP_NAME}-frontend-${BRANCH}'
+          app: '${APP_NAME}-frontend-${ENVIRONMENT}-${BRANCH}'
       strategy:
         type: RollingUpdate
         rollingUpdate:
@@ -32,7 +32,7 @@ objects:
             openshift.io/generated-by: OpenShiftNewApp
           creationTimestamp:
           labels:
-            app: '${APP_NAME}-frontend-${BRANCH}'
+            app: '${APP_NAME}-frontend-${ENVIRONMENT}-${BRANCH}'
             deploymentconfig: '${APP_NAME}-frontend-${ENVIRONMENT}'
         spec:
           containers:
@@ -89,7 +89,7 @@ objects:
         openshift.io/generated-by: OpenShiftNewApp
       creationTimestamp:
       labels:
-        app: '${APP_NAME}-frontend-${BRANCH}'
+        app: '${APP_NAME}-frontend-${ENVIRONMENT}-${BRANCH}'
       name: '${APP_NAME}-frontend-${ENVIRONMENT}'
     spec:
       ports:
@@ -98,14 +98,14 @@ objects:
           protocol: TCP
           targetPort: 2015
       selector:
-        app: '${APP_NAME}-frontend-${BRANCH}'
+        app: '${APP_NAME}-frontend-${ENVIRONMENT}-${BRANCH}'
         deploymentconfig: '${APP_NAME}-frontend-${ENVIRONMENT}'
   - apiVersion: v1
     kind: Route
     metadata:
       name: '${APP_NAME}-frontend-${ENVIRONMENT}'
       labels:
-        app: '${APP_NAME}-frontend-${BRANCH}'
+        app: '${APP_NAME}-frontend-${ENVIRONMENT}-${BRANCH}'
       annotations:
         openshift.io/host.generated: 'true'
         router.openshift.io/cookie-same-site: 'Strict'

diff --git a/tools/openshift/frontend.deployment.yaml b/tools/openshift/frontend.deployment.yaml
@@ -12,14 +12,14 @@ objects:
       annotations:
         openshift.io/generated-by: OpenShiftNewApp
       labels:
-        app: '${APP_NAME}-frontend-${BRANCH}'
+        app: '${APP_NAME}-frontend-${ENVIRONMENT}-${BRANCH}'
         branch: '${BRANCH}'
       name: '${APP_NAME}-frontend-${ENVIRONMENT}'
     spec:
       replicas: ${{MIN_REPLICAS}}
       selector:
         matchLabels:
-          app: '${APP_NAME}-frontend-${BRANCH}'
+          app: '${APP_NAME}-frontend-${ENVIRONMENT}-${BRANCH}'
       strategy:
         type: RollingUpdate
         rollingUpdate:
@@ -30,7 +30,7 @@ objects:
           annotations:
             openshift.io/generated-by: OpenShiftNewApp
           labels:
-            app: '${APP_NAME}-frontend-${BRANCH}'
+            app: '${APP_NAME}-frontend-${ENVIRONMENT}-${BRANCH}'
         spec:
           containers:
             - image: image-registry.openshift-image-registry.svc:5000/${NAMESPACE}/${REPO_NAME}-frontend:${TAG}
@@ -79,7 +79,7 @@ objects:
         service.alpha.openshift.io/serving-cert-secret-name: 'ofm-frontend-cert'
         openshift.io/generated-by: OpenShiftNewApp
       labels:
-        app: '${APP_NAME}-frontend-${BRANCH}'
+        app: '${APP_NAME}-frontend-${ENVIRONMENT}-${BRANCH}'
       name: '${APP_NAME}-frontend-${ENVIRONMENT}'
     spec:
       ports:
@@ -88,13 +88,13 @@ objects:
           protocol: TCP
           targetPort: 2015
       selector:
-        app: '${APP_NAME}-frontend-${BRANCH}'
+        app: '${APP_NAME}-frontend-${ENVIRONMENT}-${BRANCH}'
   - apiVersion: v1
     kind: Route
     metadata:
       name: '${APP_NAME}-frontend-${ENVIRONMENT}'
       labels:
-        app: '${APP_NAME}-frontend-${BRANCH}'
+        app: '${APP_NAME}-frontend-${ENVIRONMENT}-${BRANCH}'
       annotations:
         openshift.io/host.generated: 'true'
         router.openshift.io/cookie-same-site: 'Strict'