diff --git a/.rubocop_todo/graphql/descriptions.yml b/.rubocop_todo/graphql/descriptions.yml index 3faf742edd5..1788d0978a8 100644 --- a/.rubocop_todo/graphql/descriptions.yml +++ b/.rubocop_todo/graphql/descriptions.yml @@ -2,21 +2,6 @@ # Cop supports --autocorrect. Graphql/Descriptions: Exclude: - - 'app/graphql/types/alert_management/alert_type.rb' - - 'app/graphql/types/award_emojis/award_emoji_type.rb' - - 'app/graphql/types/board_list_type.rb' - - 'app/graphql/types/branch_protections/base_access_level_type.rb' - - 'app/graphql/types/branch_rules/branch_protection_type.rb' - - 'app/graphql/types/ci/job_token_scope_type.rb' - - 'app/graphql/types/ci/pipeline_type.rb' - - 'app/graphql/types/ci/runner_status_enum.rb' - - 'app/graphql/types/ci/runner_type.rb' - - 'app/graphql/types/ci/runner_web_url_edge.rb' - - 'app/graphql/types/ci/status_action_type.rb' - - 'app/graphql/types/clusters/agent_token_type.rb' - - 'app/graphql/types/clusters/agent_type.rb' - - 'app/graphql/types/container_expiration_policy_type.rb' - - 'app/graphql/types/container_repository_tag_type.rb' - 'app/graphql/types/container_repository_type.rb' - 'app/graphql/types/deployment_tag_type.rb' - 'app/graphql/types/design_management/design_at_version_type.rb' diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION index 65a154b8d3a..d15596e156a 100644 --- a/GITLAB_KAS_VERSION +++ b/GITLAB_KAS_VERSION @@ -1 +1 @@ -1a16fa05c2645a0abba4e2f028e1fdbe5d85be2f +c29c5ba968d141237000185734baa95e122db80b diff --git a/app/assets/javascripts/clusters_list/clusters_util.js b/app/assets/javascripts/clusters_list/clusters_util.js index 25a8426500e..d91ccad987d 100644 --- a/app/assets/javascripts/clusters_list/clusters_util.js +++ b/app/assets/javascripts/clusters_list/clusters_util.js @@ -5,12 +5,12 @@ function getTruncatedName(name) { } export function generateAgentRegistrationCommand({ name, token, version, address }) { + const versionValue = window.gon.dot_com ? '' : `\n --set image.tag=v${version} \\`; return `helm repo add gitlab https://charts.gitlab.io helm repo update helm upgrade --install ${name} gitlab/gitlab-agent \\ --namespace gitlab-agent-${getTruncatedName(name)} \\ - --create-namespace \\ - --set image.tag=v${version} \\ + --create-namespace \\${versionValue} --set config.token=${token} \\ --set config.kasAddress=${address}`; } diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list.vue index f79f7f6d372..400acba2f2f 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list.vue +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list.vue @@ -277,7 +277,7 @@ export default { -
+
{ @@ -177,11 +177,11 @@ export default { />