feat: Run jobs using system executor

internal/sql/repository/pipelineConfig/CiWorkflowRepository.go

@@ -53,27 +53,28 @@ type CiWorkflowRepositoryImpl struct {
 }
 
 type CiWorkflow struct {
-	tableName              struct{}          `sql:"ci_workflow" pg:",discard_unknown_columns"`
-	Id                     int               `sql:"id,pk"`
-	Name                   string            `sql:"name"`
-	Status                 string            `sql:"status"`
-	PodStatus              string            `sql:"pod_status"`
-	Message                string            `sql:"message"`
-	StartedOn              time.Time         `sql:"started_on"`
-	FinishedOn             time.Time         `sql:"finished_on"`
-	CiPipelineId           int               `sql:"ci_pipeline_id"`
-	Namespace              string            `sql:"namespace"`
-	BlobStorageEnabled     bool              `sql:"blob_storage_enabled,notnull"`
-	LogLocation            string            `sql:"log_file_path"`
-	GitTriggers            map[int]GitCommit `sql:"git_triggers"`
-	TriggeredBy            int32             `sql:"triggered_by"`
-	CiArtifactLocation     string            `sql:"ci_artifact_location"`
-	PodName                string            `sql:"pod_name"`
-	CiBuildType            string            `sql:"ci_build_type"`
-	EnvironmentId          int               `sql:"environment_id"`
-	ImagePathReservationId int               `sql:"image_path_reservation_id"`
-	ReferenceCiWorkflowId  int               `sql:"ref_ci_workflow_id"`
-	ParentCiWorkFlowId     int               `sql:"parent_ci_workflow_id"`
+	tableName              struct{}             `sql:"ci_workflow" pg:",discard_unknown_columns"`
+	Id                     int                  `sql:"id,pk"`
+	Name                   string               `sql:"name"`
+	Status                 string               `sql:"status"`
+	PodStatus              string               `sql:"pod_status"`
+	Message                string               `sql:"message"`
+	StartedOn              time.Time            `sql:"started_on"`
+	FinishedOn             time.Time            `sql:"finished_on"`
+	CiPipelineId           int                  `sql:"ci_pipeline_id"`
+	Namespace              string               `sql:"namespace"`
+	BlobStorageEnabled     bool                 `sql:"blob_storage_enabled,notnull"`
+	LogLocation            string               `sql:"log_file_path"`
+	GitTriggers            map[int]GitCommit    `sql:"git_triggers"`
+	TriggeredBy            int32                `sql:"triggered_by"`
+	CiArtifactLocation     string               `sql:"ci_artifact_location"`
+	PodName                string               `sql:"pod_name"`
+	CiBuildType            string               `sql:"ci_build_type"`
+	EnvironmentId          int                  `sql:"environment_id"`
+	ReferenceCiWorkflowId  int                  `sql:"ref_ci_workflow_id"`
+	ParentCiWorkFlowId     int                  `sql:"parent_ci_workflow_id"`
+	ExecutorType           WorkflowExecutorType `sql:"executor_type"` //awf, system
+	ImagePathReservationId int                  `sql:"image_path_reservation_id"`
 	CiPipeline             *CiPipeline
 }
 
