Merge pull request #8606 from Lyndon-Li/data-mover-pod-misc-enhanceme…

…nt-for-windows Add Windows toleration to data mover pods
vmware-tanzu · Jan 13, 2025 · 5f7bf64 · 5f7bf64
2 parents 094ba59 + 5dedaca
commit 5f7bf64
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/changelogs/unreleased/8606-Lyndon-Li b/changelogs/unreleased/8606-Lyndon-Li
@@ -0,0 +1 @@
+Fix issue #8418, add Windows toleration to data mover pods
diff --git a/pkg/exposer/csi_snapshot.go b/pkg/exposer/csi_snapshot.go
@@ -586,6 +586,7 @@ func (e *csiSnapshotExposer) createBackupPod(
 	var securityCtx *corev1.PodSecurityContext
 	nodeSelector := map[string]string{}
 	podOS := corev1.PodOS{}
+	toleration := []corev1.Toleration{}
 	if nodeOS == kube.NodeOSWindows {
 		userID := "ContainerAdministrator"
 		securityCtx = &corev1.PodSecurityContext{
@@ -596,6 +597,13 @@ func (e *csiSnapshotExposer) createBackupPod(
 
 		nodeSelector[kube.NodeOSLabel] = kube.NodeOSWindows
 		podOS.Name = kube.NodeOSWindows
+
+		toleration = append(toleration, corev1.Toleration{
+			Key:      "os",
+			Operator: "Equal",
+			Effect:   "NoSchedule",
+			Value:    "windows",
+		})
 	} else {
 		userID := int64(0)
 		securityCtx = &corev1.PodSecurityContext{
@@ -666,6 +674,7 @@ func (e *csiSnapshotExposer) createBackupPod(
 			Volumes:                       volumes,
 			RestartPolicy:                 corev1.RestartPolicyNever,
 			SecurityContext:               securityCtx,
+			Tolerations:                   toleration,
 		},
 	}
 

diff --git a/pkg/exposer/generic_restore.go b/pkg/exposer/generic_restore.go
@@ -418,6 +418,7 @@ func (e *genericRestoreExposer) createRestorePod(ctx context.Context, ownerObjec
 	var securityCtx *corev1.PodSecurityContext
 	nodeSelector := map[string]string{}
 	podOS := corev1.PodOS{}
+	toleration := []corev1.Toleration{}
 	if nodeType == kube.NodeOSWindows {
 		userID := "ContainerAdministrator"
 		securityCtx = &corev1.PodSecurityContext{
@@ -428,6 +429,13 @@ func (e *genericRestoreExposer) createRestorePod(ctx context.Context, ownerObjec
 
 		nodeSelector[kube.NodeOSLabel] = kube.NodeOSWindows
 		podOS.Name = kube.NodeOSWindows
+
+		toleration = append(toleration, corev1.Toleration{
+			Key:      "os",
+			Operator: "Equal",
+			Effect:   "NoSchedule",
+			Value:    "windows",
+		})
 	} else {
 		userID := int64(0)
 		securityCtx = &corev1.PodSecurityContext{
@@ -480,6 +488,7 @@ func (e *genericRestoreExposer) createRestorePod(ctx context.Context, ownerObjec
 			NodeName:                      selectedNode,
 			RestartPolicy:                 corev1.RestartPolicyNever,
 			SecurityContext:               securityCtx,
+			Tolerations:                   toleration,
 		},
 	}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix issue #8418, add Windows toleration to data mover pods