diff --git a/app/assets/javascripts/clusters/agents/index.js b/app/assets/javascripts/clusters/agents/index.js index 8a447f57f00..2070a32426e 100644 --- a/app/assets/javascripts/clusters/agents/index.js +++ b/app/assets/javascripts/clusters/agents/index.js @@ -18,6 +18,7 @@ export default () => { emptyStateSvgPath, projectPath, kasAddress, + kasVersion, canAdminCluster, } = el.dataset; @@ -32,6 +33,7 @@ export default () => { emptyStateSvgPath, projectPath, kasAddress, + kasVersion, canAdminCluster: parseBoolean(canAdminCluster), }, render(createElement) { 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); }, }, }; diff --git a/app/helpers/projects/cluster_agents_helper.rb b/app/helpers/projects/cluster_agents_helper.rb index c17cb787c9f..f62f5eadfb4 100644 --- a/app/helpers/projects/cluster_agents_helper.rb +++ b/app/helpers/projects/cluster_agents_helper.rb @@ -9,6 +9,7 @@ module Projects::ClusterAgentsHelper empty_state_svg_path: image_path('illustrations/operations-dashboard_empty.svg'), project_path: project.full_path, kas_address: Gitlab::Kas.external_url, + kas_version: Gitlab::Kas.version_info, can_admin_cluster: can?(current_user, :admin_cluster, project).to_s } end diff --git a/spec/frontend/clusters_list/components/agent_token_spec.js b/spec/frontend/clusters_list/components/agent_token_spec.js index 7f6ec2eb3a2..cdd94d33545 100644 --- a/spec/frontend/clusters_list/components/agent_token_spec.js +++ b/spec/frontend/clusters_list/components/agent_token_spec.js @@ -8,6 +8,7 @@ import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; const kasAddress = 'kas.example.com'; const agentToken = 'agent-token'; +const kasVersion = '15.0.0'; const modalId = INSTALL_AGENT_MODAL_ID; describe('InstallAgentModal', () => { @@ -21,6 +22,7 @@ describe('InstallAgentModal', () => { const createWrapper = () => { const provide = { kasAddress, + kasVersion, }; const propsData = { @@ -59,7 +61,7 @@ describe('InstallAgentModal', () => { it('renders a copy button', () => { expect(findCopyButton().props()).toMatchObject({ title: 'Copy command', - text: generateAgentRegistrationCommand(agentToken, kasAddress), + text: generateAgentRegistrationCommand(agentToken, kasAddress, kasVersion), modalId, }); }); @@ -71,6 +73,7 @@ describe('InstallAgentModal', () => { it('shows code block with agent installation command', () => { expect(findCodeBlock().props('code')).toContain(`--set config.token=${agentToken}`); expect(findCodeBlock().props('code')).toContain(`--set config.kasAddress=${kasAddress}`); + expect(findCodeBlock().props('code')).toContain(`--set image.tag=v${kasVersion}`); }); }); }); diff --git a/spec/helpers/projects/cluster_agents_helper_spec.rb b/spec/helpers/projects/cluster_agents_helper_spec.rb index 6849ec8b5ea..4045a7f6bf7 100644 --- a/spec/helpers/projects/cluster_agents_helper_spec.rb +++ b/spec/helpers/projects/cluster_agents_helper_spec.rb @@ -33,6 +33,7 @@ RSpec.describe Projects::ClusterAgentsHelper do empty_state_svg_path: kind_of(String), can_admin_vulnerability: "true", kas_address: Gitlab::Kas.external_url, + kas_version: Gitlab::Kas.version_info, can_admin_cluster: "false" }) }