controller: respect named ports of restartable init containers

Signed-off-by: zhangzujian <[email protected]>
kubeovn · Feb 17, 2025 · b05bc61 · b05bc61
1 parent d4eb19d
commit b05bc61
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -56,12 +56,21 @@ func (n *NamedPort) AddNamedPortByPod(pod *v1.Pod) {
 	ns := pod.Namespace
 	podName := pod.Name
 
-	if pod.Spec.Containers == nil {
+	restartableInitContainers := make([]v1.Container, 0, len(pod.Spec.InitContainers))
+	for i := range pod.Spec.InitContainers {
+		if pod.Spec.InitContainers[i].RestartPolicy != nil &&
+			*pod.Spec.InitContainers[i].RestartPolicy == v1.ContainerRestartPolicyAlways {
+			restartableInitContainers = append(restartableInitContainers, pod.Spec.InitContainers[i])
+		}
+	}
+
+	containers := slices.Concat(restartableInitContainers, pod.Spec.Containers)
+	if len(containers) == 0 {
 		return
 	}
 
-	for _, container := range pod.Spec.Containers {
-		if container.Ports == nil {
+	for _, container := range containers {
+		if len(container.Ports) == 0 {
 			continue
 		}