diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-15 23:53:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-15 23:53:27 +0300 |
commit | 601cd5b4c0395abadeda5cfaf3b269b12662f743 (patch) | |
tree | e2e4a53982150ffca0baa7f8f749f1689acc1b71 /app/assets/javascripts/clusters_list | |
parent | 7fc80ce5a5d21d2ba452eefabb02a2c8f7eb86ea (diff) |
Add latest changes from gitlab-org/gitlab@15-0-stable-ee
Diffstat (limited to 'app/assets/javascripts/clusters_list')
-rw-r--r-- | app/assets/javascripts/clusters_list/clusters_util.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/clusters_list/components/agent_token.vue | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/clusters_list/clusters_util.js b/app/assets/javascripts/clusters_list/clusters_util.js index e7ad2f45c75..9eb01f593f5 100644 --- a/app/assets/javascripts/clusters_list/clusters_util.js +++ b/app/assets/javascripts/clusters_list/clusters_util.js @@ -1,9 +1,10 @@ -export function generateAgentRegistrationCommand(agentToken, kasAddress) { +export function generateAgentRegistrationCommand(agentToken, kasAddress, kasVersion) { return `helm repo add gitlab https://charts.gitlab.io helm repo update helm upgrade --install gitlab-agent gitlab/gitlab-agent \\ --namespace gitlab-agent \\ --create-namespace \\ + --set image.tag=v${kasVersion} \\ --set config.token=${agentToken} \\ --set config.kasAddress=${kasAddress}`; } diff --git a/app/assets/javascripts/clusters_list/components/agent_token.vue b/app/assets/javascripts/clusters_list/components/agent_token.vue index 751ad9795dd..1597fcb9914 100644 --- a/app/assets/javascripts/clusters_list/components/agent_token.vue +++ b/app/assets/javascripts/clusters_list/components/agent_token.vue @@ -19,7 +19,7 @@ export default { GlSprintf, ModalCopyButton, }, - inject: ['kasAddress'], + inject: ['kasAddress', 'kasVersion'], props: { agentToken: { required: true, @@ -32,7 +32,7 @@ export default { }, computed: { agentRegistrationCommand() { - return generateAgentRegistrationCommand(this.agentToken, this.kasAddress); + return generateAgentRegistrationCommand(this.agentToken, this.kasAddress, this.kasVersion); }, }, }; |