Promote the provenance field in status

Fixes tektoncd#6309. Prior, the `provenance` field in status was gated by the dedicated feature flag named `enable-provenance-in-status`. This PR moves the field out of the feature flag. Signed-off-by: Chuang Wang <chuangw@google.com>
chuangw6 · May 9, 2023 · 7e74ce1 · 7e74ce1
1 parent 09d422c
commit 7e74ce1
Show file tree

Hide file tree

Showing 17 changed files with 348 additions and 138 deletions.
diff --git a/config/config-feature-flags.yaml b/config/config-feature-flags.yaml
@@ -81,11 +81,6 @@ data:
   # If it is set to "warn", TaskRuns and PipelineRuns will run to completion if no matching policies are found, and an error will be logged.
   # If it is set to "ignore", TaskRuns and PipelineRuns will run to completion if no matching policies are found, and no error will be logged.
   trusted-resources-verification-no-match-policy: "ignore"
-  # Setting this flag to "true" enables populating the "provenance" field in TaskRun
-  # and PipelineRun status. This field contains metadata about resources used
-  # in the TaskRun/PipelineRun such as the source from where a remote Task/Pipeline
-  # definition was fetched.
-  enable-provenance-in-status: "false"
   # Setting this flag will determine how Tekton pipelines will handle non-falsifiable provenance.
   # If set to "spire", then SPIRE will be used to ensure non-falsifiable provenance.
   # If set to "none", then Tekton will not have non-falsifiable provenance.

diff --git a/docs/additional-configs.md b/docs/additional-configs.md
@@ -245,10 +245,6 @@ Defaults to "ignore".
 
 - `results-from`: set this flag to "termination-message" to use the container's termination message to fetch results from. This is the default method of extracting results. Set it to "sidecar-logs" to enable use of a results sidecar logs to extract results instead of termination message.
 
-- `enable-provenance-in-status`: set this flag to "true" to enable recording
-  the `provenance` field in `TaskRun` and `PipelineRun` status. The `provenance`
-  field contains metadata about resources used in the TaskRun/PipelineRun such as the
-  source from where a remote Task/Pipeline definition was fetched.
 
 For example:
 
