adding service account in chart sync (#5584)

Author: iamayushm

pkg/chartRepo/ChartRepositoryService.go

@@ -725,7 +725,7 @@ func (impl *ChartRepositoryServiceImpl) TriggerChartSyncManual(chartProviderConf
 
 	defaultClusterConfig := defaultClusterBean.GetClusterConfig()
 
-	manualAppSyncJobByteArr := manualAppSyncJobByteArr(impl.serverEnvConfig.AppSyncImage, impl.serverEnvConfig.AppSyncJobResourcesObj, chartProviderConfig)
+	manualAppSyncJobByteArr := manualAppSyncJobByteArr(impl.serverEnvConfig.AppSyncImage, impl.serverEnvConfig.AppSyncJobResourcesObj, impl.serverEnvConfig.AppSyncServiceAccount, chartProviderConfig)
 	err = impl.K8sUtil.DeleteAndCreateJob(manualAppSyncJobByteArr, impl.aCDAuthConfig.ACDConfigMapNamespace, defaultClusterConfig)
 	if err != nil {
 		impl.logger.Errorw("DeleteAndCreateJob err, TriggerChartSyncManual", "err", err)

pkg/chartRepo/ManualAppSyncYaml.go

@@ -27,20 +27,22 @@ type AppSyncConfig struct {
 	DockerImage            string
 	AppSyncJobResourcesObj string
 	ChartProviderConfig    *ChartProviderConfig
+	AppSyncServiceAccount  string
 }
 
 type ChartProviderConfig struct {
 	ChartProviderId string
 	IsOCIRegistry   bool
 }
 
-func manualAppSyncJobByteArr(dockerImage string, appSyncJobResourcesObj string, chartProviderConfig *ChartProviderConfig) []byte {
+func manualAppSyncJobByteArr(dockerImage string, appSyncJobResourcesObj string, appSyncServiceAccount string, chartProviderConfig *ChartProviderConfig) []byte {
 	cfg, _ := sql.GetConfig()
 	configValues := AppSyncConfig{
 		DbConfig:               sql.Config{Addr: cfg.Addr, Database: cfg.Database, User: cfg.User, Password: cfg.Password},
 		DockerImage:            dockerImage,
 		AppSyncJobResourcesObj: appSyncJobResourcesObj,
 		ChartProviderConfig:    chartProviderConfig,
+		AppSyncServiceAccount:  appSyncServiceAccount,
 	}
 	temp := template.New("manualAppSyncJobByteArr")
 	temp, _ = temp.Parse(`{"apiVersion": "batch/v1",
@@ -52,6 +54,7 @@ func manualAppSyncJobByteArr(dockerImage string, appSyncJobResourcesObj string,
   "spec": {
     "template": {
       "spec": {
+		"serviceAccount": "{{.AppSyncServiceAccount}}",
         "containers": [
           {
             "name": "chart-sync",

pkg/server/config/ServerEnvConfig.go

@@ -36,6 +36,7 @@ type ServerEnvConfig struct {
 	DevtronModulesIdentifierInHelmValues string `env:"DEVTRON_MODULES_IDENTIFIER_IN_HELM_VALUES" envDefault:"installer.modules"`
 	DevtronBomUrl                        string `env:"DEVTRON_BOM_URL" envDefault:"https://raw.githubusercontent.com/devtron-labs/devtron/%s/charts/devtron/devtron-bom.yaml"`
 	AppSyncImage                         string `env:"APP_SYNC_IMAGE" envDefault:"quay.io/devtron/chart-sync:1227622d-132-3775"`
+	AppSyncServiceAccount                string `env:"APP_SYNC_SERVICE_ACCOUNT" envDefault:"chart-sync"`
 	AppSyncJobResourcesObj               string `env:"APP_SYNC_JOB_RESOURCES_OBJ"`
 	ModuleMetaDataApiUrl                 string `env:"MODULE_METADATA_API_URL" envDefault:"https://api.devtron.ai/module?name=%s"`
 }