Merge pull request #150 from vaspahomov/ft/namespaced-pod-names-status

NamespacedName in PendingPods status field

Author: openshift-merge-bot[bot]

api/v1beta1/nodemaintenance_types.go

@@ -53,6 +53,17 @@ type NodeMaintenanceSpec struct {
 	Reason string `json:"reason,omitempty"`
 }
 
+type PodReference struct {
+	// Namespace of the referent pod.
+	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+	// +optional
+	Namespace string `json:"namespace,omitempty" protobuf:"bytes,2,opt,name=namespace"`
+	// Name of the referent pod.
+	// More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+	// +optional
+	Name string `json:"name,omitempty" protobuf:"bytes,3,opt,name=name"`
+}
+
 // NodeMaintenanceStatus defines the observed state of NodeMaintenance
 type NodeMaintenanceStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
@@ -73,6 +84,9 @@ type NodeMaintenanceStatus struct {
 	// PendingPods is a list of pending pods for eviction
 	//+operator-sdk:csv:customresourcedefinitions:type=status
 	PendingPods []string `json:"pendingPods,omitempty"`
+	// PendingPodsRefs is a list of refs of pending pods for eviction
+	//+operator-sdk:csv:customresourcedefinitions:type=status
+	PendingPodsRefs []PodReference `json:"pendingPodsRefs,omitempty"`
 	// TotalPods is the total number of all pods on the node from the start
 	//+operator-sdk:csv:customresourcedefinitions:type=status
 	TotalPods int `json:"totalpods,omitempty"`

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

@@ -69,6 +69,9 @@ spec:
       - description: PendingPods is a list of pending pods for eviction
         displayName: Pending Pods
         path: pendingPods
+      - description: PendingPodsRefs is a list of refs of pending pods for eviction
+        displayName: Pending Pods Refs
+        path: pendingPodsRefs
       - description: Phase is the represtation of the maintenance progress (Running,Succeeded,Failed)
         displayName: Phase
         path: phase

bundle/manifests/nodemaintenance.medik8s.io_nodemaintenances.yaml

@@ -78,6 +78,23 @@ spec:
                 items:
                   type: string
                 type: array
+              pendingPodsRefs:
+                description: PendingPodsRefs is a list of refs of pending pods for
+                  eviction
+                items:
+                  properties:
+                    name:
+                      description: |-
+                        Name of the referent pod.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                    namespace:
+                      description: |-
+                        Namespace of the referent pod.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                      type: string
+                  type: object
+                type: array
               phase:
                 description: Phase is the represtation of the maintenance progress
                   (Running,Succeeded,Failed)

config/crd/bases/nodemaintenance.medik8s.io_nodemaintenances.yaml

@@ -76,6 +76,23 @@ spec:
                 items:
                   type: string
                 type: array
+              pendingPodsRefs:
+                description: PendingPodsRefs is a list of refs of pending pods for
+                  eviction
+                items:
+                  properties:
+                    name:
+                      description: |-
+                        Name of the referent pod.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                      type: string
+                    namespace:
+                      description: |-
+                        Namespace of the referent pod.
+                        More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
+                      type: string
+                  type: object
+                type: array
               phase:
                 description: Phase is the represtation of the maintenance progress
                   (Running,Succeeded,Failed)

config/manifests/bases/node-maintenance-operator.clusterserviceversion.yaml

@@ -54,6 +54,9 @@ spec:
       - description: PendingPods is a list of pending pods for eviction
         displayName: Pending Pods
         path: pendingPods
+      - description: PendingPodsRefs is a list of refs of pending pods for eviction
+        displayName: Pending Pods Refs
+        path: pendingPodsRefs
       - description: Phase is the represtation of the maintenance progress (Running,Succeeded,Failed)
         displayName: Phase
         path: phase

controllers/nodemaintenance_controller.go

@@ -245,6 +245,7 @@ func (r *NodeMaintenanceReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	nm.Status.Phase = v1beta1.MaintenanceSucceeded
 	nm.Status.DrainProgress = 100
 	nm.Status.PendingPods = nil
+	nm.Status.PendingPodsRefs = nil
 	err = r.Client.Status().Update(ctx, nm)
 	if err != nil {
 		r.logger.Error(err, "Failed to update NodeMaintenance with \"Succeeded\" status")
@@ -432,6 +433,7 @@ func initMaintenanceStatus(ctx context.Context, nm *v1beta1.NodeMaintenance, dra
 		}
 		if pendingList != nil {
 			nm.Status.PendingPods = GetPodNameList(pendingList.Pods())
+			nm.Status.PendingPodsRefs = GetPodRefList(pendingList.Pods())
 		}
 		nm.Status.EvictionPods = len(nm.Status.PendingPods)
 
@@ -457,6 +459,7 @@ func (r *NodeMaintenanceReconciler) onReconcileErrorWithRequeue(ctx context.Cont
 		pendingList, _ := drainer.GetPodsForDeletion(nm.Spec.NodeName)
 		if pendingList != nil {
 			nm.Status.PendingPods = GetPodNameList(pendingList.Pods())
+			nm.Status.PendingPodsRefs = GetPodRefList(pendingList.Pods())
 			if nm.Status.EvictionPods != 0 {
 				nm.Status.DrainProgress = (nm.Status.EvictionPods - len(nm.Status.PendingPods)) * 100 / nm.Status.EvictionPods
 			}

controllers/nodemaintenance_controller_test.go

@@ -72,6 +72,7 @@ var _ = Describe("Node Maintenance", func() {
 					Expect(err).NotTo(HaveOccurred())
 					Expect(nm.Status.Phase).To(Equal(v1beta1.MaintenanceRunning))
 					Expect(len(nm.Status.PendingPods)).To(Equal(2))
+					Expect(len(nm.Status.PendingPodsRefs)).To(Equal(2))
 					Expect(nm.Status.EvictionPods).To(Equal(2))
 					Expect(nm.Status.TotalPods).To(Equal(2))
 					Expect(nm.Status.DrainProgress).To(Equal(0))
@@ -109,6 +110,7 @@ var _ = Describe("Node Maintenance", func() {
 					Expect(err).NotTo(HaveOccurred())
 					Expect(nmCopy.Status.Phase).To(Equal(v1beta1.MaintenanceFailed))
 					Expect(len(nmCopy.Status.PendingPods)).To(Equal(0))
+					Expect(len(nmCopy.Status.PendingPodsRefs)).To(Equal(0))
 					Expect(nmCopy.Status.EvictionPods).To(Equal(0))
 					Expect(nmCopy.Status.TotalPods).To(Equal(0))
 					Expect(nmCopy.Status.DrainProgress).To(Equal(0))
@@ -201,6 +203,7 @@ var _ = Describe("Node Maintenance", func() {
 
 				Expect(maintenance.Status.Phase).To(Equal(v1beta1.MaintenanceSucceeded))
 				Expect(len(maintenance.Status.PendingPods)).To(Equal(0))
+				Expect(len(maintenance.Status.PendingPodsRefs)).To(Equal(0))
 				Expect(maintenance.Status.EvictionPods).To(Equal(2))
 				Expect(maintenance.Status.TotalPods).To(Equal(2))
 				Expect(maintenance.Status.DrainProgress).To(Equal(100))
@@ -244,6 +247,7 @@ var _ = Describe("Node Maintenance", func() {
 				Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(nm), maintenance)).To(Succeed())
 
 				Expect(len(maintenance.Status.PendingPods)).To(Equal(0))
+				Expect(len(maintenance.Status.PendingPodsRefs)).To(Equal(0))
 				Expect(maintenance.Status.EvictionPods).To(Equal(0))
 				Expect(maintenance.Status.TotalPods).To(Equal(0))
 				Expect(maintenance.Status.DrainProgress).To(Equal(0))

controllers/utils.go

@@ -1,6 +1,10 @@
 package controllers
 
-import corev1 "k8s.io/api/core/v1"
+import (
+	corev1 "k8s.io/api/core/v1"
+
+	"github.com/medik8s/node-maintenance-operator/api/v1beta1"
+)
 
 // ContainsString checks if the string array contains the given string.
 func ContainsString(slice []string, s string) bool {
@@ -30,3 +34,15 @@ func GetPodNameList(pods []corev1.Pod) (result []string) {
 	}
 	return result
 }
+
+// GetPodRefList returns a list of pod references.
+func GetPodRefList(pods []corev1.Pod) (result []v1beta1.PodReference) {
+	for _, pod := range pods {
+		result = append(result, v1beta1.PodReference{
+			Namespace: pod.Namespace,
+			Name:      pod.Name,
+		})
+	}
+	return result
+
+}