Add latest changes from gitlab-org/gitlab@15-0-stable-ee

6 files changed, 11 insertions, 5 deletions

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/app/models/pool_repository.rb b/app/models/pool_repository.rb
index 78cddaa1302..3461104ae35 100644
--- a/app/models/pool_repository.rb
+++ b/app/models/pool_repository.rb
@@ -81,7 +81,9 @@ class PoolRepository < ApplicationRecord
     object_pool.link(repository.raw)
   end
 
-  def mark_obsolete_if_last(repository)
+  def unlink_repository(repository)
+    repository.disconnect_alternates
+
     if member_projects.where.not(id: repository.project.id).exists?
       true
     else
diff --git a/app/models/project.rb b/app/models/project.rb
index f4e39524e47..b66ec28b659 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2561,7 +2561,7 @@ class Project < ApplicationRecord
   end
 
   def leave_pool_repository
-    pool_repository&.mark_obsolete_if_last(repository) && update_column(:pool_repository_id, nil)
+    pool_repository&.unlink_repository(repository) && update_column(:pool_repository_id, nil)
   end
 
   def link_pool_repository