@@ -284,7 +280,6 @@ Features currently in "alpha" are:
 | [Task-level Resource Requirements](compute-resources.md#task-level-compute-resources-configuration) | [TEP-0104](https://github.com/tektoncd/community/blob/main/teps/0104-tasklevel-resource-requirements.md)                   | [v0.39.0](https://github.com/tektoncd/pipeline/releases/tag/v0.39.0) |                               |
 | [Object Params and Results](pipelineruns.md#specifying-parameters)                                  | [TEP-0075](https://github.com/tektoncd/community/blob/main/teps/0075-object-param-and-result-types.md)                     | [v0.38.0](https://github.com/tektoncd/pipeline/releases/tag/v0.38.0) |                               |                             |
 | [Trusted Resources](./trusted-resources.md)                                                         | [TEP-0091](https://github.com/tektoncd/community/blob/main/teps/0091-trusted-resources.md)                                 | N/A                                                                  | `trusted-resources-verification-no-match-policy`  |
-| [`Provenance` field in Status](pipeline-api.md#provenance)                                          | [issue#5550](https://github.com/tektoncd/pipeline/issues/5550)                                                             | N/A                                                                  | `enable-provenance-in-status` |
 | [Larger Results via Sidecar Logs](#enabling-larger-results-using-sidecar-logs)                      | [TEP-0127](https://github.com/tektoncd/community/blob/main/teps/0127-larger-results-via-sidecar-logs.md)                   | [v0.43.0](https://github.com/tektoncd/pipeline/releases/tag/v0.43.0) | `results-from`                |
 | [Configure Default Resolver](./resolution.md#configuring-built-in-resolvers)                        | [TEP-0133](https://github.com/tektoncd/community/blob/main/teps/0133-configure-default-resolver.md)                        | N/A                                 |                                |
 

diff --git a/pkg/apis/config/feature_flags.go b/pkg/apis/config/feature_flags.go
@@ -70,8 +70,6 @@ const (
 	DefaultEnforceNonfalsifiability = EnforceNonfalsifiabilityNone
 	// DefaultNoMatchPolicyConfig is the default value for "trusted-resources-verification-no-match-policy".
 	DefaultNoMatchPolicyConfig = IgnoreNoMatchPolicy
-	// DefaultEnableProvenanceInStatus is the default value for "enable-provenance-status".
-	DefaultEnableProvenanceInStatus = false
 	// DefaultResultExtractionMethod is the default value for ResultExtractionMethod
 	DefaultResultExtractionMethod = ResultExtractionMethodTerminationMessage
 	// DefaultMaxResultSize is the default value in bytes for the size of a result
@@ -87,7 +85,6 @@ const (
 	sendCloudEventsForRuns              = "send-cloudevents-for-runs"
 	enforceNonfalsifiability            = "enforce-nonfalsifiability"
 	verificationNoMatchPolicy           = "trusted-resources-verification-no-match-policy"
-	enableProvenanceInStatus            = "enable-provenance-in-status"
 	resultExtractionMethod              = "results-from"
 	maxResultSize                       = "max-result-size"
 )
@@ -113,7 +110,6 @@ type FeatureFlags struct {
 	// warn: skip trusted resources verification when no matching verification policies found and log a warning
 	// fail: fail the taskrun or pipelines run if no matching verification policies found
 	VerificationNoMatchPolicy string
-	EnableProvenanceInStatus  bool
 	ResultExtractionMethod    string
 	MaxResultSize             int
 }
@@ -167,9 +163,6 @@ func NewFeatureFlagsFromMap(cfgMap map[string]string) (*FeatureFlags, error) {
 	if err := setVerificationNoMatchPolicy(cfgMap, DefaultNoMatchPolicyConfig, &tc.VerificationNoMatchPolicy); err != nil {
 		return nil, err
 	}
-	if err := setFeature(enableProvenanceInStatus, DefaultEnableProvenanceInStatus, &tc.EnableProvenanceInStatus); err != nil {
-		return nil, err
-	}
 	if err := setResultExtractionMethod(cfgMap, DefaultResultExtractionMethod, &tc.ResultExtractionMethod); err != nil {
 		return nil, err
 	}

diff --git a/pkg/apis/config/feature_flags_test.go b/pkg/apis/config/feature_flags_test.go
@@ -48,7 +48,6 @@ func TestNewFeatureFlagsFromConfigMap(t *testing.T) {
 				EnableAPIFields:           config.DefaultEnableAPIFields,
 				SendCloudEventsForRuns:    config.DefaultSendCloudEventsForRuns,
 				VerificationNoMatchPolicy: config.DefaultNoMatchPolicyConfig,
-				EnableProvenanceInStatus:  config.DefaultEnableProvenanceInStatus,
 				ResultExtractionMethod:    config.DefaultResultExtractionMethod,
 				MaxResultSize:             config.DefaultMaxResultSize,
 			},
@@ -65,7 +64,6 @@ func TestNewFeatureFlagsFromConfigMap(t *testing.T) {
 				SendCloudEventsForRuns:           true,
 				EnforceNonfalsifiability:         "spire",
 				VerificationNoMatchPolicy:        config.FailNoMatchPolicy,
-				EnableProvenanceInStatus:         true,
 				ResultExtractionMethod:           "termination-message",
 				MaxResultSize:                    4096,
 			},
@@ -172,7 +170,6 @@ func TestNewFeatureFlagsFromEmptyConfigMap(t *testing.T) {
 		SendCloudEventsForRuns:           config.DefaultSendCloudEventsForRuns,
 		EnforceNonfalsifiability:         config.DefaultEnforceNonfalsifiability,
 		VerificationNoMatchPolicy:        config.DefaultNoMatchPolicyConfig,
-		EnableProvenanceInStatus:         config.DefaultEnableProvenanceInStatus,
 		ResultExtractionMethod:           config.DefaultResultExtractionMethod,
 		MaxResultSize:                    config.DefaultMaxResultSize,
 	}

diff --git a/pkg/apis/config/testdata/feature-flags-all-flags-set.yaml b/pkg/apis/config/testdata/feature-flags-all-flags-set.yaml
@@ -28,4 +28,3 @@ data:
   send-cloudevents-for-runs: "true"
   enforce-nonfalsifiability: "spire"
   trusted-resources-verification-no-match-policy: "fail"
-  enable-provenance-in-status: "true"
diff --git a/pkg/apis/pipeline/v1beta1/pipelinerun_conversion_test.go b/pkg/apis/pipeline/v1beta1/pipelinerun_conversion_test.go
@@ -138,6 +138,7 @@ func TestPipelineRunConversionBadType(t *testing.T) {
 }
 
 func TestPipelineRunConversion(t *testing.T) {
+	defaultFeatureFlags, _ := config.NewFeatureFlagsFromMap(map[string]string{})
 	tests := []struct {
 		name string
 		in   *v1beta1.PipelineRun
@@ -305,14 +306,7 @@ func TestPipelineRunConversion(t *testing.T) {
 							URI:    "test-uri",
 							Digest: map[string]string{"sha256": "digest"},
 						},
-						FeatureFlags: &config.FeatureFlags{
-							RunningInEnvWithInjectedSidecars: config.DefaultRunningInEnvWithInjectedSidecars,
-							EnableAPIFields:                  config.DefaultEnableAPIFields,
-							AwaitSidecarReadiness:            config.DefaultAwaitSidecarReadiness,
-							VerificationNoMatchPolicy:        config.DefaultNoMatchPolicyConfig,
-							ResultExtractionMethod:           config.DefaultResultExtractionMethod,
-							MaxResultSize:                    config.DefaultMaxResultSize,
-						},
+						FeatureFlags: defaultFeatureFlags,
 					},
 				},
 			},

diff --git a/pkg/apis/pipeline/v1beta1/taskrun_conversion_test.go b/pkg/apis/pipeline/v1beta1/taskrun_conversion_test.go
@@ -51,6 +51,8 @@ func TestTaskRunConversionBadType(t *testing.T) {
 }
 
 func TestTaskRunConversion(t *testing.T) {
+	defaultFeatureFlags, _ := config.NewFeatureFlagsFromMap(map[string]string{})
+
 	tests := []struct {
 		name string
 		in   *v1beta1.TaskRun
@@ -237,14 +239,7 @@ func TestTaskRunConversion(t *testing.T) {
 							URI:    "test-uri",
 							Digest: map[string]string{"sha256": "digest"},
 						},
-						FeatureFlags: &config.FeatureFlags{
-							RunningInEnvWithInjectedSidecars: config.DefaultRunningInEnvWithInjectedSidecars,
-							EnableAPIFields:                  config.DefaultEnableAPIFields,
-							AwaitSidecarReadiness:            config.DefaultAwaitSidecarReadiness,
-							VerificationNoMatchPolicy:        config.DefaultNoMatchPolicyConfig,
-							ResultExtractionMethod:           config.DefaultResultExtractionMethod,
-							MaxResultSize:                    config.DefaultMaxResultSize,
-						},
+						FeatureFlags: defaultFeatureFlags,
 					}},
 			},
 		},

diff --git a/pkg/reconciler/pipelinerun/pipelinerun.go b/pkg/reconciler/pipelinerun/pipelinerun.go
@@ -1224,19 +1224,17 @@ func storePipelineSpecAndMergeMeta(ctx context.Context, pr *v1beta1.PipelineRun,
 	// Propagate refSource from remote resolution to PipelineRun Status
 	// This lives outside of the status.spec check to avoid the case where only the spec is available in the first reconcile and source comes in next reconcile.
 	cfg := config.FromContextOrDefaults(ctx)
-	if cfg.FeatureFlags.EnableProvenanceInStatus {
-		if pr.Status.Provenance == nil {
-			pr.Status.Provenance = &v1beta1.Provenance{}
-		}
-		// Store FeatureFlags in the Provenance.
-		pr.Status.Provenance.FeatureFlags = cfg.FeatureFlags
+	if pr.Status.Provenance == nil {
+		pr.Status.Provenance = &v1beta1.Provenance{}
+	}
+	// Store FeatureFlags in the Provenance.
+	pr.Status.Provenance.FeatureFlags = cfg.FeatureFlags
 
-		if meta != nil && meta.RefSource != nil && pr.Status.Provenance.RefSource == nil {
-			pr.Status.Provenance.RefSource = meta.RefSource
-		}
-		if meta != nil && meta.RefSource != nil && pr.Status.Provenance.ConfigSource == nil {
-			pr.Status.Provenance.ConfigSource = (*v1beta1.ConfigSource)(meta.RefSource)
-		}
+	if meta != nil && meta.RefSource != nil && pr.Status.Provenance.RefSource == nil {
+		pr.Status.Provenance.RefSource = meta.RefSource
+	}
+	if meta != nil && meta.RefSource != nil && pr.Status.Provenance.ConfigSource == nil {
+		pr.Status.Provenance.ConfigSource = (*v1beta1.ConfigSource)(meta.RefSource)
 	}
 
 	return nil