chore: patch for volumeMounts (#546)

**Reason for Change**:
add volumeMounts and volume patch for initContainers
add nil check for annotations

**Requirements**

- [ ] added unit tests and e2e tests (if applicable).

**Issue Fixed**:
<!-- If this PR fixes GitHub issue 4321, add "Fixes #4321" to the next
line. -->

**Notes for Reviewers**:

Signed-off-by: Bangqi Zhu <bangqizhu@microsoft.com>
Co-authored-by: Bangqi Zhu <bangqizhu@microsoft.com>

pkg/controllers/workspace_controller.go

@@ -207,7 +207,7 @@ func (c *WorkspaceReconciler) deleteWorkspace(ctx context.Context, wObj *kaitov1
 	return c.garbageCollectWorkspace(ctx, wObj)
 }
 
-func (c *WorkspaceReconciler) updateControllerRevision(ctx context.Context, wObj *kaitov1alpha1.Workspace) error {
+func (c *WorkspaceReconciler) updateControllerRevision(ctx context.Context, wObj *kaitov1alpha1.Workspace) error { // TODO: Move non-updateControllerRevision related logic to separate functions
 	currentHash := computeHash(wObj)
 	annotations := wObj.GetAnnotations()
 
@@ -267,6 +267,10 @@ func (c *WorkspaceReconciler) updateControllerRevision(ctx context.Context, wObj
 		Data:     runtime.RawExtension{Raw: jsonData},
 	}
 
+	if annotations == nil {
+		annotations = make(map[string]string)
+	} // nil checking.
+
 	annotations[WorkspaceRevisionAnnotation] = currentHash
 	wObj.SetAnnotations(annotations)
 	deployment := &appsv1.Deployment{}
@@ -287,11 +291,29 @@ func (c *WorkspaceReconciler) updateControllerRevision(ctx context.Context, wObj
 
 			if hash, exists := deployment.Annotations[WorkspaceRevisionAnnotation]; !exists || (hash != currentHash) {
 
-				initContainers, envs := resources.GenerateInitContainers(wObj)
+				var volumes []corev1.Volume
+				var volumeMounts []corev1.VolumeMount
+				shmVolume, shmVolumeMount := utils.ConfigSHMVolume(*wObj.Resource.Count)
+				if shmVolume.Name != "" {
+					volumes = append(volumes, shmVolume)
+				}
+				if shmVolumeMount.Name != "" {
+					volumeMounts = append(volumeMounts, shmVolumeMount)
+				}
+
+				if len(wObj.Inference.Adapters) > 0 {
+					adapterVolume, adapterVolumeMount := utils.ConfigAdapterVolume()
+					volumes = append(volumes, adapterVolume)
+					volumeMounts = append(volumeMounts, adapterVolumeMount)
+				}
+
+				initContainers, envs := resources.GenerateInitContainers(wObj, volumeMounts)
 				spec := &deployment.Spec
 				spec.Template.Spec.InitContainers = initContainers
 				spec.Template.Spec.Containers[0].Env = envs
+				spec.Template.Spec.Containers[0].VolumeMounts = volumeMounts
 				deployment.Annotations[WorkspaceRevisionAnnotation] = currentHash
+				spec.Template.Spec.Volumes = volumes
 
 				if err := c.Update(ctx, deployment); err != nil {
 					return fmt.Errorf("failed to update deployment: %w", err)

pkg/resources/manifests.go

@@ -275,7 +275,7 @@ func GenerateDeploymentManifest(ctx context.Context, workspaceObj *kaitov1alpha1
 	initContainers := []corev1.Container{}
 	envs := []corev1.EnvVar{}
 	if len(workspaceObj.Inference.Adapters) > 0 {
-		initContainers, envs = GenerateInitContainers(workspaceObj)
+		initContainers, envs = GenerateInitContainers(workspaceObj, volumeMount)
 	}
 
 	return &appsv1.Deployment{
@@ -334,16 +334,16 @@ func GenerateDeploymentManifest(ctx context.Context, workspaceObj *kaitov1alpha1
 	}
 }
 
-func GenerateInitContainers(wObj *kaitov1alpha1.Workspace) ([]corev1.Container, []corev1.EnvVar) {
-	initContainers := []corev1.Container{}
-	envs := []corev1.EnvVar{}
+func GenerateInitContainers(wObj *kaitov1alpha1.Workspace, volumeMount []corev1.VolumeMount) ([]corev1.Container, []corev1.EnvVar) {
+	var initContainers []corev1.Container
+	var envs []corev1.EnvVar
 	if len(wObj.Inference.Adapters) > 0 {
 		for _, adapter := range wObj.Inference.Adapters {
 			initContainer := corev1.Container{
 				Name:            adapter.Source.Name,
 				Image:           adapter.Source.Image,
 				Command:         []string{"/bin/sh", "-c", fmt.Sprintf("mkdir -p /mnt/adapter/%s && cp -r /data/* /mnt/adapter/%s", adapter.Source.Name, adapter.Source.Name)},
-				VolumeMounts:    []corev1.VolumeMount{},
+				VolumeMounts:    volumeMount,
 				ImagePullPolicy: corev1.PullAlways,
 			}
 			initContainers = append(initContainers, initContainer)