diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 09:06:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-08 09:06:24 +0300 |
commit | 1ef4b65f55f4fc6524a47050b4f6d686beb81d3a (patch) | |
tree | 3efc2710e564b86e5e2420d65457f656454006bb /app/services/clusters | |
parent | 18a102a5b95198b6bc8db2589de6353997a33543 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/clusters')
-rw-r--r-- | app/services/clusters/aws/fetch_credentials_service.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/app/services/clusters/aws/fetch_credentials_service.rb b/app/services/clusters/aws/fetch_credentials_service.rb index e1d04fac976..29442208c62 100644 --- a/app/services/clusters/aws/fetch_credentials_service.rb +++ b/app/services/clusters/aws/fetch_credentials_service.rb @@ -36,20 +36,12 @@ module Clusters ::Aws::Credentials.new(access_key_id, secret_access_key) end - ## - # This setting is not yet configurable or documented as these - # services are not currently used. This will be addressed in - # https://gitlab.com/gitlab-org/gitlab/merge_requests/18307 def access_key_id - Gitlab.config.kubernetes.provisioners.aws.access_key_id + Gitlab::CurrentSettings.eks_access_key_id end - ## - # This setting is not yet configurable or documented as these - # services are not currently used. This will be addressed in - # https://gitlab.com/gitlab-org/gitlab/merge_requests/18307 def secret_access_key - Gitlab.config.kubernetes.provisioners.aws.secret_access_key + Gitlab::CurrentSettings.eks_secret_access_key end def session_name |