Bump goharbor/harbor to latest release (#3738)

* Bump goharbor/harbor to latest release * Update patches, checksums and attribution for goharbor/harbor --------- Co-authored-by: Abhay Krishna Arunachalam <arnchlm@amazon.com>
aws · Oct 3, 2024 · fdd9eed · fdd9eed
1 parent a9d5f75
commit fdd9eed
Show file tree

Hide file tree

Showing 10 changed files with 1,769 additions and 74 deletions.
diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml
@@ -119,7 +119,7 @@ projects:
     repos:
       - name: harbor
         versions:
-          - tag: v2.11.0
+          - tag: v2.11.1
             go_version: "1.22"
   - org: helm
     repos:

diff --git a/projects/goharbor/harbor/ATTRIBUTION.txt b/projects/goharbor/harbor/ATTRIBUTION.txt
@@ -101,7 +101,7 @@ https://github.com/go-openapi/swag
 ** github.com/go-openapi/validate; version v0.22.3 --
 https://github.com/go-openapi/validate
 
-** github.com/goharbor/harbor/src; version v2.11.0 --
+** github.com/goharbor/harbor/src; version v2.11.1 --
 https://github.com/goharbor/harbor/src
 
 ** github.com/gomodule/redigo/redis; version v1.8.8 --

diff --git a/projects/goharbor/harbor/CHECKSUMS b/projects/goharbor/harbor/CHECKSUMS
@@ -1,12 +1,10 @@
-1e616cce741e46af4282b9e1f905300424aadae372de1f01c9ff44c75a6019a6  _output/bin/harbor/linux-amd64/harbor-core
-2d4d396fd7c221f1a05514a304f3aebdf0170846eabeab12847e7caaaff769c6  _output/bin/harbor/linux-amd64/harbor-exporter
-10b8a3a2c9aa7dc426f116ebaf8a806e4f4bde1325559fc2f971a3f5bd729172  _output/bin/harbor/linux-amd64/harbor-jobservice
-1ef676338167abcc8639271075dc30db700ce9e98ac83754ccc3c9eef7830b32  _output/bin/harbor/linux-amd64/harbor-migrate
-2e9a0e57aff0539b04ac905aaf12cd0486e8f1c9d5bdb28ed5d532517b4733c0  _output/bin/harbor/linux-amd64/harbor-migrate-patch
-f85fa57d48ec731ade181f79f6bdf8b65adbc61d1646c6b1abac68c49a667725  _output/bin/harbor/linux-amd64/harbor-registryctl
-8a95d4921d020eac446d06b0b5736dfa161b21c798d11556d5a7daa983c7ecc1  _output/bin/harbor/linux-arm64/harbor-core
-87f7c69b0fc0133ae578acdc975d0d4f933c97b35b6dc638c990b43051f04564  _output/bin/harbor/linux-arm64/harbor-exporter
-ec739458425377948bb9d4426be6701ec9facebad94052495077d2cc77deb6a1  _output/bin/harbor/linux-arm64/harbor-jobservice
-4cb05f4e9165249ced0dd9d146aae907a6d2e3a5063297b5650ea891dbebb3de  _output/bin/harbor/linux-arm64/harbor-migrate
-a25fe15ae5db0007a2e34e6527943ec3a432bb358e1b3dbcb8151acb19376211  _output/bin/harbor/linux-arm64/harbor-migrate-patch
-b18732954cf305878a8e6645e86f87ad524d19e6f75bd96cd839b2403785227a  _output/bin/harbor/linux-arm64/harbor-registryctl
+7838ef51ff5a8d607fff9579963380b5a0f9c3753ec07aa66571ca9a3fb9ed03  _output/bin/harbor/linux-amd64/harbor-core
+ac54d0b4862e7df4051f615f547993dd9d734a63aead4053a97867a1467f027a  _output/bin/harbor/linux-amd64/harbor-exporter
+967adb691cf044ad55850d69eb13642e68a7bfa8293085039a576964944e341f  _output/bin/harbor/linux-amd64/harbor-jobservice
+4ead758197ea38a1e723eaf0ae9cdf07d13d93bcf31c57558f494471282e2b16  _output/bin/harbor/linux-amd64/harbor-migrate
+67a16272e0198ca88a2400876c4d021337a4ac1643dc40560b13f197d4542082  _output/bin/harbor/linux-amd64/harbor-registryctl
+053f224f392c16875e0e3f67021689c93f0f954533cb6bd44c957c658b19935f  _output/bin/harbor/linux-arm64/harbor-core
+f784d5dca3a854dbc8c7511cb7b5d03ff7bf919d3f98e5ee3f945392b6af2150  _output/bin/harbor/linux-arm64/harbor-exporter
+75943470df37b428f49979c43fb467c1b6ef2f6c14256aa3d2c6623c9f245c8e  _output/bin/harbor/linux-arm64/harbor-jobservice
+f5e785b582293e477574eb0c8e6d5467ec4cdfd3eccfec465f2510c3297bc6f2  _output/bin/harbor/linux-arm64/harbor-migrate
+829e467b18032af56c40482f0039dbd7522878b03b4a836bb35777524962fc05  _output/bin/harbor/linux-arm64/harbor-registryctl
diff --git a/projects/goharbor/harbor/GIT_TAG b/projects/goharbor/harbor/GIT_TAG
@@ -1 +1 @@
-v2.11.0
+v2.11.1
diff --git a/projects/goharbor/harbor/Help.mk b/projects/goharbor/harbor/Help.mk
@@ -12,17 +12,15 @@ checkout-repo: ## Checkout upstream tag based on value in GIT_TAG file
 patch-repo: ## Patch upstream repo with patches in patches directory
 
 ##@ Binary Targets
-binaries: ## Build all binaries: `harbor-core harbor-jobservice harbor-registryctl harbor-migrate-patch harbor-migrate harbor-exporter` for `linux/amd64 linux/arm64`
+binaries: ## Build all binaries: `harbor-core harbor-jobservice harbor-registryctl harbor-migrate harbor-exporter` for `linux/amd64 linux/arm64`
 _output/bin/harbor/linux-amd64/harbor-core: ## Build `_output/bin/harbor/linux-amd64/harbor-core`
 _output/bin/harbor/linux-amd64/harbor-jobservice: ## Build `_output/bin/harbor/linux-amd64/harbor-jobservice`
 _output/bin/harbor/linux-amd64/harbor-registryctl: ## Build `_output/bin/harbor/linux-amd64/harbor-registryctl`
-_output/bin/harbor/linux-amd64/harbor-migrate-patch: ## Build `_output/bin/harbor/linux-amd64/harbor-migrate-patch`
 _output/bin/harbor/linux-amd64/harbor-migrate: ## Build `_output/bin/harbor/linux-amd64/harbor-migrate`
 _output/bin/harbor/linux-amd64/harbor-exporter: ## Build `_output/bin/harbor/linux-amd64/harbor-exporter`
 _output/bin/harbor/linux-arm64/harbor-core: ## Build `_output/bin/harbor/linux-arm64/harbor-core`
 _output/bin/harbor/linux-arm64/harbor-jobservice: ## Build `_output/bin/harbor/linux-arm64/harbor-jobservice`
 _output/bin/harbor/linux-arm64/harbor-registryctl: ## Build `_output/bin/harbor/linux-arm64/harbor-registryctl`
-_output/bin/harbor/linux-arm64/harbor-migrate-patch: ## Build `_output/bin/harbor/linux-arm64/harbor-migrate-patch`
 _output/bin/harbor/linux-arm64/harbor-migrate: ## Build `_output/bin/harbor/linux-arm64/harbor-migrate`
 _output/bin/harbor/linux-arm64/harbor-exporter: ## Build `_output/bin/harbor/linux-arm64/harbor-exporter`
 
@@ -84,13 +82,11 @@ run-in-docker/harbor/src/eks-anywhere-go-mod-download: ## Run `harbor/src/eks-an
 run-in-docker/_output/bin/harbor/linux-amd64/harbor-core: ## Run `_output/bin/harbor/linux-amd64/harbor-core` in docker builder container
 run-in-docker/_output/bin/harbor/linux-amd64/harbor-jobservice: ## Run `_output/bin/harbor/linux-amd64/harbor-jobservice` in docker builder container
 run-in-docker/_output/bin/harbor/linux-amd64/harbor-registryctl: ## Run `_output/bin/harbor/linux-amd64/harbor-registryctl` in docker builder container
-run-in-docker/_output/bin/harbor/linux-amd64/harbor-migrate-patch: ## Run `_output/bin/harbor/linux-amd64/harbor-migrate-patch` in docker builder container
 run-in-docker/_output/bin/harbor/linux-amd64/harbor-migrate: ## Run `_output/bin/harbor/linux-amd64/harbor-migrate` in docker builder container
 run-in-docker/_output/bin/harbor/linux-amd64/harbor-exporter: ## Run `_output/bin/harbor/linux-amd64/harbor-exporter` in docker builder container
 run-in-docker/_output/bin/harbor/linux-arm64/harbor-core: ## Run `_output/bin/harbor/linux-arm64/harbor-core` in docker builder container
 run-in-docker/_output/bin/harbor/linux-arm64/harbor-jobservice: ## Run `_output/bin/harbor/linux-arm64/harbor-jobservice` in docker builder container
 run-in-docker/_output/bin/harbor/linux-arm64/harbor-registryctl: ## Run `_output/bin/harbor/linux-arm64/harbor-registryctl` in docker builder container
-run-in-docker/_output/bin/harbor/linux-arm64/harbor-migrate-patch: ## Run `_output/bin/harbor/linux-arm64/harbor-migrate-patch` in docker builder container
 run-in-docker/_output/bin/harbor/linux-arm64/harbor-migrate: ## Run `_output/bin/harbor/linux-arm64/harbor-migrate` in docker builder container
 run-in-docker/_output/bin/harbor/linux-arm64/harbor-exporter: ## Run `_output/bin/harbor/linux-arm64/harbor-exporter` in docker builder container
 run-in-docker/_output/attribution/go-license.csv: ## Run `_output/attribution/go-license.csv` in docker builder container

diff --git a/projects/goharbor/harbor/Makefile b/projects/goharbor/harbor/Makefile
@@ -42,8 +42,8 @@ RELEASEVERSION=$(shell cat $(REPO)/VERSION)
 
 IMAGE_NAMES?=harbor-db harbor-portal harbor-core harbor-log harbor-nginx harbor-jobservice harbor-registry harbor-registryctl harbor-redis harbor-exporter harbor-trivy
 
-BINARY_TARGET_FILES=harbor-core harbor-jobservice harbor-registryctl harbor-migrate-patch harbor-migrate harbor-exporter
-SOURCE_PATTERNS=./core ./jobservice ./registryctl ./cmd/migrate-patch ./cmd/standalone-db-migrator ./cmd/exporter
+BINARY_TARGET_FILES=harbor-core harbor-jobservice harbor-registryctl harbor-migrate harbor-exporter
+SOURCE_PATTERNS=./core ./jobservice ./registryctl ./cmd/standalone-db-migrator ./cmd/exporter
 # harbor-core has additional ldflags
 BINARY_TARGET_FILES_BUILD_ALONE=harbor-core
 GO_MOD_PATHS=src src src src src src

diff --git a/projects/goharbor/harbor/README.md b/projects/goharbor/harbor/README.md
@@ -1,5 +1,5 @@
 ## **harbor**
-![Version](https://img.shields.io/badge/version-v2.11.0-blue)
+![Version](https://img.shields.io/badge/version-v2.11.1-blue)
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiU2FkKytjT1M0SXpTa3lmL3BNSFhRbWpyNVBLdVRBOHdqajI0MnB2ZnFSR2k4aVNDQ2hyS1NDTU0wdnNWT2xORVR3aWhsY29ETjBVcVB1ay9GNWpQUmlRPSIsIml2UGFyYW1ldGVyU3BlYyI6IkNJOW1HQmkzUVBzY1pVajgiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
 
 The [harbor project](https://github.com/goharbor/harbor) is an open source trusted cloud native registry project that stores, signs, and scans content. Harbor extends the open source Docker Distribution by adding the functionalities usually required by users such as security, identity and management. Having a registry closer to the build and run environment can improve the image transfer efficiency. Harbor supports replication of images between registries, and also offers advanced security features such as user management, access control and activity auditing.

diff --git a/projects/goharbor/harbor/patches/0001-tailor-cert-installation-script-for-al2.patch b/projects/goharbor/harbor/patches/0001-tailor-cert-installation-script-for-al2.patch
@@ -1,7 +1,7 @@
-From 02e541a810e56a616d4e28ba41dd7ee3b766cb6a Mon Sep 17 00:00:00 2001
+From 34dc3e080a7f59fd3e756998e9f361063963f51e Mon Sep 17 00:00:00 2001
 From: Vincent Ni <kangqini@amazon.com>
 Date: Tue, 28 Feb 2023 10:35:17 -0800
-Subject: [PATCH 1/2] tailor cert installation script for al2
+Subject: [PATCH 1/3] tailor cert installation script for al2
 
 ---
  make/photon/common/install_cert.sh | 8 ++------