Merge pull request #1292 from bdunne/upgrade_labels

Revert label changes from operator-sdk upgrade

Author: Fryguy

manageiq-operator/config/default/metrics_service.yaml

@@ -2,9 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-manager
-    app.kubernetes.io/name: manageiq-operator
-    app.kubernetes.io/managed-by: kustomize
+    name: manageiq-operator
   name: controller-manager-metrics-service
   namespace: system
 spec:
@@ -14,5 +12,4 @@ spec:
     protocol: TCP
     targetPort: 8443
   selector:
-    control-plane: controller-manager
-    app.kubernetes.io/name: manageiq-operator
+    name: manageiq-operator

manageiq-operator/config/manager/manager.yaml

@@ -4,22 +4,16 @@ metadata:
   name: manageiq-operator
   namespace: system
   labels:
-    control-plane: controller-manager
-    app.kubernetes.io/name: memcached-operator
-    app.kubernetes.io/managed-by: kustomize
+    name: memcached-operator
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
-      app.kubernetes.io/name: manageiq-operator
+      name: manageiq-operator
   replicas: 1
   template:
     metadata:
-      annotations:
-        kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
-        app.kubernetes.io/name: manageiq-operator
+        name: manageiq-operator
     spec:
       affinity:
         nodeAffinity:

manageiq-operator/config/network-policy/allow-metrics-traffic.yaml

@@ -5,14 +5,13 @@ apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   labels:
-    app.kubernetes.io/name: <operator-name>
-    app.kubernetes.io/managed-by: kustomize
+    name: manageiq-operator
   name: allow-metrics-traffic
   namespace: system
 spec:
   podSelector:
     matchLabels:
-      control-plane: controller-manager
+      name: manageiq-operator
   policyTypes:
     - Ingress
   ingress:

manageiq-operator/config/network-policy/allow-webhook-traffic.yaml

@@ -5,14 +5,13 @@ apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   labels:
-    app.kubernetes.io/name: <operator-name>
-    app.kubernetes.io/managed-by: kustomize
+    name: manageiq-operator
   name: allow-webhook-traffic
   namespace: system
 spec:
   podSelector:
     matchLabels:
-      control-plane: controller-manager
+      name: manageiq-operator
   policyTypes:
     - Ingress
   ingress:

manageiq-operator/config/prometheus/monitor.yaml

@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    control-plane: controller-manager
+    name: manageiq-operator
   name: controller-manager-metrics-monitor
   namespace: system
 spec:
@@ -21,4 +21,4 @@ spec:
         insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      name: manageiq-operator