fmn: adjust selectors and labels

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

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

@@ -5,6 +5,7 @@ metadata:
   name: frontend
   labels:
     app: fmn
+    service: frontend
 spec:
   ports:
     - name: web
@@ -12,7 +13,7 @@ spec:
       targetPort: 8080
   selector:
     app: fmn
-    deployment: frontend
+    service: frontend
 ---
 apiVersion: v1
 kind: Service
@@ -20,6 +21,7 @@ metadata:
   name: api
   labels:
     app: fmn
+    service: api
 spec:
   ports:
     - name: web
@@ -27,7 +29,7 @@ spec:
       targetPort: 8080
   selector:
     app: fmn
-    deployment: api
+    service: api
 ---
 apiVersion: v1
 kind: Service
@@ -35,6 +37,7 @@ metadata:
   name: sendria
   labels:
     app: fmn
+    service: sendria
 spec:
   ports:
     - name: web
@@ -45,7 +48,7 @@ spec:
       targetPort: 1025
   selector:
     app: fmn
-    deployment: sendria
+    service: sendria
 ---
 apiVersion: v1
 kind: Service
@@ -53,6 +56,7 @@ metadata:
   name: redis
   labels:
     app: fmn
+    service: redis
 spec:
   ports:
     - name: redis
@@ -61,4 +65,4 @@ spec:
       targetPort: 6379
   selector:
     app: fmn
-    deployment: redis
+    service: redis

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

@@ -6,11 +6,13 @@ metadata:
   name: frontend
   labels:
     app: fmn
+    service: frontend
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
+      service: frontend
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -58,11 +60,13 @@ metadata:
   name: api
   labels:
     app: fmn
+    service: api
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
+      service: api
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -160,14 +164,16 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: consumer
+  name: fmn
   labels:
     app: fmn
+    service consumer
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
+      service: consumer
   strategy:
     type: Recreate
   template:
@@ -252,11 +258,13 @@ metadata:
   name: sender-email
   labels:
     app: fmn
+    service: sender-email
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
+      service: sender-email
   strategy:
     type: Recreate
   template:
@@ -307,11 +315,13 @@ metadata:
   name: sender-irc
   labels:
     app: fmn
+    service: sender-irc
 spec:
   replicas: {{ (env == 'production')|ternary('1', '0') }}
   selector:
     matchLabels:
       app: fmn
+      service: sender-irc
   strategy:
     type: Recreate
   template:
@@ -362,11 +372,13 @@ metadata:
   name: sender-matrix
   labels:
     app: fmn
+    service: sender-matrix
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
+      service: sender-matrix
   strategy:
     type: Recreate
   template:
@@ -423,6 +435,7 @@ spec:
   selector:
     matchLabels:
       app: fmn
+      service: redis
   strategy: {}
   template:
     metadata:
@@ -449,11 +462,13 @@ metadata:
   name: collectd
   labels:
     app: fmn
+    service: collectd
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: fmn
+      service: collectd
   strategy:
     type: Recreate
   template:
@@ -503,6 +518,7 @@ spec:
   selector:
     matchLabels:
       app: fmn
+      service: sendria
   strategy:
     type: Recreate
   template: