Bump harbor version

UPSTREAM_PROJECTS.yaml

@@ -119,8 +119,8 @@ projects:
     repos:
       - name: harbor
         versions:
-          - tag: v2.7.1
-            go_version: "1.19"
+          - tag: v2.9.1
+            go_version: "1.21"
   - org: helm
     repos:
       - name: helm

projects/goharbor/harbor/CHECKSUMS

@@ -1,12 +1,12 @@
-64ed6570ef6d5e62c385389812b63928a7fdd37ee42167f14697f4e3a735688d  _output/bin/harbor/linux-amd64/harbor-core
-ca591e7f713f7dca072e0799363e2e5ba53c2e0fd18e8b8610c3365a8e51072f  _output/bin/harbor/linux-amd64/harbor-exporter
-2daae2a62dc8027f682583ae80fc0f5637b008e775445051d764d3ab7d2fe8e7  _output/bin/harbor/linux-amd64/harbor-jobservice
-e52cb5d8d065b51186bb655cbcf3367fc3d4914db15b775bb189dc130a7556e2  _output/bin/harbor/linux-amd64/harbor-migrate
-f5965e1283a22ef763c7c70d29cd6d78b4fc4d9b01dee19d872249c68e10a005  _output/bin/harbor/linux-amd64/harbor-migrate-patch
-470b6a7929ad5b561848631d5d7349e4ba3f5fc24d94a9d2f5378869eda0f908  _output/bin/harbor/linux-amd64/harbor-registryctl
-636fb466f2b6add0c777263df039cf17c2979a48ef838b9e907aa47601223d33  _output/bin/harbor/linux-arm64/harbor-core
-51e9a429a28916e1dcbc1f8e740d25956d9fbe692a66d5f00d305c1803080ca4  _output/bin/harbor/linux-arm64/harbor-exporter
-2941798a917bd0733909ecc23020a5ee80912235f349990c3645a952739a615c  _output/bin/harbor/linux-arm64/harbor-jobservice
-36d7d1b89143a66d6deb9774de1ae77c3c484f7ef9eb54f2c4c5ab1be1d1740d  _output/bin/harbor/linux-arm64/harbor-migrate
-d7c59732737d9997975a2996d24ba5fa7518bc5c8dbfb59514aeb53ce71c52d7  _output/bin/harbor/linux-arm64/harbor-migrate-patch
-788888eb9ca2dc2dbe9930b6eec91826dbf2b1a270b2d90b126b31f5fdb5f6de  _output/bin/harbor/linux-arm64/harbor-registryctl
+9def1555ec45be76ac0147344ef022e977a6abcf256a8b9bb0ae11a5b9a444d0  _output/bin/harbor/linux-amd64/harbor-core
+3ceef76270065177771ca276ffa28c83b7c1626967a1920e2bee56b6bc5d675c  _output/bin/harbor/linux-amd64/harbor-exporter
+ebcccf742ded1ffe3e1a83b5cbf2963b71c7fa2a97310bbb3a0bbd1f7c8ffd67  _output/bin/harbor/linux-amd64/harbor-jobservice
+7193355d558b8d598dac8d2e624960f6719f3f6881046f26fa0f9834709bb37b  _output/bin/harbor/linux-amd64/harbor-migrate
+acb45fb6dd6086efee8974f4b258a52b57a81bc302ba1df09e7041ba75495ea0  _output/bin/harbor/linux-amd64/harbor-migrate-patch
+dc06aa6fa66efe6800a060d128808f2f031e8b80319b8d32571ef8ab60f3de85  _output/bin/harbor/linux-amd64/harbor-registryctl
+1ae06ea06e1bc17f50d7e8981f68dcb3db3e07fa801675635ab99c56b3667d90  _output/bin/harbor/linux-arm64/harbor-core
+9c6be343f361ab2dead2f8e673b4c15ea2fea2f24b2e2709b9896b70fede418c  _output/bin/harbor/linux-arm64/harbor-exporter
+7bb6110572881bd08e34a00f312378d5dc61378a3184df521fedb1b9a6b38d1d  _output/bin/harbor/linux-arm64/harbor-jobservice
+99e4131f654d5aafe7dc8c656fa86ce554c029fef412abeb31bfc58043e7be87  _output/bin/harbor/linux-arm64/harbor-migrate
+047730d60ae3ca1237c0984482167913f50003f4b471aec7872d8309b648c8ff  _output/bin/harbor/linux-arm64/harbor-migrate-patch
+b173330db50f2872d6c1c57f8695f3a31b3c76af9199d6904be388e5d62a68ca  _output/bin/harbor/linux-arm64/harbor-registryctl

