Use mergePodAdditions

Signed-off-by: David Kwon <[email protected]>

controllers/workspace/devworkspace_controller.go

@@ -413,6 +413,9 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		allPodAdditions = append(allPodAdditions, *routingPodAdditions)
 	}
 
+	annotationAdditions := controllerv1alpha1.PodAdditions{Annotations: workspace.Config.Workspace.PodAnnotations}
+	allPodAdditions = append(allPodAdditions, annotationAdditions)
+
 	// Step five: Prepare workspace ServiceAccount
 	var serviceAcctName string
 	if *workspace.Config.Workspace.ServiceAccount.DisableCreation {

pkg/config/sync.go

@@ -595,6 +595,9 @@ func GetCurrentConfigString(currConfig *controller.OperatorConfiguration) string
 		if !reflect.DeepEqual(workspace.DefaultContainerResources, defaultConfig.Workspace.DefaultContainerResources) {
 			config = append(config, "workspace.defaultContainerResources is set")
 		}
+		if !reflect.DeepEqual(workspace.PodAnnotations, defaultConfig.Workspace.PodAnnotations) {
+			config = append(config, "workspace.podAnnotations is set")
+		}
 	}
 	if currConfig.EnableExperimentalFeatures != nil && *currConfig.EnableExperimentalFeatures {
 		config = append(config, "enableExperimentalFeatures=true")

pkg/provision/workspace/deployment.go

@@ -197,7 +197,7 @@ func getSpecDeployment(
 						constants.DevWorkspaceIDLabel:   workspace.Status.DevWorkspaceId,
 						constants.DevWorkspaceNameLabel: workspace.Name,
 					},
-					Annotations: workspace.Config.Workspace.PodAnnotations,
+					Annotations: podAdditions.Annotations,
 				},
 				Spec: corev1.PodSpec{
 					InitContainers:                podAdditions.InitContainers,
@@ -292,6 +292,8 @@ func getProgressDeadlineSeconds(config *v1alpha1.OperatorConfiguration) (int32,
 
 func mergePodAdditions(toMerge []v1alpha1.PodAdditions) (*v1alpha1.PodAdditions, error) {
 	podAdditions := &v1alpha1.PodAdditions{}
+	podAdditions.Annotations = make(map[string]string)
+	podAdditions.Labels = make(map[string]string)
 
 	// "Set"s to store k8s object names and detect duplicates
 	containerNames := map[string]bool{}