Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

4 files changed, 26 insertions, 12 deletions

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/clusters.vue b/app/assets/javascripts/clusters_list/components/clusters.vue
index fb3c8ff66b0..1ea5eff35d4 100644
--- a/app/assets/javascripts/clusters_list/components/clusters.vue
+++ b/app/assets/javascripts/clusters_list/components/clusters.vue
@@ -4,7 +4,7 @@ import {
   GlLink,
   GlLoadingIcon,
   GlPagination,
-  GlDeprecatedSkeletonLoading as GlSkeletonLoading,
+  GlSkeletonLoader,
   GlSprintf,
   GlTableLite,
   GlTooltipDirective,
@@ -25,7 +25,7 @@ export default {
     GlLink,
     GlLoadingIcon,
     GlPagination,
-    GlSkeletonLoading,
+    GlSkeletonLoader,
     GlSprintf,
     GlTableLite,
     NodeErrorHelpText,
@@ -267,7 +267,7 @@ export default {
       <template #cell(node_size)="{ item }">
         <span v-if="item.nodes">{{ item.nodes.length }}</span>
 
-        <gl-skeleton-loading v-else-if="loadingNodes" :lines="1" :class="contentAlignClasses" />
+        <gl-skeleton-loader v-else-if="loadingNodes" :lines="1" :class="contentAlignClasses" />
 
         <node-error-help-text
           v-else-if="item.kubernetes_errors"
@@ -288,7 +288,7 @@ export default {
           </gl-sprintf>
         </span>
 
-        <gl-skeleton-loading v-else-if="loadingNodes" :lines="1" :class="contentAlignClasses" />
+        <gl-skeleton-loader v-else-if="loadingNodes" :lines="1" :class="contentAlignClasses" />
 
         <node-error-help-text
           v-else-if="item.kubernetes_errors"
@@ -309,7 +309,7 @@ export default {
           </gl-sprintf>
         </span>
 
-        <gl-skeleton-loading v-else-if="loadingNodes" :lines="1" :class="contentAlignClasses" />
+        <gl-skeleton-loader v-else-if="loadingNodes" :lines="1" :class="contentAlignClasses" />
 
         <node-error-help-text
           v-else-if="item.kubernetes_errors"
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>