Skip to content

Commit 322cf1d

Browse files
ashishdevtronashishdevtron
authored
gitops secret configurable (#4622)
1 parent 90c6c1a commit 322cf1d

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

‎pkg/gitops/GitOpsConfigService.go‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func (impl *GitOpsConfigServiceImpl) CreateGitOpsConfig(ctx context.Context, req
231231
if err != nil {
232232
return nil, err
233233
}
234-
secret, err := impl.K8sUtil.GetSecret(impl.aCDAuthConfig.ACDConfigMapNamespace, GitOpsSecretName, client)
234+
secret, err := impl.K8sUtil.GetSecret(impl.aCDAuthConfig.ACDConfigMapNamespace, impl.aCDAuthConfig.GitOpsSecretName, client)
235235
statusError, _ := err.(*errors.StatusError)
236236
if err != nil && statusError.Status().Code != http.StatusNotFound {
237237
impl.logger.Errorw("secret not found", "err", err)
@@ -241,7 +241,7 @@ func (impl *GitOpsConfigServiceImpl) CreateGitOpsConfig(ctx context.Context, req
241241
data["username"] = []byte(request.Username)
242242
data["password"] = []byte(request.Token)
243243
if secret == nil {
244-
secret, err = impl.K8sUtil.CreateSecret(impl.aCDAuthConfig.ACDConfigMapNamespace, data, GitOpsSecretName, "", client, nil, nil)
244+
secret, err = impl.K8sUtil.CreateSecret(impl.aCDAuthConfig.ACDConfigMapNamespace, data, impl.aCDAuthConfig.GitOpsSecretName, "", client, nil, nil)
245245
if err != nil {
246246
impl.logger.Errorw("err on creating secret", "err", err)
247247
return nil, err
@@ -254,7 +254,7 @@ func (impl *GitOpsConfigServiceImpl) CreateGitOpsConfig(ctx context.Context, req
254254
retryCount := 0
255255
for !operationComplete && retryCount < 3 {
256256
retryCount = retryCount + 1
257-
secret, err := impl.K8sUtil.GetSecret(impl.aCDAuthConfig.ACDConfigMapNamespace, GitOpsSecretName, client)
257+
secret, err := impl.K8sUtil.GetSecret(impl.aCDAuthConfig.ACDConfigMapNamespace, impl.aCDAuthConfig.GitOpsSecretName, client)
258258
if err != nil {
259259
impl.logger.Errorw("secret not found", "err", err)
260260
return nil, err
@@ -302,7 +302,8 @@ func (impl *GitOpsConfigServiceImpl) CreateGitOpsConfig(ctx context.Context, req
302302
if err != nil {
303303
return nil, err
304304
}
305-
updatedData := impl.updateData(cm.Data, request, GitOpsSecretName, existingModel.Host)
305+
currentHost := request.Host
306+
updatedData := impl.updateData(cm.Data, request, impl.aCDAuthConfig.GitOpsSecretName, currentHost)
306307
data := cm.Data
307308
if data == nil {
308309
data = make(map[string]string, 0)
@@ -432,7 +433,7 @@ func (impl *GitOpsConfigServiceImpl) UpdateGitOpsConfig(request *bean2.GitOpsCon
432433
return err
433434
}
434435

435-
secret, err := impl.K8sUtil.GetSecret(impl.aCDAuthConfig.ACDConfigMapNamespace, GitOpsSecretName, client)
436+
secret, err := impl.K8sUtil.GetSecret(impl.aCDAuthConfig.ACDConfigMapNamespace, impl.aCDAuthConfig.GitOpsSecretName, client)
436437
statusError, _ := err.(*errors.StatusError)
437438
if err != nil && statusError.Status().Code != http.StatusNotFound {
438439
impl.logger.Errorw("secret not found", "err", err)
@@ -442,7 +443,7 @@ func (impl *GitOpsConfigServiceImpl) UpdateGitOpsConfig(request *bean2.GitOpsCon
442443
data["username"] = []byte(request.Username)
443444
data["password"] = []byte(request.Token)
444445
if secret == nil {
445-
secret, err = impl.K8sUtil.CreateSecret(impl.aCDAuthConfig.ACDConfigMapNamespace, data, GitOpsSecretName, "", client, nil, nil)
446+
secret, err = impl.K8sUtil.CreateSecret(impl.aCDAuthConfig.ACDConfigMapNamespace, data, impl.aCDAuthConfig.GitOpsSecretName, "", client, nil, nil)
446447
if err != nil {
447448
impl.logger.Errorw("err on creating secret", "err", err)
448449
return err
@@ -455,7 +456,7 @@ func (impl *GitOpsConfigServiceImpl) UpdateGitOpsConfig(request *bean2.GitOpsCon
455456
retryCount := 0
456457
for !operationComplete && retryCount < 3 {
457458
retryCount = retryCount + 1
458-
secret, err := impl.K8sUtil.GetSecret(impl.aCDAuthConfig.ACDConfigMapNamespace, GitOpsSecretName, client)
459+
secret, err := impl.K8sUtil.GetSecret(impl.aCDAuthConfig.ACDConfigMapNamespace, impl.aCDAuthConfig.GitOpsSecretName, client)
459460
if err != nil {
460461
impl.logger.Errorw("secret not found", "err", err)
461462
return err
@@ -503,7 +504,8 @@ func (impl *GitOpsConfigServiceImpl) UpdateGitOpsConfig(request *bean2.GitOpsCon
503504
if err != nil {
504505
return err
505506
}
506-
updatedData := impl.updateData(cm.Data, request, GitOpsSecretName, existingModel.Host)
507+
currentHost := request.Host
508+
updatedData := impl.updateData(cm.Data, request, impl.aCDAuthConfig.GitOpsSecretName, currentHost)
507509
data := cm.Data
508510
data["repository.credentials"] = updatedData["repository.credentials"]
509511
cm.Data = data
@@ -605,7 +607,7 @@ func (impl *GitOpsConfigServiceImpl) GetGitOpsConfigByProvider(provider string)
605607
return config, err
606608
}
607609

608-
func (impl *GitOpsConfigServiceImpl) updateData(data map[string]string, request *bean2.GitOpsConfigDto, secretName string, existingHost string) map[string]string {
610+
func (impl *GitOpsConfigServiceImpl) updateData(data map[string]string, request *bean2.GitOpsConfigDto, secretName string, currentHost string) map[string]string {
609611
var newRepositories []*RepositoryCredentialsDto
610612
var existingRepositories []*RepositoryCredentialsDto
611613
repoStr := data["repository.credentials"]
@@ -621,7 +623,7 @@ func (impl *GitOpsConfigServiceImpl) updateData(data map[string]string, request
621623
}
622624

623625
for _, item := range existingRepositories {
624-
if item.Url != existingHost {
626+
if item.Url != currentHost {
625627
newRepositories = append(newRepositories, item)
626628
}
627629
}

‎pkg/util/TokenCache.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ type ACDAuthConfig struct {
6666
ACDPassword string `env:"ACD_PASSWORD" `
6767
ACDConfigMapName string `env:"ACD_CM" envDefault:"argocd-cm"`
6868
ACDConfigMapNamespace string `env:"ACD_NAMESPACE" envDefault:"devtroncd"`
69+
GitOpsSecretName string `env:"GITOPS_SECRET_NAME" envDefault:"devtron-gitops-secret"`
6970
ResourceListForReplicas string `env:"RESOURCE_LIST_FOR_REPLICAS" envDefault:"Deployment,Rollout,StatefulSet,ReplicaSet"`
7071
ResourceListForReplicasBatchSize int `env:"RESOURCE_LIST_FOR_REPLICAS_BATCH_SIZE" envDefault:"5"`
7172
}

‎util/argo/ArgoUserService.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func (impl *ArgoUserServiceImpl) GetOrUpdateArgoCdUserDetail() string {
8787
if err != nil {
8888
impl.logger.Errorw("error in getting k8s client for default cluster", "err", err)
8989
}
90-
devtronSecret, err := getSecret(DEVTRONCD_NAMESPACE, impl.devtronSecretConfig.DevtronSecretName, k8sClient)
90+
devtronSecret, err := getSecret(impl.devtronSecretConfig.DevtronDexSecretNamespace, impl.devtronSecretConfig.DevtronSecretName, k8sClient)
9191
if err != nil {
9292
impl.logger.Errorw("error in getting devtron secret", "err", err)
9393
}
@@ -179,7 +179,7 @@ func (impl *ArgoUserServiceImpl) GetLatestDevtronArgoCdUserToken() (string, erro
179179
impl.logger.Errorw("error in getting k8s client for default cluster", "err", err)
180180
return "", err
181181
}
182-
devtronSecret, err := getSecret(DEVTRONCD_NAMESPACE, impl.devtronSecretConfig.DevtronSecretName, k8sClient)
182+
devtronSecret, err := getSecret(impl.devtronSecretConfig.DevtronDexSecretNamespace, impl.devtronSecretConfig.DevtronSecretName, k8sClient)
183183
if err != nil {
184184
impl.logger.Errorw("error in getting devtron secret", "err", err)
185185
return "", err
@@ -219,7 +219,7 @@ func (impl *ArgoUserServiceImpl) GetLatestDevtronArgoCdUserToken() (string, erro
219219
}
220220

221221
func (impl *ArgoUserServiceImpl) updateArgoCdUserInfoInDevtronSecret(userinfo map[string]string, k8sClient *v1.CoreV1Client) error {
222-
devtronSecret, err := getSecret(DEVTRONCD_NAMESPACE, impl.devtronSecretConfig.DevtronSecretName, k8sClient)
222+
devtronSecret, err := getSecret(impl.devtronSecretConfig.DevtronDexSecretNamespace, impl.devtronSecretConfig.DevtronSecretName, k8sClient)
223223
if err != nil {
224224
impl.logger.Errorw("error in getting devtron secret", "err", err)
225225
return err
@@ -232,7 +232,7 @@ func (impl *ArgoUserServiceImpl) updateArgoCdUserInfoInDevtronSecret(userinfo ma
232232
secretData[key] = []byte(value)
233233
}
234234
devtronSecret.Data = secretData
235-
_, err = updateSecret(DEVTRONCD_NAMESPACE, devtronSecret, k8sClient)
235+
_, err = updateSecret(impl.devtronSecretConfig.DevtronDexSecretNamespace, devtronSecret, k8sClient)
236236
if err != nil {
237237
impl.logger.Errorw("error in updating devtron secret", "err", err)
238238
return err

0 commit comments

Comments
 (0)