Skip to content

Commit 6e5e186

Browse files
Merge pull request #6288 from devtron-labs/fix-gitops-save-issue
fix: removing gitops configured check
2 parents 27f2a4e + a545930 commit 6e5e186

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

client/argocdServer/connection/Connection.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,16 +155,11 @@ func (impl *ArgoCDConnectionManagerImpl) getConnectionWithToken(token string) *g
155155
}
156156

157157
func (impl *ArgoCDConnectionManagerImpl) GetLatestDevtronArgoCdUserToken(authConfig *bean.AcdAuthConfig) (string, error) {
158-
gitOpsConfigurationStatus, err := impl.gitOpsConfigReadService.IsGitOpsConfigured()
159-
if err != nil {
160-
impl.logger.Errorw("error while checking if gitOps is configured", "err", err)
161-
return "", err
162-
}
163-
if !gitOpsConfigurationStatus.IsGitOpsConfigured {
164-
//here acd token only required in context for argo cd calls
165-
return "", nil
166-
}
167-
var k8sClient *v1.CoreV1Client
158+
159+
var (
160+
k8sClient *v1.CoreV1Client
161+
err error
162+
)
168163
if authConfig.ClusterId == bean2.DefaultClusterId {
169164
k8sClient, err = impl.k8sUtil.GetCoreV1ClientInCluster()
170165
if err != nil {

0 commit comments

Comments
 (0)