add 1.1.0.1 support

update 1.1.x

update 1.1.x

Makefile

@@ -282,17 +282,21 @@ package_online: modify_composefile
 	fi
 	@cp LICENSE $(HARBORPKG)/LICENSE
 	@cp NOTICE $(HARBORPKG)/NOTICE
+	@cp tools/migration/migration_cfg/upgrade $(HARBORPKG)/upgrade
+	@cp tools/migration/migration_cfg/harbor_1_1_0_template $(HARBORPKG)/harbor_1_1_0_template
 
 	@if [ "$(NOTARYFLAG)" = "true" ] ; then \
 		$(TARCMD) -zcvf harbor-online-installer-$(GITTAGVERSION).tgz \
 		          $(HARBORPKG)/common/templates $(HARBORPKG)/prepare \
 				  $(HARBORPKG)/LICENSE $(HARBORPKG)/NOTICE \
+				  $(HARBORPKG)/upgrade $(HARBORPKG)/harbor_1_1_0_template \
 				  $(HARBORPKG)/install.sh $(HARBORPKG)/$(DOCKERCOMPOSEFILENAME) \
 				  $(HARBORPKG)/harbor.cfg $(HARBORPKG)/$(DOCKERCOMPOSENOTARYFILENAME); \
 	else \
 		$(TARCMD) -zcvf harbor-online-installer-$(GITTAGVERSION).tgz \
 		          $(HARBORPKG)/common/templates $(HARBORPKG)/prepare \
 				  $(HARBORPKG)/LICENSE $(HARBORPKG)/NOTICE \
+				  $(HARBORPKG)/upgrade $(HARBORPKG)/harbor_1_1_0_template \
 				  $(HARBORPKG)/install.sh $(HARBORPKG)/$(DOCKERCOMPOSEFILENAME) \
 				  $(HARBORPKG)/harbor.cfg ; \
 	fi
@@ -306,6 +310,8 @@ package_offline: compile build modify_sourcefiles modify_composefile
 	
 	@cp LICENSE $(HARBORPKG)/LICENSE
 	@cp NOTICE $(HARBORPKG)/NOTICE
+	@cp tools/migration/migration_cfg/upgrade $(HARBORPKG)/upgrade
+	@cp tools/migration/migration_cfg/harbor_1_1_0_template $(HARBORPKG)/harbor_1_1_0_template
 			
 	@echo "pulling nginx and registry..."
 	@$(DOCKERPULL) vmware/registry:$(REGISTRYVERSION)
@@ -342,12 +348,14 @@ package_offline: compile build modify_sourcefiles modify_composefile
 		          $(HARBORPKG)/common/templates $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tar.gz \
 				  $(HARBORPKG)/prepare $(HARBORPKG)/NOTICE \
 				  $(HARBORPKG)/LICENSE $(HARBORPKG)/install.sh \
+				  $(HARBORPKG)/upgrade $(HARBORPKG)/harbor_1_1_0_template \
 				  $(HARBORPKG)/harbor.cfg $(HARBORPKG)/$(DOCKERCOMPOSEFILENAME) \
 				  $(HARBORPKG)/$(DOCKERCOMPOSENOTARYFILENAME) ; \
 	else \
 		$(TARCMD) -zcvf harbor-offline-installer-$(GITTAGVERSION).tgz \
 		          $(HARBORPKG)/common/templates $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tar.gz \
 				  $(HARBORPKG)/prepare $(HARBORPKG)/NOTICE \
+				  $(HARBORPKG)/upgrade $(HARBORPKG)/harbor_1_1_0_template \
 				  $(HARBORPKG)/LICENSE $(HARBORPKG)/install.sh \
 				  $(HARBORPKG)/harbor.cfg $(HARBORPKG)/$(DOCKERCOMPOSEFILENAME) ; \
 	fi

docs/migration_guide.md

@@ -44,10 +44,22 @@ When upgrading your existing Habor instance to a newer version, you may need to
     ```
 
 7. Unzip the new Harbor package and change to `./harbor` as the working directory. Configure Harbor by modifying the file `harbor.cfg`,
+
+  - Configure Harbor by modifying the file `harbor.cfg`,
 you may need to refer to the configuration files you've backed up during step 2.
 Refer to [Installation & Configuration Guide ](../docs/installation_guide.md) for more information.
 Since the content and format of `harbor.cfg` may have been changed in the new release, **DO NOT directly copy `harbor.cfg` from previous version of Harbor.**
 
+	**IMPORTANT:** If you are upgrading a Harbor instance with LDAP/AD authentication,
+you must make sure **auth_mode** is set to **ldap_auth** in `harbor.cfg` before launching the new version of Harbor. Otherwise, users may not be able to log in after the upgrade.
+
+  - To assist you in migrating the `harbor.cfg` file from v0.5.0 to v1.1.x, a script is provided and described as below. For other versions of Harbor, you need to manually migrate the file `harbor.cfg`.
+
+    ```
+    cd harbor
+    ./upgrade --source-loc source_harbor_cfg_loc --source-version 0.5.0 --target-loc target_harbor_cfg_loc --target-version 1.1.x
+    ```
+	**NOTE:** After running the script, make sure you go through `harbor.cfg` to verify all the settings are correct. You can make changes to `harbor.cfg` as needed.
 
 8. Under the directory `./harbor`, run the `./install.sh` script to install the new Harbor instance.
 
@@ -97,4 +109,3 @@ For any reason, if you want to roll back to the previous version of Harbor, foll
 - Use `test` command to test mysql connection:
 
     ```docker run --rm -e DB_USR=root -e DB_PWD=xxxx -v /data/database:/var/lib/mysql vmware/harbor-db-migrator test```
-

tools/migration/migration_cfg/upgrade

@@ -18,13 +18,13 @@ if sys.version_info[:3][0] == 3:
 parser = argparse.ArgumentParser()
 parser.add_argument('--source-loc', dest='source_loc', type=str,help="the path of Harbor 0.5.0 configuration file")
 parser.add_argument('--source-version', dest='source_ver', type=str,help="the Harbor instance is to be deployed with notary")
-parser.add_argument('--target-loc', dest='target_loc', type=str,help="the path of Harbor 0.6.0 configuration file")
+parser.add_argument('--target-loc', dest='target_loc', type=str,help="the path of Harbor 1.1.x configuration file")
 parser.add_argument('--target-version', dest='target_ver', type=str, help="the Harbor instance is to be deployed with notary")
 upgrade_args = parser.parse_args()
 
-# NOTE: the script only support to upgrade from 0.5.0.to 0.6.0.
+# NOTE: the script only support to upgrade from 0.5.0.to 1.1.x.
 def validate():
-    if upgrade_args.source_ver == '0.5.0' and upgrade_args.target_ver == '0.6.0':
+    if upgrade_args.source_ver == '0.5.0' and upgrade_args.target_ver == '1.1.x':
         return
     raise Exception("Unable to support upgrade from %s to %s" % (upgrade_args.source_ver, upgrade_args.target_ver))
 
@@ -84,7 +84,7 @@ def render(src, dest, **kw):
 delfile(upgrade_args.target_loc)
 
 base_dir = os.path.dirname(__file__)
-config_template = os.path.join(base_dir, "harbor_0_6_0_template")
+config_template = os.path.join(base_dir, "harbor_1_1_0_template")
 
 render(config_template,
         upgrade_args.target_loc,