Merge pull request #1001 from wzshiming/feat/sidecar-container

Support Sidecar container
kubernetes-sigs · Apr 3, 2024 · 37b7812 · 37b7812
2 parents 6d154b2 + e275512
commit 37b7812
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/kustomize/stage/pod/fast/pod-ready.yaml b/kustomize/stage/pod/fast/pod-ready.yaml
@@ -49,12 +49,19 @@ spec:
         name: {{ .name | Quote }}
         ready: true
         restartCount: 0
+        {{ if eq .restartPolicy "Always" }}
+        started: true
+        state:
+          running:
+            startedAt: {{ $now | Quote }}
+        {{ else }}
         state:
           terminated:
             exitCode: 0
             finishedAt: {{ $now | Quote }}
             reason: Completed
             startedAt: {{ $now | Quote }}
+        {{ end }}
       {{ end }}
 
       hostIP: {{ NodeIPWith .spec.nodeName | Quote }}

diff --git a/test/e2e/helper/pod.go b/test/e2e/helper/pod.go
@@ -19,6 +19,8 @@ package helper
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"sigs.k8s.io/kwok/pkg/utils/format"
 )
 
 // PodBuilder is a builder for pod.
@@ -35,10 +37,23 @@ func NewPodBuilder(name string) *PodBuilder {
 				Namespace: "default",
 			},
 			Spec: corev1.PodSpec{
-				Containers: []corev1.Container{{
-					Name:  "container",
-					Image: "image",
-				}},
+				InitContainers: []corev1.Container{
+					{
+						Name:  "init",
+						Image: "image",
+					},
+					{
+						Name:          "sidecar",
+						Image:         "image",
+						RestartPolicy: format.Ptr(corev1.ContainerRestartPolicyAlways),
+					},
+				},
+				Containers: []corev1.Container{
+					{
+						Name:  "container",
+						Image: "image",
+					},
+				},
 			},
 		},
 	}