diff --git a/doc/user/packages/harbor_container_registry/index.md b/doc/user/packages/harbor_container_registry/index.md
index 62526b1a19b7d91b1ae0634118c1c9a992804afc..d5f32888a7d0819f9020b2b810fdb23618acb84e 100644
--- a/doc/user/packages/harbor_container_registry/index.md
+++ b/doc/user/packages/harbor_container_registry/index.md
@@ -10,6 +10,8 @@ DETAILS:
**Tier:** Free, Premium, Ultimate
**Offering:** GitLab.com, Self-managed, GitLab Dedicated
+> - **Harbor Registry** [moved](https://gitlab.com/gitlab-org/gitlab/-/issues/439494) from the **Operate** menu section to **Deploy** in GitLab 17.0.
+
You can integrate the [Harbor container registry](../../../user/project/integrations/harbor.md) into GitLab and use Harbor as the container registry for your GitLab project to store images.
## View the Harbor registry
@@ -17,7 +19,7 @@ You can integrate the [Harbor container registry](../../../user/project/integrat
You can view the Harbor registry for a project or group.
1. On the left sidebar, select **Search or go to** and find your project or group.
-1. Select **Operate > Harbor Registry**.
+1. Select **Deploy > Harbor Registry**.
You can search, sort, and filter images on this page. You can share a filtered view by copying the URL from your browser.
@@ -34,7 +36,7 @@ To download and run a Harbor image hosted in the GitLab Harbor registry:
1. Copy the link to your container image:
1. On the left sidebar, select **Search or go to** and find your project or group.
- 1. Select **Operate > Harbor Registry** and find the image you want.
+ 1. Select **Deploy > Harbor Registry** and find the image you want.
1. Select the **Copy** icon next to the image name.
1. Use the command to run the container image you want.
@@ -44,7 +46,7 @@ To download and run a Harbor image hosted in the GitLab Harbor registry:
To view the list of tags associated with a specific artifact:
1. On the left sidebar, select **Search or go to** and find your project or group.
-1. Go to **Operate > Harbor Registry**.
+1. Go to **Deploy > Harbor Registry**.
1. Select the image name to view its artifacts.
1. Select the artifact you want.
@@ -62,7 +64,7 @@ To build and push to the Harbor registry:
To view these commands:
1. On the left sidebar, select **Search or go to** and find your project or group.
-1. Select **Operate > Harbor Registry**.
+1. Select **Deploy > Harbor Registry**.
1. Select **CLI Commands**.
## Disable the Harbor registry for a project
@@ -75,4 +77,4 @@ To remove the Harbor registry for a project:
1. Under **Enable integration**, clear the **Active** checkbox.
1. Select **Save changes**.
-The **Operate > Harbor Registry** entry is removed from the sidebar.
+The **Deploy > Harbor Registry** entry is removed from the sidebar.
diff --git a/ee/spec/features/groups/navbar_spec.rb b/ee/spec/features/groups/navbar_spec.rb
index 4aa10fc597da343baabec446b241de97b73001c4..31488ea4a7f02febca094171e8e1d489c518dc9b 100644
--- a/ee/spec/features/groups/navbar_spec.rb
+++ b/ee/spec/features/groups/navbar_spec.rb
@@ -175,7 +175,7 @@
before do
group.update!(harbor_integration: harbor_integration)
- insert_harbor_registry_nav(_('Terraform modules'))
+ insert_harbor_registry_nav
visit group_path(group)
end
diff --git a/ee/spec/features/projects/navbar_spec.rb b/ee/spec/features/projects/navbar_spec.rb
index 1e618455f63c239362b74d10a897a6a58dd7c62a..4a8f93664f0a845997f19e7e9822af01e8e5e0f5 100644
--- a/ee/spec/features/projects/navbar_spec.rb
+++ b/ee/spec/features/projects/navbar_spec.rb
@@ -211,7 +211,7 @@
before do
project.update!(harbor_integration: harbor_integration)
- insert_harbor_registry_nav(_('AWS'))
+ insert_harbor_registry_nav
visit project_path(project)
end
diff --git a/ee/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb b/ee/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb
index 3d9ee7cc0dc0b27336969a007521991f50776427..1f8cba4aff2d50a91a3ef7ac9a73900b8328d62c 100644
--- a/ee/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb
+++ b/ee/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb
@@ -15,6 +15,9 @@
create(:google_cloud_platform_workload_identity_federation_integration, project: project)
end
+ # required by the Harbor Registry item
+ let_it_be(:harbor_integration) { create(:harbor_integration, project: project) }
+
let(:user) { project.first_owner }
let(:context) do
Sidebars::Projects::Context.new(
diff --git a/lib/sidebars/groups/menus/packages_registries_menu.rb b/lib/sidebars/groups/menus/packages_registries_menu.rb
index 5c6816594f4b1382925f0fcb3bfb1b8b6b1450b0..9931fa6a4a6360319544f0c8cb96cc3fe7eb149c 100644
--- a/lib/sidebars/groups/menus/packages_registries_menu.rb
+++ b/lib/sidebars/groups/menus/packages_registries_menu.rb
@@ -78,7 +78,7 @@ def harbor_registry_menu_item
::Sidebars::MenuItem.new(
title: _('Harbor Registry'),
link: group_harbor_repositories_path(context.group),
- super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::OperationsMenu,
+ super_sidebar_parent: ::Sidebars::Groups::SuperSidebarMenus::DeployMenu,
active_routes: { controller: 'groups/harbor/repositories' },
item_id: :harbor_registry
)
diff --git a/lib/sidebars/projects/menus/packages_registries_menu.rb b/lib/sidebars/projects/menus/packages_registries_menu.rb
index 0826349f6d3316014c566ecf0da525663945cbd5..1272fa946970cfed436d2475d9e007842fe4e9a6 100644
--- a/lib/sidebars/projects/menus/packages_registries_menu.rb
+++ b/lib/sidebars/projects/menus/packages_registries_menu.rb
@@ -84,7 +84,7 @@ def harbor_registry_menu_item
::Sidebars::MenuItem.new(
title: _('Harbor Registry'),
link: project_harbor_repositories_path(context.project),
- super_sidebar_parent: Sidebars::Projects::SuperSidebarMenus::OperationsMenu,
+ super_sidebar_parent: Sidebars::Projects::SuperSidebarMenus::DeployMenu,
active_routes: { controller: 'projects/harbor/repositories' },
item_id: :harbor_registry
)
diff --git a/lib/sidebars/projects/super_sidebar_menus/deploy_menu.rb b/lib/sidebars/projects/super_sidebar_menus/deploy_menu.rb
index 6193b96884ca930719d263d059812e7f03893bfd..76ba83c747a9830f62dee3912499a1af95bf8cac 100644
--- a/lib/sidebars/projects/super_sidebar_menus/deploy_menu.rb
+++ b/lib/sidebars/projects/super_sidebar_menus/deploy_menu.rb
@@ -22,6 +22,7 @@ def configure_menu_items
:packages_registry,
:container_registry,
:google_artifact_registry,
+ :harbor_registry,
:model_registry,
:ai_agents
].each { |id| add_item(::Sidebars::NilMenuItem.new(item_id: id)) }
diff --git a/spec/features/groups/navbar_spec.rb b/spec/features/groups/navbar_spec.rb
index b1d7559a6d9923ac5521d64058b8ebceae0b6833..702630b0100532ea622e2028b7ab938fb5c3854a 100644
--- a/spec/features/groups/navbar_spec.rb
+++ b/spec/features/groups/navbar_spec.rb
@@ -84,7 +84,7 @@
before do
group.update!(harbor_integration: harbor_integration)
- insert_harbor_registry_nav(_('Terraform modules'))
+ insert_harbor_registry_nav
visit group_path(group)
end
diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb
index b63c8e72e850458e2ea7be3b446539a8a328f352..386d57044c53dcabe245b100a681959a24f7b2a3 100644
--- a/spec/features/projects/navbar_spec.rb
+++ b/spec/features/projects/navbar_spec.rb
@@ -71,7 +71,7 @@
let_it_be(:harbor_integration) { create(:harbor_integration, project: project) }
before do
- insert_harbor_registry_nav(_('AWS'))
+ insert_harbor_registry_nav
visit project_path(project)
end
diff --git a/spec/lib/sidebars/projects/super_sidebar_menus/deploy_menu_spec.rb b/spec/lib/sidebars/projects/super_sidebar_menus/deploy_menu_spec.rb
index 2bb5a966ebc94d198dcb8a6465c07d5673e87e78..67033a7dd793716803e6cf431505db2a7a159efe 100644
--- a/spec/lib/sidebars/projects/super_sidebar_menus/deploy_menu_spec.rb
+++ b/spec/lib/sidebars/projects/super_sidebar_menus/deploy_menu_spec.rb
@@ -20,6 +20,7 @@
:packages_registry,
:container_registry,
:google_artifact_registry,
+ :harbor_registry,
:model_registry,
:ai_agents
])
diff --git a/spec/support/helpers/navbar_structure_helper.rb b/spec/support/helpers/navbar_structure_helper.rb
index 10ff205c835acf74671eca6a5d2b4c38b5f8f90d..175711b0a8ef3e31c263c3c3a4f6f937dd53b6d7 100644
--- a/spec/support/helpers/navbar_structure_helper.rb
+++ b/spec/support/helpers/navbar_structure_helper.rb
@@ -95,10 +95,10 @@ def insert_infrastructure_registry_nav(within)
)
end
- def insert_harbor_registry_nav(within)
+ def insert_harbor_registry_nav
insert_after_sub_nav_item(
- within,
- within: _('Operate'),
+ _('Package Registry'),
+ within: _('Deploy'),
new_sub_nav_item_name: _('Harbor Registry')
)
end