refactor for api changes

Signed-off-by: Per G. da Silva <[email protected]>

Author: perdasilva

pkg/controller/registry/reconciler/reconciler.go

@@ -181,8 +181,8 @@ func Pod(source *v1alpha1.CatalogSource, name string, image string, saName strin
 		}
 
 		// Override priority class name
-		if grpcPodConfig.PriorityClassName != "" {
-			pod.Spec.PriorityClassName = grpcPodConfig.PriorityClassName
+		if grpcPodConfig.PriorityClassName != nil {
+			pod.Spec.PriorityClassName = *grpcPodConfig.PriorityClassName
 		}
 
 		// Override tolerations

pkg/controller/registry/reconciler/reconciler_test.go

@@ -132,7 +132,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
 		expectedPriorityClassName string
 	}{
 		{
-			title: "No overrides",
+			title: "no overrides",
 			catalogSource: &v1alpha1.CatalogSource{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test",
@@ -147,7 +147,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
 			expectedPriorityClassName: defaultPriorityClassName,
 			expectedNodeSelectors:     defaultNodeSelectors,
 		}, {
-			title: "Override node selectors",
+			title: "override node selectors",
 			catalogSource: &v1alpha1.CatalogSource{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test",
@@ -165,7 +165,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
 			expectedPriorityClassName: defaultPriorityClassName,
 			expectedNodeSelectors:     overriddenNodeSelectors,
 		}, {
-			title: "Override priority class name",
+			title: "override priority class name",
 			catalogSource: &v1alpha1.CatalogSource{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "test",
@@ -175,13 +175,31 @@ func TestPodSchedulingOverrides(t *testing.T) {
 					SourceType: v1alpha1.SourceTypeGrpc,
 					Image:      "repo/image:tag",
 					GrpcPodConfig: &v1alpha1.GrpcPodConfig{
-						PriorityClassName: overriddenPriorityClassName,
+						PriorityClassName: &overriddenPriorityClassName,
 					},
 				},
 			},
 			expectedTolerations:       nil,
 			expectedPriorityClassName: overriddenPriorityClassName,
 			expectedNodeSelectors:     defaultNodeSelectors,
+		}, {
+			title: "doesn't override priority class name when its nil",
+			catalogSource: &v1alpha1.CatalogSource{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "test",
+					Namespace: "testns",
+				},
+				Spec: v1alpha1.CatalogSourceSpec{
+					SourceType: v1alpha1.SourceTypeGrpc,
+					Image:      "repo/image:tag",
+					GrpcPodConfig: &v1alpha1.GrpcPodConfig{
+						PriorityClassName: nil,
+					},
+				},
+			},
+			expectedTolerations:       nil,
+			expectedPriorityClassName: defaultPriorityClassName,
+			expectedNodeSelectors:     defaultNodeSelectors,
 		}, {
 			title: "Override node tolerations",
 			catalogSource: &v1alpha1.CatalogSource{
@@ -212,7 +230,7 @@ func TestPodSchedulingOverrides(t *testing.T) {
 					Image:      "repo/image:tag",
 					GrpcPodConfig: &v1alpha1.GrpcPodConfig{
 						NodeSelector:      overriddenNodeSelectors,
-						PriorityClassName: overriddenPriorityClassName,
+						PriorityClassName: &overriddenPriorityClassName,
 						Tolerations:       overriddenTolerations,
 					},
 				},