projects/goharbor/harbor/GIT_TAG

@@ -1 +1 @@
-v2.7.1
+v2.9.1

projects/goharbor/harbor/GOLANG_VERSION

@@ -1 +1 @@
-1.19
+1.21

projects/goharbor/harbor/HELM_GIT_TAG

@@ -1 +1 @@
-v1.11.1
+v1.13.1

projects/goharbor/harbor/Makefile

@@ -91,7 +91,7 @@ $(OUTPUT_DIR)/$(REPO): $(GIT_PATCH_TARGET)
 
 	@mkdir -p $(OUTPUT_DIR)/harbor-db/docker-entrypoint-initdb.d
 	@cp harbor/make/photon/db/docker-entrypoint.sh harbor/make/photon/db/initdb.sh harbor/make/photon/db/upgrade.sh harbor/make/photon/db/docker-healthcheck.sh $(OUTPUT_DIR)/harbor-db/
-	@cp harbor/make/photon/db/initial-notaryserver.sql harbor/make/photon/db/initial-notarysigner.sql harbor/make/photon/db/initial-registry.sql $(OUTPUT_DIR)/harbor-db/docker-entrypoint-initdb.d/
+	@cp harbor/make/photon/db/initial-registry.sql $(OUTPUT_DIR)/harbor-db/docker-entrypoint-initdb.d/
 
 	@mkdir -p $(OUTPUT_DIR)/harbor-exporter/harbor
 	@cp harbor/make/photon/exporter/entrypoint.sh harbor/make/photon/common/install_cert.sh $(OUTPUT_DIR)/harbor-exporter/harbor/
@@ -109,9 +109,7 @@ $(OUTPUT_DIR)/$(REPO): $(GIT_PATCH_TARGET)
 
 	@mkdir -p $(OUTPUT_DIR)/harbor-portal/build_dir/dist
 	@cp -r harbor/src/portal/* $(OUTPUT_DIR)/harbor-portal/build_dir/
-	@cp harbor/api/v2.0/legacy_swagger.yaml $(OUTPUT_DIR)/harbor-portal/build_dir/swagger.yaml
-	@cp harbor/api/v2.0/swagger.yaml $(OUTPUT_DIR)/harbor-portal/build_dir/swagger2.yaml
-	@cp harbor/api/swagger.yaml $(OUTPUT_DIR)/harbor-portal/build_dir/swagger3.yaml
+	@cp harbor/api/v2.0/swagger.yaml $(OUTPUT_DIR)/harbor-portal/build_dir/swagger.yaml
 	@cp harbor/LICENSE $(OUTPUT_DIR)/harbor-portal/build_dir/dist/LICENSE
 
 	@mkdir -p $(OUTPUT_DIR)/harbor-redis/etc

projects/goharbor/harbor/docker/linux/harbor-portal/Dockerfile

@@ -1,6 +1,6 @@
 ARG BASE_IMAGE # https://gallery.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-nginx
 
-FROM node:16.10.0 as nodeportal
+FROM public.ecr.aws/docker/library/node:16.18.0 as nodeportal
 
 WORKDIR /build_dir
 
@@ -16,8 +16,6 @@ RUN apt-get update \
     && npm --prefix /build_dir/app-swagger-ui run build \
     && node --max_old_space_size=2048 'node_modules/@angular/cli/bin/ng' build --configuration production \
     && python -c 'import sys, yaml, json; y=yaml.load(sys.stdin.read()); print json.dumps(y)' < swagger.yaml > dist/swagger.json \
-    && python -c 'import sys, yaml, json; y=yaml.load(sys.stdin.read()); print json.dumps(y)' < swagger2.yaml > dist/swagger2.json \
-    && python -c 'import sys, yaml, json; y=yaml.load(sys.stdin.read()); print json.dumps(y)' < swagger3.yaml > dist/swagger3.json \
     && cp swagger.yaml dist \
     && mkdir -p /newroot/var/log/nginx /newroot/usr/share/nginx/html \
     && chmod 755 /newroot/var/log/nginx \
@@ -37,4 +35,4 @@ STOPSIGNAL SIGQUIT
 
 HEALTHCHECK CMD curl --fail -s http://localhost:8080 || curl -k --fail -s https://localhost:8443 || exit 1
 USER nginx
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]