From 601cd5b4c0395abadeda5cfaf3b269b12662f743 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 15 Jun 2022 20:53:27 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-0-stable-ee

---
 app/assets/javascripts/clusters/agents/index.js                 | 2 ++
 app/assets/javascripts/clusters_list/clusters_util.js           | 3 ++-
 app/assets/javascripts/clusters_list/components/agent_token.vue | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'app/assets')

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);
     },
   },
 };
-- 
cgit v1.2.3