argoproj · terrytangyuan · Aug 26, 2023 · Aug 16, 2023 · Aug 16, 2023 · Aug 23, 2023
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,6 @@
 # https://golangci-lint.run/usage/quick-start/
 run:
-  timeout: 8m
+  timeout: 12m
   skip-dirs:
     - dist
     - docs

diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/docs/fields.md b/docs/fields.md
@@ -1454,6 +1454,7 @@ WorkflowLevelArtifactGC describes how to delete artifacts from completed Workflo
 |:----------:|:----------:|---------------|
 |`forceFinalizerRemoval`|`boolean`|ForceFinalizerRemoval: if set to true, the finalizer will be removed in the case that Artifact GC fails|
 |`podMetadata`|[`Metadata`](#metadata)|PodMetadata is an optional field for specifying the Labels and Annotations that should be assigned to the Pod doing the deletion|
+|`podSpecPatch`|`string`|PodSpecPatch holds strategic merge patch to apply against the artgc pod spec.|
 |`serviceAccountName`|`string`|ServiceAccountName is an optional field for specifying the Service Account that should be assigned to the Pod doing the deletion|
 |`strategy`|`string`|Strategy is the strategy to use.|
 

diff --git a/manifests/base/crds/full/argoproj.io_clusterworkflowtemplates.yaml b/manifests/base/crds/full/argoproj.io_clusterworkflowtemplates.yaml
diff --git a/manifests/base/crds/full/argoproj.io_cronworkflows.yaml b/manifests/base/crds/full/argoproj.io_cronworkflows.yaml
diff --git a/manifests/base/crds/full/argoproj.io_workflows.yaml b/manifests/base/crds/full/argoproj.io_workflows.yaml
diff --git a/manifests/base/crds/full/argoproj.io_workflowtemplates.yaml b/manifests/base/crds/full/argoproj.io_workflowtemplates.yaml
diff --git a/pkg/apis/workflow/v1alpha1/generated.pb.go b/pkg/apis/workflow/v1alpha1/generated.pb.go
diff --git a/pkg/apis/workflow/v1alpha1/generated.proto b/pkg/apis/workflow/v1alpha1/generated.proto
diff --git a/pkg/apis/workflow/v1alpha1/openapi_generated.go b/pkg/apis/workflow/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/workflow/v1alpha1/workflow_types.go b/pkg/apis/workflow/v1alpha1/workflow_types.go
@@ -1041,8 +1041,12 @@ func (podGC *PodGC) GetStrategy() PodGCStrategy {
 type WorkflowLevelArtifactGC struct {
 	// ArtifactGC is an embedded struct
 	ArtifactGC `json:",inline" protobuf:"bytes,1,opt,name=artifactGC"`
+
 	// ForceFinalizerRemoval: if set to true, the finalizer will be removed in the case that Artifact GC fails
 	ForceFinalizerRemoval bool `json:"forceFinalizerRemoval,omitempty" protobuf:"bytes,2,opt,name=forceFinalizerRemoval"`
+
+	// PodSpecPatch holds strategic merge patch to apply against the artgc pod spec.
+	PodSpecPatch string `json:"podSpecPatch,omitempty" protobuf:"bytes,3,opt,name=podSpecPatch"`
 }
 
 // ArtifactGC describes how to delete artifacts from completed Workflows - this is embedded into the WorkflowLevelArtifactGC, and also used for individual Artifacts to override that as needed

diff --git a/sdks/java/client/docs/IoArgoprojWorkflowV1alpha1WorkflowLevelArtifactGC.md b/sdks/java/client/docs/IoArgoprojWorkflowV1alpha1WorkflowLevelArtifactGC.md
diff --git a/...n/client/argo_workflows/model/io_argoproj_workflow_v1alpha1_workflow_level_artifact_gc.py b/...n/client/argo_workflows/model/io_argoproj_workflow_v1alpha1_workflow_level_artifact_gc.py
diff --git a/sdks/python/client/docs/ClusterWorkflowTemplateServiceApi.md b/sdks/python/client/docs/ClusterWorkflowTemplateServiceApi.md
diff --git a/sdks/python/client/docs/CronWorkflowServiceApi.md b/sdks/python/client/docs/CronWorkflowServiceApi.md
diff --git a/sdks/python/client/docs/IoArgoprojWorkflowV1alpha1WorkflowLevelArtifactGC.md b/sdks/python/client/docs/IoArgoprojWorkflowV1alpha1WorkflowLevelArtifactGC.md
diff --git a/sdks/python/client/docs/WorkflowServiceApi.md b/sdks/python/client/docs/WorkflowServiceApi.md
diff --git a/sdks/python/client/docs/WorkflowTemplateServiceApi.md b/sdks/python/client/docs/WorkflowTemplateServiceApi.md