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

fix: variable matchLabels
bcgov · Nov 19, 2024 · 9e1020f · 9e1020f
2 parents a607b20 + 08c233f
commit 9e1020f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 24 deletions.
diff --git a/tools/openshift/backend.deployment.yaml b/tools/openshift/backend.deployment.yaml
@@ -12,14 +12,14 @@ objects:
     annotations:
       openshift.io/generated-by: OpenShiftNewApp
     labels:
-      app: "${APP_NAME}-${BRANCH}-backend-deployment"
+      app: "${APP_NAME}-backend-deployment"
       branch: "${BRANCH}"
     name: "${APP_NAME}-backend-${APP_ENVIRONMENT}"
   spec:
     replicas: ${{MIN_REPLICAS}}
     selector:
       matchLabels:
-        app: "${APP_NAME}-${BRANCH}-backend-deployment"
+        app: "${APP_NAME}-backend-deployment"
     strategy:
       type: RollingUpdate
       rollingUpdate:
@@ -30,7 +30,7 @@ objects:
         annotations:
           openshift.io/generated-by: OpenShiftNewApp
         labels:
-          app: "${APP_NAME}-${BRANCH}-backend-deployment"
+          app: "${APP_NAME}-backend-deployment"
       spec:
         containers:
         - image: image-registry.openshift-image-registry.svc:5000/${NAMESPACE}/${REPO_NAME}-backend-${BRANCH}:${TAG}
@@ -132,7 +132,7 @@ objects:
       service.alpha.openshift.io/serving-cert-secret-name: "ccof-backend-cert"
       openshift.io/generated-by: OpenShiftNewApp
     labels:
-      app: "${APP_NAME}-${BRANCH}-backend-deployment"
+      app: "${APP_NAME}-backend-deployment"
     name: "${APP_NAME}-backend-${APP_ENVIRONMENT}"
   spec:
     ports:
@@ -145,7 +145,7 @@ objects:
       protocol: TCP
       targetPort: 443
     selector:
-      app: "${APP_NAME}-${BRANCH}-backend-deployment"
+      app: "${APP_NAME}-backend-deployment"
 - apiVersion: v1
   kind: Route
   metadata:
@@ -156,7 +156,7 @@ objects:
       haproxy.router.openshift.io/timeout: 120s
       openshift.io/host.generated: 'true'
     labels:
-      app: "${APP_NAME}-${BRANCH}-backend-deployment"
+      app: "${APP_NAME}-backend-deployment"
     name: "${APP_NAME}-backend-${APP_ENVIRONMENT}"
   spec:
     host: "${HOST_ROUTE}"

diff --git a/tools/openshift/backend.no-fb.deployment.yaml b/tools/openshift/backend.no-fb.deployment.yaml
@@ -12,14 +12,14 @@ objects:
     annotations:
       openshift.io/generated-by: OpenShiftNewApp
     labels:
-      app: "${APP_NAME}-${BRANCH}"
+      app: "${APP_NAME}-backend-no-fb-deployment"
       branch: "${BRANCH}"
     name: "${APP_NAME}-backend-${APP_ENVIRONMENT}"
   spec:
     replicas: ${{MIN_REPLICAS}}
     selector:
       matchLabels:
-        app: "${APP_NAME}-${BRANCH}"
+        app: "${APP_NAME}-backend-no-fb-deployment"
     strategy:
       type: RollingUpdate
       rollingUpdate:
@@ -30,7 +30,7 @@ objects:
         annotations:
           openshift.io/generated-by: OpenShiftNewApp
         labels:
-          app: "${APP_NAME}-${BRANCH}"
+          app: "${APP_NAME}-backend-no-fb-deployment"
       spec:
         containers:
         - image: image-registry.openshift-image-registry.svc:5000/${NAMESPACE}/${REPO_NAME}-backend-${BRANCH}:${TAG}
@@ -91,7 +91,7 @@ objects:
       service.alpha.openshift.io/serving-cert-secret-name: "ccof-backend-cert"
       openshift.io/generated-by: OpenShiftNewApp
     labels:
-      app: "${APP_NAME}-${BRANCH}"
+      app: "${APP_NAME}-backend-no-fb-deployment"
     name: "${APP_NAME}-backend-${APP_ENVIRONMENT}"
   spec:
     ports:
@@ -104,7 +104,7 @@ objects:
       protocol: TCP
       targetPort: 443
     selector:
-      app: "${APP_NAME}-${BRANCH}"
+      app: "${APP_NAME}-backend-no-fb-deployment"
 - apiVersion: v1
   kind: Route
   metadata:
@@ -115,7 +115,7 @@ objects:
       haproxy.router.openshift.io/timeout: 120s
       openshift.io/host.generated: 'true'
     labels:
-      app: "${APP_NAME}-${BRANCH}"
+      app: "${APP_NAME}-backend-no-fb-deployment"
     name: "${APP_NAME}-backend-${APP_ENVIRONMENT}"
   spec:
     host: "${HOST_ROUTE}"

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

diff --git a/tools/openshift/nginx.deployment.yaml b/tools/openshift/nginx.deployment.yaml
@@ -12,14 +12,14 @@ objects:
     annotations:
       openshift.io/generated-by: OpenShiftNewApp
     labels:
-      app: "${APP_NAME}-${BRANCH}-nginx-deployment"
+      app: "${APP_NAME}-nginx-deployment"
       branch: "${BRANCH}"
     name: "${APP_NAME}-nginx-${APP_ENVIRONMENT}"
   spec:
     replicas: ${{MIN_REPLICAS}}
     selector:
       matchLabels:
-        app: "${APP_NAME}-${BRANCH}-nginx-deployment"
+        app: "${APP_NAME}-nginx-deployment"
     strategy:
       type: RollingUpdate
       rollingUpdate:
@@ -30,7 +30,7 @@ objects:
         annotations:
           openshift.io/generated-by: OpenShiftNewApp
         labels:
-          app: "${APP_NAME}-${BRANCH}-nginx-deployment"
+          app: "${APP_NAME}-nginx-deployment"
       spec:
         containers:
         - image: artifacts.developer.gov.bc.ca/docker-remote/nginxinc/nginx-unprivileged:1.27-alpine
@@ -91,7 +91,7 @@ objects:
       openshift.io/generated-by: OpenShiftNewApp
       service.alpha.openshift.io/serving-cert-secret-name: ccof-frontend-cert
     labels:
-      app: "${APP_NAME}-${BRANCH}-nginx-deployment"
+      app: "${APP_NAME}-nginx-deployment"
     name: "${APP_NAME}-nginx-${APP_ENVIRONMENT}"
   spec:
     ports:
@@ -100,14 +100,14 @@ objects:
       protocol: TCP
       targetPort: 8080
     selector:
-      app: "${APP_NAME}-${BRANCH}-nginx-deployment"
+      app: "${APP_NAME}-nginx-deployment"
 - apiVersion: v1
   kind: Route
   metadata:
     annotations:
       openshift.io/host.generated: "true"
     labels:
-      app: "${APP_NAME}-${BRANCH}-nginx-deployment"
+      app: "${APP_NAME}-nginx-deployment"
     name: "${APP_NAME}-nginx-${APP_ENVIRONMENT}"
   spec:
     host: "${HOST_ROUTE}"
@@ -180,3 +180,4 @@ parameters:
   description: The basic authentication for liveness/readiness probes
   required: true
 
+