diff --git a/go.mod b/go.mod index 94441b9ed8..4e858f9a37 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/davecgh/go-spew v1.1.1 github.com/deckarep/golang-set v1.8.0 - github.com/devtron-labs/authenticator v0.4.31 + github.com/devtron-labs/authenticator v0.4.32 github.com/devtron-labs/common-lib v0.0.8-0.20231204083642-08f7f57000d9 github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2 github.com/evanphx/json-patch v5.6.0+incompatible diff --git a/go.sum b/go.sum index e2b24a6751..ef1866677b 100644 --- a/go.sum +++ b/go.sum @@ -291,8 +291,8 @@ github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsP github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4 h1:YcpmyvADGYw5LqMnHqSkyIELsHCGF6PkrmM31V8rF7o= github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= -github.com/devtron-labs/authenticator v0.4.31 h1:CEMLek3JnMuH9ULsC6BHNJr+NiyGzBd4lgdSxH2IGnc= -github.com/devtron-labs/authenticator v0.4.31/go.mod h1:ozNfT8WcruiSgnUbyp48WVfc41++W6xYXhKFp67lNTU= +github.com/devtron-labs/authenticator v0.4.32 h1:JAIJ0WqTXWj2nW7b8so9wunNICQn7O1Qpkk8INpatcs= +github.com/devtron-labs/authenticator v0.4.32/go.mod h1:ozNfT8WcruiSgnUbyp48WVfc41++W6xYXhKFp67lNTU= github.com/devtron-labs/common-lib v0.0.8-0.20231204083642-08f7f57000d9 h1:zIYeYpnj2vB6P17xtpbgEsagmgJpSN4kzJMd8UJ/WR0= github.com/devtron-labs/common-lib v0.0.8-0.20231204083642-08f7f57000d9/go.mod h1:x6OdUIo2z9kxXtBfz7fJEfD4s8kiAtEmlApozOf7ECM= github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2 h1:/IEIsJTxDZ3hv8uOoCaqdWCXqcv7nCAgX9AP/v84dUY= diff --git a/vendor/github.com/devtron-labs/authenticator/client/k8sClient.go b/vendor/github.com/devtron-labs/authenticator/client/k8sClient.go index 792c07f36c..11c95d8d31 100644 --- a/vendor/github.com/devtron-labs/authenticator/client/k8sClient.go +++ b/vendor/github.com/devtron-labs/authenticator/client/k8sClient.go @@ -46,7 +46,8 @@ type K8sClient struct { } type RuntimeConfig struct { - LocalDevMode LocalDevMode `env:"RUNTIME_CONFIG_LOCAL_DEV" envDefault:"false"` + LocalDevMode LocalDevMode `env:"RUNTIME_CONFIG_LOCAL_DEV" envDefault:"false"` + DevtronDefaultNamespaceName string `env:"DEVTRON_DEFAULT_NAMESPACE" envDefault:"devtroncd"` } func GetRuntimeConfig() (*RuntimeConfig, error) { @@ -66,7 +67,7 @@ func NewK8sClient(runtimeConfig *RuntimeConfig) (*K8sClient, error) { }, nil } -//TODO use it as generic function across system +// TODO use it as generic function across system func getKubeConfig(devMode LocalDevMode) (*rest.Config, error) { if devMode { usr, err := user.Current() @@ -98,11 +99,11 @@ func (impl *K8sClient) GetArgocdConfig() (secret *v1.Secret, cm *v1.ConfigMap, e if err != nil { return nil, nil, err } - secret, err = clientSet.CoreV1().Secrets(DevtronDefaultNamespaceName).Get(context.Background(), ArgocdSecretName, v12.GetOptions{}) + secret, err = clientSet.CoreV1().Secrets(impl.runtimeConfig.DevtronDefaultNamespaceName).Get(context.Background(), ArgocdSecretName, v12.GetOptions{}) if err != nil { return nil, nil, err } - cm, err = clientSet.CoreV1().ConfigMaps(DevtronDefaultNamespaceName).Get(context.Background(), ArgocdConfigMapName, v12.GetOptions{}) + cm, err = clientSet.CoreV1().ConfigMaps(impl.runtimeConfig.DevtronDefaultNamespaceName).Get(context.Background(), ArgocdConfigMapName, v12.GetOptions{}) if err != nil { return nil, nil, err } @@ -118,7 +119,7 @@ func (impl *K8sClient) GetDevtronConfig() (secret *v1.Secret, err error) { if err != nil { return nil, err } - secret, err = clientSet.CoreV1().Secrets(DevtronDefaultNamespaceName).Get(context.Background(), dexConfig.DevtronSecretName, v12.GetOptions{}) + secret, err = clientSet.CoreV1().Secrets(impl.runtimeConfig.DevtronDefaultNamespaceName).Get(context.Background(), dexConfig.DevtronSecretName, v12.GetOptions{}) if err != nil { return nil, err } @@ -132,16 +133,14 @@ const ( SettingAdminPasswordMtimeKey = "admin.passwordMtime" SettingAdminEnabledKey = "admin.enabled" SettingAdminTokensKey = "admin.tokens" - - SettingServerSignatureKey = "server.secretkey" - SettingURLKey = "url" - DevtronDefaultNamespaceName = "devtroncd" - CallbackEndpoint = "/auth/callback" - SettingDexConfigKey = "dex.config" - DexCallbackEndpoint = "/api/dex/callback" - InitialPasswordLength = 16 - DevtronSecretName = "devtron-secret" - DevtronConfigMapName = "devtron-cm" + SettingServerSignatureKey = "server.secretkey" + SettingURLKey = "url" + CallbackEndpoint = "/auth/callback" + SettingDexConfigKey = "dex.config" + DexCallbackEndpoint = "/api/dex/callback" + InitialPasswordLength = 16 + DevtronSecretName = "devtron-secret" + DevtronConfigMapName = "devtron-cm" ArgocdConfigMapName = "argocd-cm" ArgocdSecretName = "argocd-secret" @@ -272,7 +271,7 @@ func (impl *K8sClient) ConfigUpdateNotify() (chan bool, error) { if err != nil { return nil, err } - informerFactory := kubeinformers.NewSharedInformerFactoryWithOptions(clusterClient, time.Minute, kubeinformers.WithNamespace(DevtronDefaultNamespaceName)) + informerFactory := kubeinformers.NewSharedInformerFactoryWithOptions(clusterClient, time.Minute, kubeinformers.WithNamespace(impl.runtimeConfig.DevtronDefaultNamespaceName)) cmInformenr := informerFactory.Core().V1().ConfigMaps() secretInformer := informerFactory.Core().V1().Secrets() chanConfigUpdate := make(chan bool) diff --git a/vendor/modules.txt b/vendor/modules.txt index 6311dbb7e1..e55fffa2c0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -341,7 +341,7 @@ github.com/davecgh/go-spew/spew # github.com/deckarep/golang-set v1.8.0 ## explicit; go 1.17 github.com/deckarep/golang-set -# github.com/devtron-labs/authenticator v0.4.31 +# github.com/devtron-labs/authenticator v0.4.32 ## explicit; go 1.16 github.com/devtron-labs/authenticator/apiToken github.com/devtron-labs/authenticator/client