misc: promote keep-pod-on-cancel to beta for cancel TaskRuns using entrypoint binary #3238

Signed-off-by: chengjoey <[email protected]>

Author: chengjoey

pkg/apis/config/feature_flags.go

@@ -139,8 +139,8 @@ var (
 	// DefaultEnableKeepPodOnCancel is the default PerFeatureFlag value for "keep-pod-on-cancel"
 	DefaultEnableKeepPodOnCancel = PerFeatureFlag{
 		Name:      KeepPodOnCancel,
-		Stability: AlphaAPIFields,
-		Enabled:   DefaultAlphaFeatureEnabled,
+		Stability: BetaAPIFields,
+		Enabled:   DefaultBetaFeatureEnabled,
 	}
 
 	// DefaultEnableCELInWhenExpression is the default PerFeatureFlag value for EnableCELInWhenExpression

test/e2e-tests-kind-prow-alpha.env

@@ -5,6 +5,7 @@ KO_DOCKER_REPO=registry.local:5000
 E2E_GO_TEST_TIMEOUT=40m
 RESULTS_FROM=sidecar-logs
 ENABLE_STEP_ACTIONS=true
+KEEP_POD_ON_CANCEL=true
 ENABLE_CEL_IN_WHENEXPRESSION=true
 ENABLE_PARAM_ENUM=true
 ENABLE_ARTIFACTS=true

test/e2e-tests-kind-prow-beta.env

@@ -4,5 +4,6 @@ EMBEDDED_STATUS_GATE=minimal
 RUN_YAML_TESTS=true
 RESULTS_FROM=sidecar-logs
 ENABLE_STEP_ACTIONS=true
+KEEP_POD_ON_CANCEL=true
 KO_DOCKER_REPO=registry.local:5000
 E2E_GO_TEST_TIMEOUT=40m

test/e2e-tests.sh

@@ -29,6 +29,7 @@ E2E_GO_TEST_TIMEOUT=${E2E_GO_TEST_TIMEOUT:="20m"}
 RUN_FEATUREFLAG_TESTS=${RUN_FEATUREFLAG_TESTS:="false"}
 RESULTS_FROM=${RESULTS_FROM:-termination-message}
 ENABLE_STEP_ACTIONS=${ENABLE_STEP_ACTIONS:="false"}
+KEEP_POD_ON_CANCEL=${KEEP_POD_ON_CANCEL:="false"}
 ENABLE_CEL_IN_WHENEXPRESSION=${ENABLE_CEL_IN_WHENEXPRESSION:="false"}
 ENABLE_PARAM_ENUM=${ENABLE_PARAM_ENUM:="false"}
 ENABLE_ARTIFACTS=${ENABLE_ARTIFACTS:="false"}
@@ -99,6 +100,18 @@ function set_enable_step_actions() {
   kubectl patch configmap feature-flags -n tekton-pipelines -p "$jsonpatch"
 }
 
+function set_keep_pod_on_cancel() {
+    local method="$1"
+    if [ "$method" != "false" ] && [ "$method" != "true" ]; then
+      printf "Invalid value for keep-pod-on-cancel %s\n" ${method}
+      exit 255
+    fi
+    printf "Setting keep-pod-on-cancel to %s\n", ${method}
+    jsonpatch=$(printf "{\"data\": {\"keep-pod-on-cancel\": \"%s\"}}" $1)
+    echo "feature-flags ConfigMap patch: ${jsonpatch}"
+    kubectl patch configmap feature-flags -n tekton-pipelines -p "$jsonpatch"
+}
+
 function set_cel_in_whenexpression() {
   local method="$1"
   if [ "$method" != "false" ] && [ "$method" != "true" ]; then
@@ -182,6 +195,7 @@ add_spire "$PIPELINE_FEATURE_GATE"
 set_feature_gate "$PIPELINE_FEATURE_GATE"
 set_result_extraction_method "$RESULTS_FROM"
 set_enable_step_actions "$ENABLE_STEP_ACTIONS"
+set_keep_pod_on_cancel "$KEEP_POD_ON_CANCEL"
 set_cel_in_whenexpression "$ENABLE_CEL_IN_WHENEXPRESSION"
 set_enable_param_enum "$ENABLE_PARAM_ENUM"
 set_enable_artifacts "$ENABLE_ARTIFACTS"

test/featureflags.go

@@ -120,6 +120,7 @@ func getFeatureFlagsBaseOnAPIFlag(t *testing.T) *config.FeatureFlags {
 		"enable-artifacts":               "true",
 		"enable-concise-resolver-syntax": "true",
 		"enable-kubernetes-sidecar":      "true",
+		"keep-pod-on-cancel":             "true",
 	})
 	if err != nil {
 		t.Fatalf("error creating alpha feature flags configmap: %v", err)
@@ -128,6 +129,7 @@ func getFeatureFlagsBaseOnAPIFlag(t *testing.T) *config.FeatureFlags {
 		"results-from":        "sidecar-logs",
 		"enable-api-fields":   "beta",
 		"enable-step-actions": "true",
+		"keep-pod-on-cancel":  "true",
 	})
 	if err != nil {
 		t.Fatalf("error creating beta feature flags configmap: %v", err)