Merge pull request #1132 from Denton24646/fix/operatorhub-catalog-windows-vm-scheduling-bug

Bug 1773661: schedule catalogsource pods to linux nodes only

Author: openshift-merge-robot

pkg/controller/registry/reconciler/reconciler.go

@@ -133,6 +133,9 @@ func Pod(source *v1alpha1.CatalogSource, name string, image string, labels map[s
 					Operator: v1.TolerationOpExists,
 				},
 			},
+			NodeSelector: map[string]string{
+				"beta.kubernetes.io/os": "linux",
+			},
 		},
 	}
 	return pod

pkg/controller/registry/reconciler/reconciler_test.go

@@ -0,0 +1,28 @@
+package reconciler
+
+import (
+	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"testing"
+)
+
+func TestPodNodeSelector(t *testing.T) {
+	catsrc := &v1alpha1.CatalogSource{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "test",
+			Namespace: "testns",
+		},
+	}
+
+	key := "beta.kubernetes.io/os"
+	value := "linux"
+
+	gotCatSrcPod := Pod(catsrc, "hello", "busybox", map[string]string{}, int32(0), int32(0))
+	gotCatSrcPodSelector := gotCatSrcPod.Spec.NodeSelector
+
+	if gotCatSrcPodSelector[key] != value {
+		t.Errorf("expected %s value for node selector key %s, received %s value instead", value, key,
+			gotCatSrcPodSelector[key])
+	}
+}