removed delete delay seconds

Author: kartik-579

pkg/pipeline/bean/WorkflowTemplate.go

@@ -28,26 +28,25 @@ type WorkflowTemplate struct {
 	WorkflowId       int
 	WorkflowRunnerId int
 	v1.PodSpec
-	ConfigMaps               []bean.ConfigSecretMap
-	Secrets                  []bean.ConfigSecretMap
-	TTLValue                 *int32
-	WorkflowRequestJson      string
-	WorkflowNamePrefix       string
-	WfControllerInstanceID   string
-	ClusterConfig            *rest.Config
-	Namespace                string
-	ArchiveLogs              bool
-	BlobStorageConfigured    bool
-	BlobStorageS3Config      *blob_storage.BlobStorageS3Config
-	CloudProvider            blob_storage.BlobStorageType
-	AzureBlobConfig          *blob_storage.AzureBlobConfig
-	GcpBlobConfig            *blob_storage.GcpBlobConfig
-	CloudStorageKey          string
-	PrePostDeploySteps       []*StepObject
-	RefPlugins               []*RefPluginObject
-	TerminationGracePeriod   int
-	WorkflowType             string
-	PodGCDeleteDelayDuration string
+	ConfigMaps             []bean.ConfigSecretMap
+	Secrets                []bean.ConfigSecretMap
+	TTLValue               *int32
+	WorkflowRequestJson    string
+	WorkflowNamePrefix     string
+	WfControllerInstanceID string
+	ClusterConfig          *rest.Config
+	Namespace              string
+	ArchiveLogs            bool
+	BlobStorageConfigured  bool
+	BlobStorageS3Config    *blob_storage.BlobStorageS3Config
+	CloudProvider          blob_storage.BlobStorageType
+	AzureBlobConfig        *blob_storage.AzureBlobConfig
+	GcpBlobConfig          *blob_storage.GcpBlobConfig
+	CloudStorageKey        string
+	PrePostDeploySteps     []*StepObject
+	RefPlugins             []*RefPluginObject
+	TerminationGracePeriod int
+	WorkflowType           string
 }
 
 const (

pkg/pipeline/executors/ArgoWorkflowExecutor.go

@@ -153,8 +153,7 @@ func (impl *ArgoWorkflowExecutorImpl) ExecuteWorkflow(workflowTemplate bean.Work
 				Templates: templates,
 				Volumes:   workflowTemplate.Volumes,
 				PodGC: &v1alpha1.PodGC{
-					Strategy:            v1alpha1.PodGCOnWorkflowCompletion,
-					DeleteDelayDuration: workflowTemplate.PodGCDeleteDelayDuration,
+					Strategy: v1alpha1.PodGCOnWorkflowCompletion,
 				},
 			},
 		}

pkg/pipeline/types/CiCdConfig.go

@@ -152,7 +152,6 @@ type CiCdConfig struct {
 	AzureBlobContainerCiCache                  string                       `env:"AZURE_BLOB_CONTAINER_CI_CACHE" description:"Cache bucket name for azure blob storage"`
 	AzureAccountKey                            string                       `env:"AZURE_ACCOUNT_KEY" description:"If blob storage is being used of azure then pass the secret key to access the bucket"`
 	BuildLogTTLValue                           int                          `env:"BUILD_LOG_TTL_VALUE_IN_SECS" envDefault:"3600" description:"This is the time that the pods of ci/pre-cd/post-cd live after completion state."`
-	PodGCDeleteDelayDuration                   string                       `env:"POD_GC_DELETE_DELAY_DURATION" envDefault:"150s" description:"This is the time that pods will be delayed for deletion on workflow completion"`
 	BaseLogLocationPath                        string                       `env:"BASE_LOG_LOCATION_PATH" envDefault:"/home/devtron/" description:"Used to store, download logs of ci workflow, artifact"`
 	InAppLoggingEnabled                        bool                         `env:"IN_APP_LOGGING_ENABLED" envDefault:"false" description:"Used in case of argo workflow is enabled. If enabled logs push will be managed by us, else will be managed by argo workflow."`
 	BuildxProvenanceMode                       string                       `env:"BUILDX_PROVENANCE_MODE" envDefault:"" description:"provinance is set to true by default by docker. this will add some build related data in generated build manifest.it also adds some unknown:unknown key:value pair which may not be compatible by some container registries. with buildx k8s driver , provinenance=true is causing issue when push manifest to quay registry, so setting it to false"` // provenance is set to false if this flag is not set

pkg/pipeline/types/Workflow.go

@@ -199,7 +199,6 @@ func (workflowRequest *WorkflowRequest) GetWorkflowTemplate(workflowJson []byte,
 		workflowTemplate.WorkflowRunnerId = workflowRequest.WorkflowRunnerId
 		workflowTemplate.PrePostDeploySteps = workflowRequest.PrePostDeploySteps
 	}
-	workflowTemplate.PodGCDeleteDelayDuration = config.PodGCDeleteDelayDuration
 	return workflowTemplate
 }