[packages] Fix the service for deployment

The service selector.app needs to match with deployment.selector app. In
this case we have a conflict. This change will fix it.

Signed-off-by: Michal Konecny <mkonecny@redhat.com>

roles/openshift-apps/fedora-packages-static/files/service.yml

@@ -2,9 +2,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-    app: fedora-packages-static
   name: fedora-packages-static
+  namespace: fedora-packages-static
 spec:
   ports:
   - name: 8080-tcp
@@ -17,9 +16,8 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-    app: fedora-packages-static
   name: solr
+  namespace: fedora-packages-static
 spec:
   ports:
   - name: 8983-tcp
@@ -27,4 +25,4 @@ spec:
     protocol: TCP
     targetPort: 8983
   selector:
-    app: fedora-packages-static
+    app: solr

roles/openshift-apps/fedora-packages-static/templates/deployment.yml.j2

@@ -2,9 +2,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    app: fedora-packages-static
-    service: fedora-packages-static
   name: fedora-packages-static
 spec:
   replicas: 1
@@ -71,23 +68,18 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels:
-    app: fedora-packages-static
-    service: solr
   name: solr
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: fedora-packages-static
-      service: solr
+      app: solr
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: fedora-packages-static
-        service: solr
+        app: solr
     spec:
       containers:
       - name: solr