From a8c7fcc8fa9bb7b636e95eabfa637c40c29ef7e0 Mon Sep 17 00:00:00 2001 From: Jackson West Date: Mon, 3 Jun 2024 18:54:06 -0500 Subject: [PATCH] harbor no longer needs to skip go mod download (#3239) * harbor no longer needs to skip go mod download harbor vendors its go mods and there used to be a patch that changed files in the vendor directory. setting this flag was necessary to avoid losing the change since go mod download happened after patching. see https://github.com/aws/eks-distro/pull/3008 for more info. I will send another PR adding a similar check to this repo to catch this kind of in the future automatically. * Update CHECKSUMS --- projects/goharbor/harbor/CHECKSUMS | 24 ++++++++++++------------ projects/goharbor/harbor/Makefile | 1 - 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/projects/goharbor/harbor/CHECKSUMS b/projects/goharbor/harbor/CHECKSUMS index f57496488f..983a718e75 100644 --- a/projects/goharbor/harbor/CHECKSUMS +++ b/projects/goharbor/harbor/CHECKSUMS @@ -1,12 +1,12 @@ -c173a5b3a43a1b5521fca49964f88184968f91e6106022b9ed181e2c1e76e9b4 _output/bin/harbor/linux-amd64/harbor-core -8f61b5c98e61ac6d72abf80e995f861dd02b5dfc5d56fe3abff3f9d4804d9a93 _output/bin/harbor/linux-amd64/harbor-exporter -96bfa81c751e700b86fd96f03cf85454017b68a8dbe8521e2043db71776b438c _output/bin/harbor/linux-amd64/harbor-jobservice -ebbad5899dc144b09c740d3a41f871fc464637161ae96e76a302d72dbfbd17a9 _output/bin/harbor/linux-amd64/harbor-migrate -8c0c1c294d1402b46ed1e466fd78b2ac953753e4a68f9e214edcc566dd027975 _output/bin/harbor/linux-amd64/harbor-migrate-patch -feb8f1f9173883f87f3305f7a161fd32258c35c1e55c349781f80ebe600a8cd9 _output/bin/harbor/linux-amd64/harbor-registryctl -7ae76d9cbf57da5992cc89ea0f310c565e1d2ffda11ab1413d4575a913951fb2 _output/bin/harbor/linux-arm64/harbor-core -193a3b453cae279abe99bb6719612a8ec548b7cae9d2ccac27bd0b1dd15fa6c9 _output/bin/harbor/linux-arm64/harbor-exporter -3fe88f06907f4bd9e1857df7b219bcd0c34351adfdf37630f122e6c05ab0e45f _output/bin/harbor/linux-arm64/harbor-jobservice -94d59a523a40a9c72405e9724495805022c9752392574fbdc03a013f9b62d74b _output/bin/harbor/linux-arm64/harbor-migrate -fbc9ec44f7d78a3f4f486e58ccb8fbba99339ce2aea307297ea7699254bab93b _output/bin/harbor/linux-arm64/harbor-migrate-patch -7288e3e5237410bd83646f984d20c3d7529ba3e6a8b7f3144b83189b397bc532 _output/bin/harbor/linux-arm64/harbor-registryctl +8379877b991e13a39fb51f86c53acb3b53422ebe84c5b3233e04eb5c20e28149 _output/bin/harbor/linux-amd64/harbor-core +a756b2333579a5ae719d21254374db28fdea79bc2938079208233002c4284308 _output/bin/harbor/linux-amd64/harbor-exporter +aef261e345276e4364af8e6df472e4bf4850e27ff21fb91258818eb870869a4e _output/bin/harbor/linux-amd64/harbor-jobservice +5a8f0ad2bc3f91166d2c890397ae273851d0261050657e3becff0730581dc494 _output/bin/harbor/linux-amd64/harbor-migrate +6fd8ee5d593e872cbb269a30f0cb599105bd2edc689fb21646ce039f22cf8f5b _output/bin/harbor/linux-amd64/harbor-migrate-patch +dce48e06c59dc6026c5135a3ee68753e1db76831c56a4cf2dcc4c48b51a463cb _output/bin/harbor/linux-amd64/harbor-registryctl +50892d9792f222b126dcdfc331a8bf9f186d9c7ae83bf96e884ed603dbd86891 _output/bin/harbor/linux-arm64/harbor-core +1f53ba9e92441273b0f89a5e995a5bf8781455585754fe597877aa62fe29ac8f _output/bin/harbor/linux-arm64/harbor-exporter +bad8059f6f7fd49202216126d83a68863110e42badb4b79037f0d6afcc9cfcf6 _output/bin/harbor/linux-arm64/harbor-jobservice +1fb7b372b087a3692de13c79b37e4674821c94259c07f0583d4d8439d7b864aa _output/bin/harbor/linux-arm64/harbor-migrate +92cef27abc0437a3763f1f152b70e5cbf308c9f3a653dbab6a526a12463479e0 _output/bin/harbor/linux-arm64/harbor-migrate-patch +6f55ece5925624202f85502eae0324dcce38fb3286f3a96dd067fb358b9777aa _output/bin/harbor/linux-arm64/harbor-registryctl diff --git a/projects/goharbor/harbor/Makefile b/projects/goharbor/harbor/Makefile index 6901642a1f..a164438c21 100644 --- a/projects/goharbor/harbor/Makefile +++ b/projects/goharbor/harbor/Makefile @@ -47,7 +47,6 @@ SOURCE_PATTERNS=./core ./jobservice ./registryctl ./cmd/migrate-patch ./cmd/stan # harbor-core has additional ldflags BINARY_TARGET_FILES_BUILD_ALONE=harbor-core GO_MOD_PATHS=src src src src src src -GO_MODS_VENDORED=true TRIVY_VERSION=$(TRIVYVERSION) IMAGE_BUILD_ARGS=TRIVY_VERSION