diff --git a/.github/workflows/release_v21.yaml b/.github/workflows/release_v21.yaml index b3a16b9..4eddfdd 100644 --- a/.github/workflows/release_v21.yaml +++ b/.github/workflows/release_v21.yaml @@ -479,7 +479,7 @@ jobs: echo "NOTIFICATION_CONTROLLER_IMAGE_DIGEST=${{ needs.release-notification-controller.outputs.image_digest }}" >> ./ghcr.io/flux-system/image_digests echo "FLUX_CLI_IMAGE_DIGEST=${{ needs.release-flux-cli.outputs.image_digest }}" >> ./ghcr.io/flux-system/image_digests - oras push ghcr.io/weaveworks/flux-images-digests:${{ steps.patch.outputs.version }} ./ghcr.io/flux-system/image_digests + oras push -u weave-ghcr-bot -p ${{ secrets.WEAVE_ASSURED_GHCR_BOT_TOKEN }} ghcr.io/weaveworks/flux-images-digests:${{ steps.patch.outputs.version }} ./ghcr.io/flux-system/image_digests - uses: sigstore/cosign-installer@1fc5bd396d372bee37d608f955b336615edf79c8 # v3.2.0 - name: Sign manifests env: @@ -489,7 +489,7 @@ jobs: - name: Tag manifests run: | VERSION=${GITHUB_REF/refs\/tags\//} - oras tag artifact oci://ghcr.io/weaveworks/flux-images-digests:${{ steps.patch.outputs.version }} $VERSION + oras tag -u weave-ghcr-bot -p ${{ secrets.WEAVE_ASSURED_GHCR_BOT_TOKEN }} ghcr.io/weaveworks/flux-images-digests:${{ steps.patch.outputs.version }} $VERSION release-provenance: needs: [release-flux-cli] diff --git a/patches-flux-v21/helm-controller/04-update_api_server.patch b/patches-flux-v21/helm-controller/04-update_api_server.patch index 1c42c87..ab4c580 100644 --- a/patches-flux-v21/helm-controller/04-update_api_server.patch +++ b/patches-flux-v21/helm-controller/04-update_api_server.patch @@ -4,12 +4,12 @@ From: Soule BA --- - go.mod | 16 ++++++++-------- + go.mod | 14 +++++++------- go.sum | 30 +++++++++++++++--------------- - 2 files changed, 23 insertions(+), 23 deletions(-) + 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod -index 4a1325e..884fa28 100644 +index 4a1325e..867ef3d 100644 --- a/go.mod +++ b/go.mod @@ -32,11 +32,11 @@ require ( @@ -32,10 +32,9 @@ index 4a1325e..884fa28 100644 gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect -- google.golang.org/grpc v1.56.3 // indirect -- google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect -+ google.golang.org/grstgpc v1.56.3 // indirect + google.golang.org/grpc v1.56.3 // indirect +- google.golang.org/protobuf v1.30.0 // indirect + google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -112,3 +111,4 @@ index 37d87c3..624b515 100644 k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= +f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= diff --git a/patches-flux-v21/source-controller/03-update_go_storage.patch b/patches-flux-v21/source-controller/03-update_go_storage.patch index 0b8c450..f2b1c5c 100644 --- a/patches-flux-v21/source-controller/03-update_go_storage.patch +++ b/patches-flux-v21/source-controller/03-update_go_storage.patch @@ -7,10 +7,10 @@ From: Soule BA Dockerfile | 4 api/go.mod | 13 - api/go.sum | 34 +- - go.mod | 351 ++++++++++--------- - go.sum | 1115 ++++++++++++++++++++++++++++-------------------------------- + go.mod | 357 ++++++++++--------- + go.sum | 1119 ++++++++++++++++++++++++++++-------------------------------- main.go | 21 + - 6 files changed, 760 insertions(+), 778 deletions(-) + 6 files changed, 762 insertions(+), 786 deletions(-) diff --git a/Dockerfile b/Dockerfile index 58df2fb..59b233f 100644 @@ -143,7 +143,7 @@ index 528c983..1f7ad8e 100644 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= diff --git a/go.mod b/go.mod -index a3fd12b..c762cb9 100644 +index a3fd12b..e4ecc9f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ @@ -154,9 +154,16 @@ index a3fd12b..c762cb9 100644 replace github.com/fluxcd/source-controller/api => ./api -@@ -15,76 +15,76 @@ replace github.com/opencontainers/go-digest => github.com/opencontainers/go-dige - replace github.com/docker/docker => github.com/docker/docker v23.0.6+incompatible +@@ -8,83 +8,77 @@ replace github.com/fluxcd/source-controller/api => ./api + // xref: https://github.com/opencontainers/go-digest/pull/66 + replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be +-// Required to keep oras.land/oras-go happy, as it will otherwise fail with +-// "cannot use remote ... as ".../docker/registry".Service value in argument to c.loginWithTLS" +-// +-// Check again when oras.land/oras-go is updated, which is a dependency of Helm. +-replace github.com/docker/docker => github.com/docker/docker v23.0.6+incompatible +- require ( - cloud.google.com/go/storage v1.32.0 + cloud.google.com/go/storage v1.33.0 @@ -268,7 +275,7 @@ index a3fd12b..c762cb9 100644 github.com/Azure/go-autorest v14.2.0+incompatible // indirect github.com/Azure/go-autorest/autorest v0.11.29 // indirect github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect -@@ -93,87 +93,100 @@ require ( +@@ -93,87 +87,100 @@ require ( github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect @@ -413,7 +420,7 @@ index a3fd12b..c762cb9 100644 github.com/go-chi/chi v4.1.2+incompatible // indirect github.com/go-errors/errors v1.4.2 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect -@@ -182,8 +195,8 @@ require ( +@@ -182,8 +189,8 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-logr/zapr v1.2.4 // indirect github.com/go-openapi/analysis v0.21.4 // indirect @@ -424,7 +431,7 @@ index a3fd12b..c762cb9 100644 github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/loads v0.21.2 // indirect github.com/go-openapi/runtime v0.26.0 // indirect -@@ -194,8 +207,9 @@ require ( +@@ -194,8 +201,9 @@ require ( github.com/go-piv/piv-go v1.11.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect @@ -435,7 +442,7 @@ index a3fd12b..c762cb9 100644 github.com/gofrs/uuid v4.4.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect -@@ -203,58 +217,64 @@ require ( +@@ -203,58 +211,64 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect @@ -518,7 +525,7 @@ index a3fd12b..c762cb9 100644 github.com/miekg/pkcs11 v1.1.1 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/minio/sha256-simd v1.0.1 // indirect -@@ -274,100 +294,115 @@ require ( +@@ -274,100 +288,115 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481 // indirect github.com/oklog/ulid v1.3.1 // indirect @@ -690,7 +697,7 @@ index a3fd12b..c762cb9 100644 retract v0.32.0 // Refers to incorrect ./api version. diff --git a/go.sum b/go.sum -index 9bfd9c6..e31b767 100644 +index 9bfd9c6..1f2f87b 100644 --- a/go.sum +++ b/go.sum @@ -17,27 +17,24 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb @@ -1138,15 +1145,17 @@ index 9bfd9c6..e31b767 100644 -github.com/docker/cli v24.0.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= -github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +-github.com/docker/docker v23.0.6+incompatible h1:aBD4np894vatVX99UTx/GyOUOK4uEcROwA3+bQhEcoU= +-github.com/docker/docker v23.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +-github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= +-github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= +github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= +github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg= +github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= +github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= - github.com/docker/docker v23.0.6+incompatible h1:aBD4np894vatVX99UTx/GyOUOK4uEcROwA3+bQhEcoU= - github.com/docker/docker v23.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= --github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= --github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= ++github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= ++github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8= +github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=