Add 'transient' label to pods deployed during diagnose test

Subctl diagnose has a test that looks up for the pod's status Thus, transient pods should be labeled and ignored from this test Signed-off-by: Tomer Shefler <[email protected]>
submariner-io · Aug 30, 2022 · 5122d9b · 5122d9b
1 parent c7b1908
commit 5122d9b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/internal/constants/constants.go b/internal/constants/constants.go
@@ -27,5 +27,6 @@ const (
 	SubmarinerNamespace          = "submariner-operator"
 	SubmarinerNotInstalled       = "Submariner is not installed"
 	ServiceDiscoveryNotInstalled = "Service discovery is not installed"
+	TransientLabel               = "submariner.io/transient"
 	TrueLabel                    = "true"
 )
diff --git a/internal/pods/schedule.go b/internal/pods/schedule.go
@@ -127,7 +127,8 @@ func (np *Scheduled) schedule() error {
 		ObjectMeta: metav1.ObjectMeta{
 			GenerateName: np.Config.Name,
 			Labels: map[string]string{
-				"app": np.Config.Name,
+				"app":                    np.Config.Name,
+				constants.TransientLabel: constants.TrueLabel,
 			},
 		},
 		Spec: v1.PodSpec{

diff --git a/pkg/diagnose/deployments.go b/pkg/diagnose/deployments.go
@@ -20,6 +20,7 @@ package diagnose
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/submariner-io/admiral/pkg/reporter"
 	"github.com/submariner-io/subctl/internal/constants"
@@ -173,7 +174,9 @@ func checkDaemonset(k8sClient kubernetes.Interface, namespace, daemonSetName str
 }
 
 func checkPodsStatus(k8sClient kubernetes.Interface, namespace string, status reporter.Interface) {
-	pods, err := k8sClient.CoreV1().Pods(namespace).List(context.TODO(), metav1.ListOptions{})
+	pods, err := k8sClient.CoreV1().Pods(namespace).List(context.TODO(), metav1.ListOptions{
+		LabelSelector: fmt.Sprintf("%s!=%s", constants.TransientLabel, constants.TrueLabel),
+	})
 	if err != nil {
 		status.Failure("Error obtaining Pods list: %v", err)
 		return