fmn: switch to more generic label instead of service

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

roles/openshift-apps/fmn/files/service.yml

@@ -5,7 +5,7 @@ metadata:
   name: frontend
   labels:
     app: fmn
-    service: frontend
+    component: frontend
 spec:
   ports:
     - name: web
@@ -13,7 +13,7 @@ spec:
       targetPort: 8080
   selector:
     app: fmn
-    service: frontend
+    component: frontend
 ---
 apiVersion: v1
 kind: Service
@@ -21,7 +21,7 @@ metadata:
   name: api
   labels:
     app: fmn
-    service: api
+    component: api
 spec:
   ports:
     - name: web
@@ -29,7 +29,7 @@ spec:
       targetPort: 8080
   selector:
     app: fmn
-    service: api
+    component: api
 ---
 apiVersion: v1
 kind: Service
@@ -37,7 +37,7 @@ metadata:
   name: sendria
   labels:
     app: fmn
-    service: sendria
+    component: sendria
 spec:
   ports:
     - name: web
@@ -48,7 +48,7 @@ spec:
       targetPort: 1025
   selector:
     app: fmn
-    service: sendria
+    component: sendria
 ---
 apiVersion: v1
 kind: Service
@@ -56,7 +56,7 @@ metadata:
   name: redis
   labels:
     app: fmn
-    service: redis
+    component: redis
 spec:
   ports:
     - name: redis
@@ -65,4 +65,4 @@ spec:
       targetPort: 6379
   selector:
     app: fmn
-    service: redis
+    component: redis

roles/openshift-apps/fmn/templates/deployment.yml.j2

@@ -6,13 +6,13 @@ metadata:
   name: frontend
   labels:
     app: fmn
-    service: frontend
+    component: frontend
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
-      service: frontend
+      component: frontend
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -60,13 +60,13 @@ metadata:
   name: api
   labels:
     app: fmn
-    service: api
+    component: api
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
-      service: api
+      component: api
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -167,13 +167,13 @@ metadata:
   name: fmn
   labels:
     app: fmn
-    service consumer
+    component consumer
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
-      service: consumer
+      component: consumer
   strategy:
     type: Recreate
   template:
@@ -258,13 +258,13 @@ metadata:
   name: sender-email
   labels:
     app: fmn
-    service: sender-email
+    component: sender-email
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
-      service: sender-email
+      component: sender-email
   strategy:
     type: Recreate
   template:
@@ -315,13 +315,13 @@ metadata:
   name: sender-irc
   labels:
     app: fmn
-    service: sender-irc
+    component: sender-irc
 spec:
   replicas: {{ (env == 'production')|ternary('1', '0') }}
   selector:
     matchLabels:
       app: fmn
-      service: sender-irc
+      component: sender-irc
   strategy:
     type: Recreate
   template:
@@ -372,13 +372,13 @@ metadata:
   name: sender-matrix
   labels:
     app: fmn
-    service: sender-matrix
+    component: sender-matrix
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
-      service: sender-matrix
+      component: sender-matrix
   strategy:
     type: Recreate
   template:
@@ -429,19 +429,19 @@ metadata:
   name: redis
   labels:
     app: fmn
-    service: redis
+    component: redis
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
-      service: redis
+      component: redis
   strategy: {}
   template:
     metadata:
       labels:
         app: fmn
-        service: redis
+        component: redis
       annotations:
         image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"redis:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"redis\")].image"}]'
     spec:
@@ -462,13 +462,13 @@ metadata:
   name: collectd
   labels:
     app: fmn
-    service: collectd
+    component: collectd
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
-      service: collectd
+      component: collectd
   strategy:
     type: Recreate
   template:
@@ -511,21 +511,21 @@ kind: Deployment
 metadata:
   labels:
     app: fmn
-    service: sendria
+    component: sendria
   name: sendria
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
-      service: sendria
+      component: sendria
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
         app: fmn
-        service: sendria
+        component: sendria
       annotations:
         image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"sendria:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"sendria\")].image"}]'
     spec: