Add 3 labels to all resources, add e2e test that validate the existence of the three labels

bundle/manifests/node-maintenance-controller-manager-metrics-service_v1_service.yaml

@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  creationTimestamp: null
+  labels:
+    app.kubernetes.io/component: controller-manager
+    app.kubernetes.io/name: node-maintenance-operator
+    node-maintenance-operator: ""
+  name: node-maintenance-controller-manager-metrics-service
+spec:
+  ports:
+  - name: https
+    port: 8443
+    protocol: TCP
+    targetPort: https
+  selector:
+    app.kubernetes.io/component: controller-manager
+    app.kubernetes.io/name: node-maintenance-operator
+    node-maintenance-operator: ""
+status:
+  loadBalancer: {}

bundle/manifests/node-maintenance-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml → bundle/manifests/node-maintenance-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml

@@ -3,8 +3,9 @@ kind: ClusterRole
 metadata:
   creationTimestamp: null
   labels:
+    app.kubernetes.io/name: node-maintenance-operator
     node-maintenance-operator: ""
-  name: node-maintenance-operator-metrics-reader
+  name: node-maintenance-metrics-reader
 rules:
 - nonResourceURLs:
   - /metrics

bundle/manifests/node-maintenance-operator.clusterserviceversion.yaml

@@ -202,25 +202,29 @@ spec:
           - subjectaccessreviews
           verbs:
           - create
-        serviceAccountName: node-maintenance-operator-controller-manager
+        serviceAccountName: node-maintenance-controller-manager
       deployments:
       - label:
-          control-plane: controller-manager
+          app.kubernetes.io/component: controller-manager
+          app.kubernetes.io/name: node-maintenance-operator
           node-maintenance-operator: ""
-        name: node-maintenance-operator-controller-manager
+        name: node-maintenance-controller-manager
         spec:
           replicas: 1
           selector:
             matchLabels:
-              control-plane: controller-manager
+              app.kubernetes.io/component: controller-manager
+              app.kubernetes.io/name: node-maintenance-operator
               node-maintenance-operator: ""
           strategy: {}
           template:
             metadata:
               annotations:
                 kubectl.kubernetes.io/default-container: manager
               labels:
-                control-plane: controller-manager
+                app.kubernetes.io/component: controller-manager
+                app.kubernetes.io/name: node-maintenance-operator
+                kubectl.kubernetes.io/default-container: manager
                 node-maintenance-operator: ""
             spec:
               affinity:
@@ -287,7 +291,7 @@ spec:
               priorityClassName: system-cluster-critical
               securityContext:
                 runAsNonRoot: true
-              serviceAccountName: node-maintenance-operator-controller-manager
+              serviceAccountName: node-maintenance-controller-manager
               terminationGracePeriodSeconds: 10
               tolerations:
               - effect: NoSchedule
@@ -335,7 +339,7 @@ spec:
           verbs:
           - create
           - patch
-        serviceAccountName: node-maintenance-operator-controller-manager
+        serviceAccountName: node-maintenance-controller-manager
     strategy: deployment
   installModes:
   - supported: false
@@ -369,7 +373,7 @@ spec:
   - admissionReviewVersions:
     - v1
     containerPort: 443
-    deploymentName: node-maintenance-operator-controller-manager
+    deploymentName: node-maintenance-controller-manager
     failurePolicy: Fail
     generateName: vnodemaintenance.kb.io
     rules:

bundle/manifests/node-maintenance-operator-webhook-service_v1_service.yaml → bundle/manifests/node-maintenance-webhook-service_v1_service.yaml

@@ -3,15 +3,17 @@ kind: Service
 metadata:
   creationTimestamp: null
   labels:
+    app.kubernetes.io/name: node-maintenance-operator
     node-maintenance-operator: ""
-  name: node-maintenance-operator-webhook-service
+  name: node-maintenance-webhook-service
 spec:
   ports:
   - port: 443
     protocol: TCP
     targetPort: 9443
   selector:
-    control-plane: controller-manager
+    app.kubernetes.io/component: controller-manager
+    app.kubernetes.io/name: node-maintenance-operator
     node-maintenance-operator: ""
 status:
   loadBalancer: {}

bundle/manifests/nodemaintenance.medik8s.io_nodemaintenances.yaml

@@ -5,6 +5,7 @@ metadata:
     controller-gen.kubebuilder.io/version: v0.14.0
   creationTimestamp: null
   labels:
+    app.kubernetes.io/name: node-maintenance-operator
     node-maintenance-operator: ""
   name: nodemaintenances.nodemaintenance.medik8s.io
 spec:

config/default/kustomization.yaml

@@ -6,11 +6,13 @@ namespace: node-maintenance-operator-system
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: node-maintenance-operator-
+namePrefix: node-maintenance-
 
 # Labels to add to all resources and selectors.
+# Workaround: rename the deployment (by modifying namePrefix above)
 commonLabels:
   node-maintenance-operator: ""
+  app.kubernetes.io/name: node-maintenance-operator
 
 bases:
 - ../crd

config/manager/manager.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: controller-manager
+    app.kubernetes.io/component: controller-manager
   name: system
 ---
 apiVersion: apps/v1
@@ -11,18 +11,19 @@ metadata:
   name: controller-manager
   namespace: system
   labels:
-    control-plane: controller-manager
+    app.kubernetes.io/component: controller-manager
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      app.kubernetes.io/component: controller-manager
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        app.kubernetes.io/component: controller-manager
+        kubectl.kubernetes.io/default-container: manager
     spec:
       affinity:
         nodeAffinity:

config/prometheus/monitor.yaml

@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    control-plane: controller-manager
+    app.kubernetes.io/component: controller-manager
   name: controller-manager-metrics-monitor
   namespace: system
 spec:
@@ -17,4 +17,4 @@ spec:
         insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      app.kubernetes.io/component: controller-manager

config/rbac/auth_proxy_service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    control-plane: controller-manager
+    app.kubernetes.io/component: controller-manager
   name: controller-manager-metrics-service
   namespace: system
 spec:
@@ -12,4 +12,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    control-plane: controller-manager
+    app.kubernetes.io/component: controller-manager

config/webhook/service.yaml

@@ -10,4 +10,4 @@ spec:
       protocol: TCP
       targetPort: 9443
   selector:
-    control-plane: controller-manager
+    app.kubernetes.io/component: controller-manager

test/e2e/node_maintenance_test.go

@@ -179,6 +179,11 @@ var _ = Describe("Starting Maintenance", func() {
 			// it should be caused by the test deployment's termination graceperiod > drain timeout
 			Expect(getOperatorLogs()).To(ContainSubstring(nodemaintenance.FixedDurationReconcileLog))
 
+			//validate that operator controller pod have app.kubernetes.io/name label
+			Expect(validateOperatorCustomLabelName()).To(BeTrue(), "operator label name validation failed")
+			Expect(validateOperatorCustomLabelComponent()).To(BeTrue(), "operator label component validation failed")
+			Expect(validateOperatorCustomLabelDefaultContainer()).To(BeTrue(), "operator label defaultContainer validation failed")
+
 			By("node should be unschedulable and tainted node")
 			node := &corev1.Node{}
 			err = Client.Get(context.TODO(), types.NamespacedName{Namespace: "", Name: maintenanceNodeName}, node)
@@ -419,6 +424,26 @@ func getOperatorPod() *corev1.Pod {
 	return &pods.Items[0]
 }
 
+func validateOperatorCustomLabelName() bool {
+	pods, err := KubeClient.CoreV1().Pods(operatorNsName).List(context.Background(), metav1.ListOptions{LabelSelector: "app.kubernetes.io/name=node-maintenance-operator"})
+	ExpectWithOffset(2, err).ToNot(HaveOccurred(), "failed to get operator pods by label name")
+	ExpectWithOffset(2, len(pods.Items)).ToNot(BeZero(), "no operator pod found")
+	return true
+}
+
+func validateOperatorCustomLabelComponent() bool {
+	pods, err := KubeClient.CoreV1().Pods(operatorNsName).List(context.Background(), metav1.ListOptions{LabelSelector: "app.kubernetes.io/component=controller-manager"})
+	ExpectWithOffset(2, err).ToNot(HaveOccurred(), "failed to get operator pods by label component")
+	ExpectWithOffset(2, len(pods.Items)).ToNot(BeZero(), "no operator pod found for app.kubernetes.io/component")
+	return true
+}
+
+func validateOperatorCustomLabelDefaultContainer() bool {
+	pods, err := KubeClient.CoreV1().Pods(operatorNsName).List(context.Background(), metav1.ListOptions{LabelSelector: "kubectl.kubernetes.io/default-container=manager"})
+	ExpectWithOffset(2, err).ToNot(HaveOccurred(), "failed to get operator pods by label default-container")
+	ExpectWithOffset(2, len(pods.Items)).ToNot(BeZero(), "no operator pod found for kubectl.kubernetes.io/default-container")
+	return true
+}
 func isTainted(node *corev1.Node) bool {
 	medik8sDrainTaint := corev1.Taint{
 		Key:    "medik8s.io/drain",