@@ -82,31 +83,32 @@ func (r *CiWorkflow) IsExternalRunInJobType() bool {
 }
 
 type WorkflowWithArtifact struct {
-	Id                     int               `json:"id"`
-	Name                   string            `json:"name"`
-	PodName                string            `json:"podName"`
-	Status                 string            `json:"status"`
-	PodStatus              string            `json:"pod_status"`
-	Message                string            `json:"message"`
-	StartedOn              time.Time         `json:"started_on"`
-	FinishedOn             time.Time         `json:"finished_on"`
-	CiPipelineId           int               `json:"ci_pipeline_id"`
-	Namespace              string            `json:"namespace"`
-	LogFilePath            string            `json:"log_file_path"`
-	GitTriggers            map[int]GitCommit `json:"git_triggers"`
-	TriggeredBy            int32             `json:"triggered_by"`
-	EmailId                string            `json:"email_id"`
-	Image                  string            `json:"image"`
-	CiArtifactLocation     string            `json:"ci_artifact_location"`
-	CiArtifactId           int               `json:"ci_artifact_d"`
-	BlobStorageEnabled     bool              `json:"blobStorageEnabled"`
-	CiBuildType            string            `json:"ci_build_type"`
-	IsArtifactUploaded     bool              `json:"is_artifact_uploaded"`
-	EnvironmentId          int               `json:"environmentId"`
-	EnvironmentName        string            `json:"environmentName"`
-	ImagePathReservationId int               `json:"image_path_reservation_id"`
-	RefCiWorkflowId        int               `json:"referenceCiWorkflowId"`
-	ParentCiWorkflowId     int               `json:"parent_ci_workflow_id"`
+	Id                     int                  `json:"id"`
+	Name                   string               `json:"name"`
+	PodName                string               `json:"podName"`
+	Status                 string               `json:"status"`
+	PodStatus              string               `json:"pod_status"`
+	Message                string               `json:"message"`
+	StartedOn              time.Time            `json:"started_on"`
+	FinishedOn             time.Time            `json:"finished_on"`
+	CiPipelineId           int                  `json:"ci_pipeline_id"`
+	Namespace              string               `json:"namespace"`
+	LogFilePath            string               `json:"log_file_path"`
+	GitTriggers            map[int]GitCommit    `json:"git_triggers"`
+	TriggeredBy            int32                `json:"triggered_by"`
+	EmailId                string               `json:"email_id"`
+	Image                  string               `json:"image"`
+	CiArtifactLocation     string               `json:"ci_artifact_location"`
+	CiArtifactId           int                  `json:"ci_artifact_d"`
+	BlobStorageEnabled     bool                 `json:"blobStorageEnabled"`
+	CiBuildType            string               `json:"ci_build_type"`
+	IsArtifactUploaded     bool                 `json:"is_artifact_uploaded"`
+	EnvironmentId          int                  `json:"environmentId"`
+	EnvironmentName        string               `json:"environmentName"`
+	RefCiWorkflowId        int                  `json:"referenceCiWorkflowId"`
+	ParentCiWorkflowId     int                  `json:"parent_ci_workflow_id"`
+	ExecutorType           WorkflowExecutorType `json:"executor_type"` //awf, system
+	ImagePathReservationId int                  `json:"image_path_reservation_id"`
 }
 
 type GitCommit struct {

pkg/cluster/ClusterService.go

@@ -185,7 +185,6 @@ type ClusterService interface {
 	ConvertClusterBeanObjectToCluster(bean *ClusterBean) *v1alpha1.Cluster
 
 	GetClusterConfigByClusterId(clusterId int) (*k8s.ClusterConfig, error)
-	GetClusterConfigByEnvId(envId int) (*k8s.ClusterConfig, error)
 }
 
 type ClusterServiceImpl struct {
@@ -1129,17 +1128,3 @@ func (impl ClusterServiceImpl) GetClusterConfigByClusterId(clusterId int) (*k8s.
 	}
 	return clusterConfig, nil
 }
-
-func (impl ClusterServiceImpl) GetClusterConfigByEnvId(envId int) (*k8s.ClusterConfig, error) {
-	envBean, err := impl.environmentService.FindById(envId)
-	if err != nil {
-		impl.logger.Errorw("error in getting envBean by envId", "err", err, "envId", envId)
-		return nil, err
-	}
-	clusterConfig, err := impl.GetClusterConfigByClusterId(envBean.ClusterId)
-	if err != nil {
-		impl.logger.Errorw("error in getting cluster config by env id", "err", err, "envId", envId)
-		return nil, err
-	}
-	return clusterConfig, nil
-}

pkg/pipeline/CdHandler.go

@@ -696,7 +696,7 @@ func (impl *CdHandlerImpl) UpdateWorkflow(workflowStatus v1alpha1.WorkflowStatus
 	return savedWorkflow.Id, savedWorkflow.Status, nil
 }
 
-func (impl *CdHandlerImpl) extractWorkfowStatus(workflowStatus v1alpha1.WorkflowStatus) *WorkflowStatus {
+func (impl *CdHandlerImpl) extractWorkfowStatus(workflowStatus v1alpha1.WorkflowStatus) *types.WorkflowStatus {
 	workflowName := ""
 	status := string(workflowStatus.Phase)
 	podStatus := "Pending"
@@ -724,7 +724,7 @@ func (impl *CdHandlerImpl) extractWorkfowStatus(workflowStatus v1alpha1.Workflow
 			break
 		}
 	}
-	workflowStatusRes := &WorkflowStatus{
+	workflowStatusRes := &types.WorkflowStatus{
 		WorkflowName: workflowName,
 		Status:       status,
 		PodStatus:    podStatus,
@@ -735,10 +735,6 @@ func (impl *CdHandlerImpl) extractWorkfowStatus(workflowStatus v1alpha1.Workflow
 	return workflowStatusRes
 }
 
-type WorkflowStatus struct {
-	WorkflowName, Status, PodStatus, Message, LogLocation, PodName string
-}
-
 func (impl *CdHandlerImpl) stateChanged(status string, podStatus string, msg string,
 	finishedAt time.Time, savedWorkflow *pipelineConfig.CdWorkflowRunner) bool {
 	return savedWorkflow.Status != status || savedWorkflow.PodStatus != podStatus || savedWorkflow.Message != msg || savedWorkflow.FinishedOn != finishedAt