Do not require enable-api-fields: alpha for entrypoint cancellation

This commit removes the need for `enable-api-fields: alpha` to enable the entrypoint cancellation. This feature should only behind the `keep-pod-on-cancel: true` feature-flag. Signed-off-by: Vincent Demeester <[email protected]>
tektoncd · Nov 28, 2023 · d55ca66 · d55ca66
1 parent 36cd0a1
commit d55ca66
Show file tree

Hide file tree

Showing 3 changed files with 1,189 additions and 1,139 deletions.
diff --git a/pkg/pod/pod.go b/pkg/pod/pod.go
@@ -152,7 +152,7 @@ func (b *Builder) Build(ctx context.Context, taskRun *v1.TaskRun, taskSpec v1.Ta
 	defaultForbiddenEnv := config.FromContextOrDefaults(ctx).Defaults.DefaultForbiddenEnv
 	alphaAPIEnabled := featureFlags.EnableAPIFields == config.AlphaAPIFields
 	sidecarLogsResultsEnabled := config.FromContextOrDefaults(ctx).FeatureFlags.ResultExtractionMethod == config.ResultExtractionMethodSidecarLogs
-	enableKeepPodOnCancel := alphaAPIEnabled && featureFlags.EnableKeepPodOnCancel
+	enableKeepPodOnCancel := featureFlags.EnableKeepPodOnCancel
 	setSecurityContext := config.FromContextOrDefaults(ctx).FeatureFlags.SetSecurityContext
 
 	// Add our implicit volumes first, so they can be overridden by the user if they prefer.