AB#2234: Introduce AddNodeSelectorsToDeployment

Add the above function to the different client interfaces.
Remove previously used Command.Exec call.

bootstrapper/internal/kubernetes/k8sapi/kubectl/client/client.go

@@ -120,6 +120,30 @@ func (c *Client) AddTolerationsToDeployment(ctx context.Context, tolerations []c
 	if err != nil {
 		return err
 	}
-
+	return nil
+}
+
+func (c *Client) AddNodeSelectorsToDeployment(ctx context.Context, selectors map[string]string, name string) error {
+	deployments := c.clientset.AppsV1().Deployments(corev1.NamespaceAll)
+
+	// retry resource update if an error occurs
+	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		result, err := deployments.Get(ctx, name, metav1.GetOptions{})
+		if err != nil {
+			return fmt.Errorf("Failed to get latest version of Deployment: %v", err)
+		}
+
+		for k, v := range selectors {
+			result.Spec.Template.Spec.NodeSelector[k] = v
+		}
+
+		if _, err = deployments.Update(ctx, result, metav1.UpdateOptions{}); err != nil {
+			return err
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
 	return nil
 }

bootstrapper/internal/kubernetes/k8sapi/kubectl/client/client_test.go

@@ -75,6 +75,23 @@ var (
 			},
 		},
 	}
+	tolerationsDeployment = appsv1.Deployment{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "test-deployment",
+		},
+	}
+	selectorsDeployment = appsv1.Deployment{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "test-deployment",
+		},
+		Spec: appsv1.DeploymentSpec{
+			Template: k8s.PodTemplateSpec{
+				Spec: k8s.PodSpec{
+					NodeSelector: map[string]string{},
+				},
+			},
+		},
+	}
 	nginxDeplJSON, _ = marshalJSON(nginxDeployment)
 	nginxDeplYAML, _ = marshalYAML(nginxDeployment)
 )
@@ -284,28 +301,15 @@ func TestGetObjects(t *testing.T) {
 func TestAddTolerationsToDeployment(t *testing.T) {
 	testCases := map[string]struct {
 		name        string
-		deployment  appsv1.Deployment
 		tolerations []corev1.Toleration
 		wantErr     bool
 	}{
 		"Success": {
 			name: "test-deployment",
-			deployment: appsv1.Deployment{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "test-deployment",
-				},
-			},
-			tolerations: []corev1.Toleration{},
 		},
 		"Specifying non-existent deployment fails": {
-			name: "wrong-name",
-			deployment: appsv1.Deployment{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "test-deployment",
-				},
-			},
-			tolerations: []corev1.Toleration{},
-			wantErr:     true,
+			name:    "wrong-name",
+			wantErr: true,
 		},
 	}
 
@@ -314,7 +318,7 @@ func TestAddTolerationsToDeployment(t *testing.T) {
 			assert := assert.New(t)
 			require := require.New(t)
 
-			client := newClientWithFakes(t, map[string]string{}, &tc.deployment)
+			client := newClientWithFakes(t, map[string]string{}, &tolerationsDeployment)
 			err := client.AddTolerationsToDeployment(context.Background(), tc.tolerations, tc.name)
 			if tc.wantErr {
 				assert.Error(err)
@@ -324,3 +328,35 @@ func TestAddTolerationsToDeployment(t *testing.T) {
 		})
 	}
 }
+
+func TestAddNodeSelectorsToDeployment(t *testing.T) {
+	testCases := map[string]struct {
+		name      string
+		selectors map[string]string
+		wantErr   bool
+	}{
+		"Success": {
+			name:      "test-deployment",
+			selectors: map[string]string{"some-key": "some-value"},
+		},
+		"Specifying non-existent deployment fails": {
+			name:    "wrong-name",
+			wantErr: true,
+		},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			assert := assert.New(t)
+			require := require.New(t)
+
+			client := newClientWithFakes(t, map[string]string{}, &selectorsDeployment)
+			err := client.AddNodeSelectorsToDeployment(context.Background(), tc.selectors, tc.name)
+			if tc.wantErr {
+				assert.Error(err)
+				return
+			}
+			require.NoError(err)
+		})
+	}
+}