From 68968b3e547e2f02696a0c3b078401b7f1bdfeab Mon Sep 17 00:00:00 2001 From: Lyndon-Li Date: Mon, 7 Apr 2025 19:30:25 +0800 Subject: [PATCH] issue 8847: inherit pod info from node-agent-windows Signed-off-by: Lyndon-Li --- pkg/exposer/generic_restore.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/exposer/generic_restore.go b/pkg/exposer/generic_restore.go index 2445ecc85..b299f954f 100644 --- a/pkg/exposer/generic_restore.go +++ b/pkg/exposer/generic_restore.go @@ -377,14 +377,14 @@ func (e *genericRestoreExposer) RebindVolume(ctx context.Context, ownerObject co } func (e *genericRestoreExposer) createRestorePod(ctx context.Context, ownerObject corev1.ObjectReference, targetPVC *corev1.PersistentVolumeClaim, - operationTimeout time.Duration, label map[string]string, annotation map[string]string, selectedNode string, resources corev1.ResourceRequirements, nodeType string) (*corev1.Pod, error) { + operationTimeout time.Duration, label map[string]string, annotation map[string]string, selectedNode string, resources corev1.ResourceRequirements, nodeOS string) (*corev1.Pod, error) { restorePodName := ownerObject.Name restorePVCName := ownerObject.Name containerName := string(ownerObject.UID) volumeName := string(ownerObject.UID) - podInfo, err := getInheritedPodInfo(ctx, e.kubeClient, ownerObject.Namespace, kube.NodeOSLinux) + podInfo, err := getInheritedPodInfo(ctx, e.kubeClient, ownerObject.Namespace, nodeOS) if err != nil { return nil, errors.Wrap(err, "error to get inherited pod info from node-agent") } @@ -427,7 +427,7 @@ func (e *genericRestoreExposer) createRestorePod(ctx context.Context, ownerObjec nodeSelector := map[string]string{} podOS := corev1.PodOS{} toleration := []corev1.Toleration{} - if nodeType == kube.NodeOSWindows { + if nodeOS == kube.NodeOSWindows { userID := "ContainerAdministrator" securityCtx = &corev1.PodSecurityContext{ WindowsOptions: &corev1.WindowsSecurityContextOptions{