tektoncd#7617 support k8s native sidecar

kgcarr · Jun 14, 2024 · 013b021 · 013b021
1 parent 03c08e8
commit 013b021
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 46 deletions.
diff --git a/examples/v1/taskruns/native-sidecar-ready.yaml b/examples/v1/taskruns/native-sidecar-ready.yaml
diff --git a/examples/v1/taskruns/sidecar-ready.yaml b/examples/v1/taskruns/sidecar-ready.yaml
@@ -18,6 +18,15 @@ spec:
           - -c
           - sleep 5 && touch /shared/ready
         timeoutSeconds: 10
+      # Adding startup probe for k8s native sidecar support
+      # Readiness Probe is not honored for k8s native sidecar support
+      startupProbe:
+        exec:
+          command:
+          - sh
+          - -c
+          - sleep 5 && touch /shared/ready
+        timeoutSeconds: 10
       volumeMounts:
       - name: shared
         mountPath: /shared

diff --git a/pkg/pod/pod.go b/pkg/pod/pod.go
@@ -438,13 +438,8 @@ func (b *Builder) Build(ctx context.Context, taskRun *v1.TaskRun, taskSpec v1.Ta
 	// we are only concerned about major version 1 and if the minor is less than 29 then
 	// we need to do the current logic
 	svMinorInt, _ := strconv.Atoi(sv.Minor)
-	if sv.Major == "1" && svMinorInt < SidecarK8sMinorVersionCheck {
-		// Merge sidecar containers with step containers.
-		for _, sc := range sidecarContainers {
-			sc.Name = names.SimpleNameGenerator.RestrictLength(fmt.Sprintf("%v%v", sidecarPrefix, sc.Name))
-			mergedPodContainers = append(mergedPodContainers, sc)
-		}
-	} else {
+	svMajorInt, _ := strconv.Atoi(sv.Major)
+	if svMajorInt == 1 && svMinorInt >= SidecarK8sMinorVersionCheck {
 		// Add RestartPolicy and Merge into initContainer
 		for i := range sidecarContainers {
 			sc := &sidecarContainers[i]
@@ -454,6 +449,12 @@ func (b *Builder) Build(ctx context.Context, taskRun *v1.TaskRun, taskSpec v1.Ta
 			sc.Name = names.SimpleNameGenerator.RestrictLength(fmt.Sprintf("%v%v", sidecarPrefix, sc.Name))
 			mergedPodInitContainers = append(mergedPodInitContainers, *sc)
 		}
+	} else {
+		// Merge sidecar containers with step containers.
+		for _, sc := range sidecarContainers {
+			sc.Name = names.SimpleNameGenerator.RestrictLength(fmt.Sprintf("%v%v", sidecarPrefix, sc.Name))
+			mergedPodContainers = append(mergedPodContainers, sc)
+		}
 	}
 
 	var dnsPolicy corev1.DNSPolicy