fix: minor version check for sidecar logic

tektoncd · Dec 18, 2024 · bf59db5 · bf59db5
1 parent c2c3085
commit bf59db5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/pod/pod.go b/pkg/pod/pod.go
@@ -446,8 +446,9 @@ func (b *Builder) Build(ctx context.Context, taskRun *v1.TaskRun, taskSpec v1.Ta
 		if err != nil {
 			return nil, err
 		}
-		svMinorInt, _ := strconv.Atoi(sv.Minor)
+		svMinor := strings.TrimSuffix(sv.Minor, "+") // Remove '+' if present
 		svMajorInt, _ := strconv.Atoi(sv.Major)
+		svMinorInt, _ := strconv.Atoi(svMinor)
 		if svMajorInt >= 1 && svMinorInt >= SidecarK8sMinorVersionCheck {
 			// Add RestartPolicy and Merge into initContainer
 			useTektonSidecar = false

diff --git a/pkg/reconciler/taskrun/taskrun.go b/pkg/reconciler/taskrun/taskrun.go
@@ -164,9 +164,10 @@ func (c *Reconciler) ReconcileKind(ctx context.Context, tr *v1.TaskRun) pkgrecon
 			if err != nil {
 				return err
 			}
+			svMinor := strings.TrimSuffix(sv.Minor, "+") // Remove '+' if present
 			svMajorInt, _ := strconv.Atoi(sv.Major)
-			svMinorInt, _ := strconv.Atoi(sv.Minor)
-			if svMajorInt >= 1 && svMinorInt >= 29 {
+			svMinorInt, _ := strconv.Atoi(svMinor)
+			if svMajorInt >= 1 && svMinorInt >= podconvert.SidecarK8sMinorVersionCheck {
 				useTektonSidecar = false
 				logger.Infof("Using Kubernetes Native Sidecars \n")
 			}