enhance: Kubernetes-HostPort plugin support to wait for network ready

Signed-off-by: ChrisLiu <chrisliu1995@163.com>
openkruise · Apr 23, 2024 · a30d659 · a30d659
1 parent 69babe6
commit a30d659
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -130,7 +130,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
 .PHONY: envtest
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN)
-	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
+	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@c7e1dc9b5302d649d5531e19168dd7ea0013736d
 
 HELM = $(shell pwd)/bin/helm
 helm: ## Download helm locally if necessary.

diff --git a/cloudprovider/kubernetes/hostPort.go b/cloudprovider/kubernetes/hostPort.go
@@ -130,10 +130,6 @@ func (hpp *HostPortPlugin) OnPodUpdated(c client.Client, pod *corev1.Pod, ctx co
 	nodeIp := getAddress(node)
 
 	networkManager := utils.NewNetworkManager(pod, c)
-	status, _ := networkManager.GetNetworkStatus()
-	if status != nil {
-		return pod, nil
-	}
 
 	iNetworkPorts := make([]gamekruiseiov1alpha1.NetworkPort, 0)
 	eNetworkPorts := make([]gamekruiseiov1alpha1.NetworkPort, 0)
@@ -157,7 +153,7 @@ func (hpp *HostPortPlugin) OnPodUpdated(c client.Client, pod *corev1.Pod, ctx co
 	}
 
 	// network not ready
-	if len(iNetworkPorts) == 0 || len(eNetworkPorts) == 0 {
+	if len(iNetworkPorts) == 0 || len(eNetworkPorts) == 0 || pod.Status.PodIP == "" {
 		pod, err := networkManager.UpdateNetworkStatus(gamekruiseiov1alpha1.NetworkStatus{
 			CurrentNetworkState: gamekruiseiov1alpha1.NetworkNotReady,
 		}, pod)