Catalog source affinity (#2963)

* Update operator framework api dependency Signed-off-by: James Hewitt <[email protected]> * Add affinity customization to catalog source grpc pods Signed-off-by: James Hewitt <[email protected]> --------- Signed-off-by: James Hewitt <[email protected]>
operator-framework · Jul 7, 2023 · f8b1721 · f8b1721
1 parent e908cfc
commit f8b1721
Show file tree

Hide file tree

Showing 10 changed files with 991 additions and 5 deletions.
diff --git a/deploy/chart/crds/0000_50_olm_00-catalogsources.crd.yaml b/deploy/chart/crds/0000_50_olm_00-catalogsources.crd.yaml
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/onsi/gomega v1.24.1
 	github.com/openshift/api v3.9.0+incompatible
 	github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
-	github.com/operator-framework/api v0.17.5
+	github.com/operator-framework/api v0.17.6
 	github.com/operator-framework/operator-registry v1.17.5
 	github.com/otiai10/copy v1.2.0
 	github.com/pkg/errors v0.9.1

diff --git a/go.sum b/go.sum
@@ -1040,8 +1040,8 @@ github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c h1:CV76yFOTXmq
 github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c/go.mod h1:lFMO8mLHXWFzSdYvGNo8ivF9SfF6zInA8ZGw4phRnUE=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/operator-framework/api v0.7.1/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY=
-github.com/operator-framework/api v0.17.5 h1:9d0pc6m1Vp4QeS8i5dhl/B0nifhKQdtw+iFsNx0An0Q=
-github.com/operator-framework/api v0.17.5/go.mod h1:l/cuwtPxkVUY7fzYgdust2m9tlmb8I4pOvbsUufRb24=
+github.com/operator-framework/api v0.17.6 h1:E6+vlvYUKafvoXYtCuHlDZrXX4vl8AT+r93OxNlzjpU=
+github.com/operator-framework/api v0.17.6/go.mod h1:l/cuwtPxkVUY7fzYgdust2m9tlmb8I4pOvbsUufRb24=
 github.com/operator-framework/operator-registry v1.17.5 h1:LR8m1rFz5Gcyje8WK6iYt+gIhtzqo52zMRALdmTYHT0=
 github.com/operator-framework/operator-registry v1.17.5/go.mod h1:sRQIgDMZZdUcmHltzyCnM6RUoDF+WS8Arj1BQIARDS8=
 github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=

diff --git a/pkg/controller/registry/reconciler/reconciler.go b/pkg/controller/registry/reconciler/reconciler.go
@@ -214,6 +214,11 @@ func Pod(source *operatorsv1alpha1.CatalogSource, name string, img string, saNam
 				pod.Spec.Tolerations[index] = *toleration.DeepCopy()
 			}
 		}
+
+		// Override affinity
+		if grpcPodConfig.Affinity != nil {
+			pod.Spec.Affinity = grpcPodConfig.Affinity.DeepCopy()
+		}
 	}
 
 	// Set priorityclass if its annotation exists

diff --git a/pkg/controller/registry/reconciler/reconciler_test.go b/pkg/controller/registry/reconciler/reconciler_test.go
@@ -254,11 +254,33 @@ func TestPodSchedulingOverrides(t *testing.T) {
 		},
 	}
 
+	var overriddenAffinity = &corev1.Affinity{
+		NodeAffinity: &corev1.NodeAffinity{
+			RequiredDuringSchedulingIgnoredDuringExecution: &corev1.NodeSelector{
+				NodeSelectorTerms: []corev1.NodeSelectorTerm{
+					{
+						MatchExpressions: []corev1.NodeSelectorRequirement{
+							{
+								Key:      "kubernetes.io/arch",
+								Operator: corev1.NodeSelectorOpIn,
+								Values: []string{
+									"amd64",
+									"arm",
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
 	testCases := []struct {
 		title                     string
 		catalogSource             *v1alpha1.CatalogSource
 		expectedNodeSelectors     map[string]string
 		expectedTolerations       []corev1.Toleration
+		expectedAffinity          *corev1.Affinity
 		expectedPriorityClassName string
 		annotations               map[string]string
 	}{
@@ -275,6 +297,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
 				},
 			},
 			expectedTolerations:       nil,
+			expectedAffinity:          nil,
 			expectedPriorityClassName: defaultPriorityClassName,
 			expectedNodeSelectors:     defaultNodeSelectors,
 		}, {
@@ -293,6 +316,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
 				},
 			},
 			expectedTolerations:       nil,
+			expectedAffinity:          nil,
 			expectedPriorityClassName: defaultPriorityClassName,
 			expectedNodeSelectors:     overriddenNodeSelectors,
 		}, {
@@ -311,6 +335,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
 				},
 			},
 			expectedTolerations:       nil,
+			expectedAffinity:          nil,
 			expectedPriorityClassName: overriddenPriorityClassName,
 			expectedNodeSelectors:     defaultNodeSelectors,
 		}, {
@@ -329,6 +354,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
 				},
 			},
 			expectedTolerations:       nil,
+			expectedAffinity:          nil,
 			expectedPriorityClassName: defaultPriorityClassName,
 			expectedNodeSelectors:     defaultNodeSelectors,
 		}, {
@@ -347,6 +373,26 @@ func TestPodSchedulingOverrides(t *testing.T) {
 				},
 			},
 			expectedTolerations:       overriddenTolerations,
+			expectedAffinity:          nil,
+			expectedPriorityClassName: defaultPriorityClassName,
+			expectedNodeSelectors:     defaultNodeSelectors,
+		}, {
+			title: "Override affinity",
+			catalogSource: &v1alpha1.CatalogSource{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test",
+					Namespace: "testns",
+				},
+				Spec: v1alpha1.CatalogSourceSpec{
+					SourceType: v1alpha1.SourceTypeGrpc,
+					Image:      "repo/image:tag",
+					GrpcPodConfig: &v1alpha1.GrpcPodConfig{
+						Affinity: overriddenAffinity,
+					},
+				},
+			},
+			expectedTolerations:       nil,
+			expectedAffinity:          overriddenAffinity,
 			expectedPriorityClassName: defaultPriorityClassName,
 			expectedNodeSelectors:     defaultNodeSelectors,
 		}, {
@@ -363,10 +409,12 @@ func TestPodSchedulingOverrides(t *testing.T) {
 						NodeSelector:      overriddenNodeSelectors,
 						PriorityClassName: &overriddenPriorityClassName,
 						Tolerations:       overriddenTolerations,
+						Affinity:          overriddenAffinity,
 					},
 				},
 			},
 			expectedTolerations:       overriddenTolerations,
+			expectedAffinity:          overriddenAffinity,
 			expectedPriorityClassName: overriddenPriorityClassName,
 			expectedNodeSelectors:     overriddenNodeSelectors,
 		}, {
@@ -385,6 +433,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
 				},
 			},
 			expectedTolerations: nil,
+			expectedAffinity:    nil,
 			annotations: map[string]string{
 				CatalogPriorityClassKey: "some-OTHER-prio-class",
 			},
@@ -398,5 +447,6 @@ func TestPodSchedulingOverrides(t *testing.T) {
 		require.Equal(t, testCase.expectedNodeSelectors, pod.Spec.NodeSelector)
 		require.Equal(t, testCase.expectedPriorityClassName, pod.Spec.PriorityClassName)
 		require.Equal(t, testCase.expectedTolerations, pod.Spec.Tolerations)
+		require.Equal(t, testCase.expectedAffinity, pod.Spec.Affinity)
 	}
 }