From 33a98c0e88bfbc328b48ec9cf30f86ead0774f3a Mon Sep 17 00:00:00 2001
From: Trevor Richards <trev@trevdev.ca>
Date: Thu, 5 Dec 2024 11:04:22 -0800
Subject: [PATCH] fix: specificity of matchLabels in frontend

---
 tools/openshift/frontend-tls.deployment.yaml | 12 ++++++------
 tools/openshift/frontend.deployment.yaml     | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/openshift/frontend-tls.deployment.yaml b/tools/openshift/frontend-tls.deployment.yaml
index 3e8e382d..9fe4896b 100644
--- 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
index c0b248a5..404fe8cc 100644
--- 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'