Merge pull request #97858 from lyzs90/pull-real-node-images

Pull hollow node images from real nodes

cmd/kubemark/hollow-node.go

@@ -222,12 +222,17 @@ func run(config *hollowNodeConfig) {
 			klog.Fatalf("Failed to init runtime service %v.", err)
 		}
 
+		remoteImageService, err := remote.NewRemoteImageService(f.RemoteImageEndpoint, 15*time.Second)
+		if err != nil {
+			klog.Fatalf("Failed to init image service %v.", err)
+		}
+
 		hollowKubelet := kubemark.NewHollowKubelet(
 			f, c,
 			client,
 			heartbeatClient,
 			cadvisorInterface,
-			fakeRemoteRuntime.ImageService,
+			remoteImageService,
 			runtimeService,
 			containerManager,
 		)

pkg/kubemark/hollow_kubelet.go

@@ -167,6 +167,7 @@ func GetHollowKubeletConfig(opt *HollowKubletOptions) (*options.KubeletFlags, *k
 	f.RegisterNode = true
 	f.RegisterSchedulable = true
 	f.RegisterWithTaints = opt.RegisterWithTaints
+	f.RemoteImageEndpoint = "/run/containerd/containerd.sock"
 
 	// Config struct
 	c, err := options.NewKubeletConfiguration()

test/kubemark/resources/hollow-node_template.yaml

@@ -31,6 +31,9 @@ spec:
       - name: logs-volume
         hostPath:
           path: /var/log
+      - name: containerd
+        hostPath:
+          path: /run/containerd
       - name: no-serviceaccount-access-to-real-master
         emptyDir: {}
       containers:
@@ -67,6 +70,8 @@ spec:
           readOnly: true
         - name: logs-volume
           mountPath: /var/log
+        - name: containerd
+          mountPath: /run/containerd
         resources:
           requests:
             cpu: {{hollow_kubelet_millicpu}}m