More doc reorg

docs/harbor-doc-reorg/_index.md

@@ -13,18 +13,26 @@ This section describes how to install Harbor and perform the required initial co
   - [Run the Installer Script](install_config/installation/run_installer_script.md)
   - [Troubleshooting Harbor Installation
 ](install_config/installation/troubleshoot_installation.md)
+
+  You can also use Helm to install Harbor on a Kubernetes cluster, to make it highly available. For information about installing Harbor with Helm on a Kubernetes cluster, see the [Harbor High Availability Guide](https://github.com/goharbor/harbor-helm/blob/master/docs/High%20Availability.md) in the https://github.com/goharbor/harbor-helm repository.
 - [Configuring Harbor](install_config/configuration/_index.md)
   - [Reconfigure Harbor and Manage the Harbor Lifecycle](install_config/configuration/reconfigure_manage_lifecycle.md)
   - [Configure HTTPS Access to Harbor](install_config/configuration/configure_https.md)
+  - [Customize the Harbor Token Service](install_config/configuration/customize_token_service.md)
   - [Access Harbor Logs](install_config/configuration/access_logs.md)
 
+
 ## Harbor Administration
 
-This section describes how to use, upgrade, and maintain Harbor after deployment. These day 2 operations are performed by the Harbor Administrator.
+This section describes how to use and maintain Harbor after deployment. These day 2 operations are performed by the Harbor Administrator.
 
-- [](administration/)
-- [](administration/)
-- [](administration/)
+- [Managing Users](administration/managing_users/_index.md)
+  - [Harbor Role Based Access Control (RBAC)](administration/managing_users/configure_rbac.md)
+  - [Configure Harbor User Settings at the Command Line](administration/managing_users/configure_user_settings_cli.md)
+  - [Manage Roles by LDAP Group](administration/managing_users/manage_role_by_ldap_group.md)
+- [Upgrading Harbor](administration/upgrade/_index.md)
+  - [Upgrade Harbor and Migrate Data](administration/upgrade/upgrade_migrate_data.md)
+  - [Roll Back an Upgrade](administration/upgrade/roll_back_upgrade.md)
 
 ## Working with Harbor Projects
 

docs/harbor-doc-reorg/administration/_index.md

@@ -0,0 +1,4 @@
+# Harbor Administration
+
+- [Managing Users](managing_users/_index.md)
+- [Upgrading Harbor](upgrade/_index.md)

docs/harbor-doc-reorg/administration/managing_users/_index.md

@@ -0,0 +1,5 @@
+# Managing Users
+
+- [Harbor Role Based Access Control (RBAC)](configure_rbac.md)
+- [Configure Harbor User Settings at the Command Line](configure_user_settings_cli.md)
+- [Manage Roles by LDAP Group](manage_role_by_ldap_group.md)

docs/harbor-doc-reorg/administration/managing_users/configure_rbac.md

@@ -1,4 +1,4 @@
-# Role Based Access Control (RBAC)  
+# Harbor Role Based Access Control (RBAC)  
 
 ![rbac](../img/rbac.png)
 

docs/harbor-doc-reorg/administration/managing_users/configure_user_settings_cli.md

@@ -1,4 +1,4 @@
-# Config Harbor user settings by command line
+# Configure Harbor User Settings at the Command Line
 
 After release 1.8.0, all user settings are separated from system settings, it can not be configured in config file anymore. Users need to configure it with admin privileges in web console or via HTTP request.
 

docs/harbor-doc-reorg/administration/managing_users/manage_roles_by_ldap_group.md

@@ -1,4 +1,4 @@
-## Introduction
+# Manage Roles by LDAP Group
 
 This guide provides instructions to manage roles by LDAP/AD group. You can import an LDAP/AD group to Harbor and assign project roles to it. All LDAP/AD users in this LDAP/AD group have assigned roles.
 

docs/harbor-doc-reorg/administration/upgrade/_index.md

@@ -0,0 +1,4 @@
+# Upgrading Harbor
+
+- [Upgrade Harbor and Migrate Data](upgrade_migrate_data.md)
+- [Roll Back an Upgrade](roll_back_upgrade.md)

docs/harbor-doc-reorg/administration/upgrade/roll_back_upgrade.md

@@ -0,0 +1,34 @@
+# Roll Back an Upgrade
+
+If, for any reason, you want to roll back to the previous version of Harbor, perform the following steps:
+
+1. Stop and remove the current Harbor service if it is still running.
+
+    ```sh
+    cd harbor
+    docker-compose down
+    ```
+
+2. Remove current Harbor instance.
+
+    ```sh
+    rm -rf harbor
+    ```
+
+3. Restore the older version package of Harbor.
+
+    ```sh
+    mv /my_backup_dir/harbor harbor
+    ```
+
+4. Restore database, copy the data files from backup directory to you data volume, by default `/data/database`.
+
+5. Restart Harbor service using the previous configuration.  
+   If previous version of Harbor was installed by a release build:
+
+    ```sh
+    cd harbor
+    ./install.sh
+    ```
+
+**NOTE**: While you can roll back an upgrade to the state before you started the upgrade, Harbor does not support downgrades.

docs/harbor-doc-reorg/administration/upgrade/upgrade_migrate_data.md

@@ -1,4 +1,4 @@
-# Harbor Upgrade and Migration Guide
+# Upgrade Harbor and Migrate Data
 
 This guide covers upgrade and migration to version 1.9.0. This guide only covers migration from v1.7.x and later to the current version. If you are upgrading from an earlier version, refer to the migration guide in the `release-1.7.0` branch to upgrade to v1.7.x first, then follow this guide to perform the migration to this version.
 
@@ -14,7 +14,7 @@ Since the migration might alter the database schema and the settings of `harbor.
 - With the introduction of storage and artifact quotas in version 1.9.0, migration from 1.7.x and 1.8.x might take a few minutes. This is because the `core` walks through all blobs in the registry and populates the database with information about the layers and artifacts in projects.
 - With the introduction of storage and artifact quotas in version 1.9.0, replication between version 1.9.0 and a previous version of Harbor does not work. You must upgrade all Harbor nodes to 1.9.0 if you have configured replication between them.
 
-## Upgrading Harbor and Migrating Data
+## Procedure
 
 1. Log in to the host that Harbor runs on, stop and remove existing Harbor instance if it is still running:
 
@@ -62,38 +62,3 @@ Since the migration might alter the database schema and the settings of `harbor.
     **NOTE:** The schema upgrade and data migration of the database is performed by core when Harbor starts, if the migration fails, please check the log of core to debug.
 
 6. Under the directory `./harbor`, run the `./install.sh` script to install the new Harbor instance. If you choose to install Harbor with components such as Notary, Clair, and chartmuseum, refer to [Installation & Configuration Guide](../docs/installation_guide.md) for more information.
-
-## Roll Back from an Upgrade
-
-If, for any reason, you want to roll back to the previous version of Harbor, perform the following steps:
-
-1. Stop and remove the current Harbor service if it is still running.
-
-    ```sh
-    cd harbor
-    docker-compose down
-    ```
-
-2. Remove current Harbor instance.
-
-    ```sh
-    rm -rf harbor
-    ```
-
-3. Restore the older version package of Harbor.
-
-    ```sh
-    mv /my_backup_dir/harbor harbor
-    ```
-
-4. Restore database, copy the data files from backup directory to you data volume, by default `/data/database`.
-
-5. Restart Harbor service using the previous configuration.  
-   If previous version of Harbor was installed by a release build:
-
-    ```sh
-    cd harbor
-    ./install.sh
-    ```
-
-**NOTE**: While you can roll back an upgrade to the state before you started the upgrade, Harbor does not support downgrades.

docs/harbor-doc-reorg/img/bell-outline-badged.svg

@@ -0,0 +1,5 @@
+<svg version="1.1" width="36" height="36"  viewBox="0 0 36 36" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>bell-outline-badged</title>
+    <path class="clr-i-outline--badged clr-i-outline-path-1--badged" d="M18,34.28A2.67,2.67,0,0,0,20.58,32H15.32A2.67,2.67,0,0,0,18,34.28Z"></path><path class="clr-i-outline--badged clr-i-outline-path-2--badged" d="M32.51,27.83A14.4,14.4,0,0,1,30,24.9a12.63,12.63,0,0,1-1.35-4.81V15.15a10.92,10.92,0,0,0-.16-1.79,7.44,7.44,0,0,1-2.24-.84,8.89,8.89,0,0,1,.4,2.64v4.94a14.24,14.24,0,0,0,1.65,5.85,16.17,16.17,0,0,0,2.44,3H5.13a16.17,16.17,0,0,0,2.44-3,14.24,14.24,0,0,0,1.65-5.85V15.15A8.8,8.8,0,0,1,18,6.31a8.61,8.61,0,0,1,4.76,1.44A7.49,7.49,0,0,1,22.5,6c0-.21,0-.42,0-.63a10.58,10.58,0,0,0-3.32-1V3.11a1.33,1.33,0,1,0-2.67,0V4.42A10.81,10.81,0,0,0,7.21,15.15v4.94A12.63,12.63,0,0,1,5.86,24.9a14.4,14.4,0,0,1-2.47,2.93,1,1,0,0,0-.34.75v1.36a1,1,0,0,0,1,1h27.8a1,1,0,0,0,1-1V28.58A1,1,0,0,0,32.51,27.83Z"></path><circle class="clr-i-outline--badged clr-i-outline-path-1--badged clr-i-badge" cx="30" cy="6" r="5"></circle>
+    <rect x="0" y="0" width="36" height="36" fill-opacity="0"/>
+</svg>