diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-07 03:09:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-07 03:09:08 +0300 |
commit | 83cd5db43517cfd977b0d288b179f794677ba1a7 (patch) | |
tree | 102dc755ceddb8aebd4cbc81cd4720ef6da90314 /app/assets | |
parent | 1f563de51470eaf2aa44e71046398127c00bcfe3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
4 files changed, 27 insertions, 8 deletions
diff --git a/app/assets/javascripts/clusters/agents/components/create_token_button.vue b/app/assets/javascripts/clusters/agents/components/create_token_button.vue index 3e1a8994fb8..74155d7819a 100644 --- a/app/assets/javascripts/clusters/agents/components/create_token_button.vue +++ b/app/assets/javascripts/clusters/agents/components/create_token_button.vue @@ -205,7 +205,12 @@ export default { </gl-form-group> </template> - <agent-token v-else :agent-token="agentToken" :modal-id="$options.modalId" /> + <agent-token + v-else + :agent-name="agentName" + :agent-token="agentToken" + :modal-id="$options.modalId" + /> <template #modal-footer> <gl-button diff --git a/app/assets/javascripts/clusters_list/clusters_util.js b/app/assets/javascripts/clusters_list/clusters_util.js index 9eb01f593f5..e2d01723dde 100644 --- a/app/assets/javascripts/clusters_list/clusters_util.js +++ b/app/assets/javascripts/clusters_list/clusters_util.js @@ -1,12 +1,12 @@ -export function generateAgentRegistrationCommand(agentToken, kasAddress, kasVersion) { +export function generateAgentRegistrationCommand({ name, token, version, address }) { return `helm repo add gitlab https://charts.gitlab.io helm repo update -helm upgrade --install gitlab-agent gitlab/gitlab-agent \\ +helm upgrade --install ${name} gitlab/gitlab-agent \\ --namespace gitlab-agent \\ --create-namespace \\ - --set image.tag=v${kasVersion} \\ - --set config.token=${agentToken} \\ - --set config.kasAddress=${kasAddress}`; + --set image.tag=v${version} \\ + --set config.token=${token} \\ + --set config.kasAddress=${address}`; } export function getAgentConfigPath(clusterAgentName) { diff --git a/app/assets/javascripts/clusters_list/components/agent_token.vue b/app/assets/javascripts/clusters_list/components/agent_token.vue index 1597fcb9914..4dd6d84566c 100644 --- a/app/assets/javascripts/clusters_list/components/agent_token.vue +++ b/app/assets/javascripts/clusters_list/components/agent_token.vue @@ -21,6 +21,10 @@ export default { }, inject: ['kasAddress', 'kasVersion'], props: { + agentName: { + required: true, + type: String, + }, agentToken: { required: true, type: String, @@ -32,7 +36,12 @@ export default { }, computed: { agentRegistrationCommand() { - return generateAgentRegistrationCommand(this.agentToken, this.kasAddress, this.kasVersion); + return generateAgentRegistrationCommand({ + name: this.agentName, + token: this.agentToken, + version: this.kasVersion, + address: this.kasAddress, + }); }, }, }; diff --git a/app/assets/javascripts/clusters_list/components/install_agent_modal.vue b/app/assets/javascripts/clusters_list/components/install_agent_modal.vue index 3b39c3aac45..444b9ac2a14 100644 --- a/app/assets/javascripts/clusters_list/components/install_agent_modal.vue +++ b/app/assets/javascripts/clusters_list/components/install_agent_modal.vue @@ -268,7 +268,12 @@ export default { </p> </template> - <agent-token v-else :agent-token="agentToken" :modal-id="$options.modalId" /> + <agent-token + v-else + :agent-name="agentName" + :agent-token="agentToken" + :modal-id="$options.modalId" + /> </template> <template v-else> |