fix if restart pod sanbox container, sanbox /etc/resolv.conf will be …

…restore to host /etc/resolv.conf.
AliyunContainerService · Jul 22, 2022 · 1f791a6 · 1f791a6
1 parent 17f559f
commit 1f791a6
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/cri/v1alpha2/cri.go b/cri/v1alpha2/cri.go
@@ -427,6 +427,13 @@ func (c *CriManager) StartPodSandbox(ctx context.Context, r *runtime.StartPodSan
 		}
 	}
 
+	// Setup sandbox file /etc/resolv.conf again to ensure resolv.conf is right
+	sandboxRootDir := path.Join(c.SandboxBaseDir, sandbox.ID)
+	err = setupSandboxFiles(sandboxRootDir, sandboxMeta.Config)
+	if err != nil {
+		return nil, fmt.Errorf("failed to setup sandbox files: %v", err)
+	}
+
 	metrics.PodSuccessActionsCounter.WithLabelValues(label).Inc()
 
 	return &runtime.StartPodSandboxResponse{}, nil