From 1839f3a84471bc2cb38fbdead2ea1095dfceb13f Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 21 Aug 2024 09:09:27 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/graphql/descriptions.yml | 15 - GITLAB_KAS_VERSION | 2 +- .../clusters_list/clusters_util.js | 4 +- .../components/details_page/tags_list.vue | 2 +- .../components/details_page/tags_list_row.vue | 14 +- .../components/list_page/cleanup_status.vue | 6 +- .../components/list_page/image_list.vue | 2 +- .../components/list_page/image_list_row.vue | 4 +- .../list_page/project_empty_state.vue | 6 +- .../explorer/pages/list.vue | 2 +- .../components/manifests_empty_state.vue | 4 +- .../components/manifests_list.vue | 4 +- .../components/details/artifacts_list_row.vue | 10 +- .../components/list/harbor_list_row.vue | 4 +- .../components/tags/tags_list_row.vue | 7 +- .../details/components/app.vue | 2 +- .../details/components/package_files.vue | 6 +- .../details/components/package_history.vue | 2 +- .../components/terraform_installation.vue | 4 +- .../list/components/packages_list.vue | 6 +- .../shared/infrastructure_icon_and_name.vue | 2 +- .../shared/package_list_row.vue | 10 +- .../details/additional_metadata.vue | 4 +- .../details/additional_metadata_loader.vue | 6 +- .../components/details/conan_installation.vue | 2 +- .../components/details/dependency_row.vue | 6 +- .../components/details/installation_title.vue | 4 +- .../components/details/maven_installation.vue | 4 +- .../components/details/metadata/composer.vue | 2 +- .../components/details/npm_installation.vue | 2 +- .../components/details/nuget_installation.vue | 2 +- .../components/details/package_files.vue | 10 +- .../components/details/package_history.vue | 2 +- .../details/package_history_loader.vue | 2 +- .../components/details/package_title.vue | 5 +- .../components/details/pypi_installation.vue | 2 +- .../components/details/version_row.vue | 13 +- .../components/list/package_list_row.vue | 11 +- .../components/list/packages_list.vue | 2 +- .../components/list/publish_method.vue | 2 +- .../package_registry/pages/list.vue | 2 +- .../components/dependency_proxy_settings.vue | 2 +- .../packages_forwarding_settings.vue | 2 +- .../group/components/packages_settings.vue | 6 +- .../container_expiration_policy_form.vue | 8 +- .../components/expiration_run_text.vue | 2 +- .../project/components/expiration_toggle.vue | 2 +- .../packages_cleanup_policy_form.vue | 4 +- .../shared/components/package_path.vue | 8 +- .../shared/components/package_tags.vue | 12 +- .../components/packages_list_loader.vue | 4 +- .../shared/components/publish_method.vue | 2 +- .../shared/components/registry_list.vue | 13 +- .../components/notes/system_note.vue | 17 +- .../components/notes/system_note.vue | 16 +- app/assets/stylesheets/pages/issues.scss | 2 +- app/assets/stylesheets/pages/notes.scss | 16 +- .../types/alert_management/alert_type.rb | 2 +- .../types/award_emojis/award_emoji_type.rb | 2 +- app/graphql/types/board_list_type.rb | 2 +- .../base_access_level_type.rb | 2 +- .../branch_rules/branch_protection_type.rb | 4 +- app/graphql/types/ci/job_token_scope_type.rb | 2 +- app/graphql/types/ci/pipeline_type.rb | 22 +- app/graphql/types/ci/runner_status_enum.rb | 2 +- app/graphql/types/ci/runner_type.rb | 6 +- app/graphql/types/ci/runner_web_url_edge.rb | 4 +- app/graphql/types/ci/status_action_type.rb | 2 +- .../types/clusters/agent_token_type.rb | 2 +- app/graphql/types/clusters/agent_type.rb | 2 +- .../types/container_expiration_policy_type.rb | 10 +- .../types/container_repository_tag_type.rb | 2 +- app/workers/all_queues.yml | 2 +- app/workers/authorized_projects_worker.rb | 2 +- db/docs/security_findings.yml | 2 +- ...12040747_remote_deplicated_agent_config.rb | 27 + ...int_to_remote_development_agent_configs.rb | 19 + db/schema_migrations/20240812040747 | 1 + db/schema_migrations/20240812040748 | 1 + db/structure.sql | 4 +- doc/api/graphql/reference/index.md | 72 +-- doc/api/groups.md | 1 + doc/development/contributing/index.md | 7 +- doc/operations/index.md | 7 +- doc/topics/build_your_application.md | 12 +- doc/topics/git/undo.md | 5 - doc/topics/release_your_application.md | 6 +- doc/update/versions/gitlab_17_changes.md | 49 ++ .../secure_your_application.md | 17 +- doc/user/infrastructure/index.md | 4 +- .../reducing_the_repo_size_using_git.md | 5 - package.json | 72 +-- .../components/agent_token_spec.js | 38 +- .../details_page/tags_list_row_spec.js | 2 +- .../terraform_installation_spec.js.snap | 4 +- .../package_list_row_spec.js.snap | 6 +- .../conan_installation_spec.js.snap | 2 +- .../__snapshots__/dependency_row_spec.js.snap | 6 +- .../maven_installation_spec.js.snap | 2 +- .../npm_installation_spec.js.snap | 2 +- .../nuget_installation_spec.js.snap | 2 +- .../pypi_installation_spec.js.snap | 6 +- .../package_list_row_spec.js.snap | 8 +- .../__snapshots__/publish_method_spec.js.snap | 2 +- ...tainer_expiration_policy_form_spec.js.snap | 4 +- .../__snapshots__/publish_method_spec.js.snap | 2 +- .../shared/components/package_tags_spec.js | 2 +- .../components/packages_list_loader_spec.js | 8 +- .../authorized_projects_worker_spec.rb | 2 +- workhorse/go.mod | 4 +- workhorse/go.sum | 8 +- yarn.lock | 470 +++++++++--------- 112 files changed, 687 insertions(+), 591 deletions(-) create mode 100644 db/migrate/20240812040747_remote_deplicated_agent_config.rb create mode 100644 db/migrate/20240812040748_add_unique_constraint_to_remote_development_agent_configs.rb create mode 100644 db/schema_migrations/20240812040747 create mode 100644 db/schema_migrations/20240812040748 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 { />