From b8e04cfe3b6a8685f2007c6a0057373279af1825 Mon Sep 17 00:00:00 2001 From: Frikky Date: Fri, 4 Apr 2025 00:21:03 +0200 Subject: [PATCH 1/5] Gomod bump to ensure multi tenant workflows are working as expected --- backend/go-app/go.mod | 2 +- backend/go-app/go.sum | 4 ++-- functions/onprem/orborus/go.mod | 2 +- functions/onprem/orborus/go.sum | 4 ++-- functions/onprem/worker/go.mod | 2 +- functions/onprem/worker/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod index 3db9ac92..9de907b9 100644 --- a/backend/go-app/go.mod +++ b/backend/go-app/go.mod @@ -20,7 +20,7 @@ require ( github.com/gorilla/mux v1.8.1 github.com/h2non/filetype v1.1.3 github.com/satori/go.uuid v1.2.0 - github.com/shuffle/shuffle-shared v0.8.35 + github.com/shuffle/shuffle-shared v0.8.36 golang.org/x/crypto v0.36.0 google.golang.org/api v0.176.1 google.golang.org/grpc v1.68.1 diff --git a/backend/go-app/go.sum b/backend/go-app/go.sum index 5d37f78b..816b3870 100644 --- a/backend/go-app/go.sum +++ b/backend/go-app/go.sum @@ -333,8 +333,8 @@ github.com/sendgrid/sendgrid-go v3.14.0+incompatible h1:KDSasSTktAqMJCYClHVE94Fc github.com/sendgrid/sendgrid-go v3.14.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= -github.com/shuffle/shuffle-shared v0.8.35 h1:3awc0TrsLLZiQeWD2XGIkTnFbczAG0cMfy1+cB/P7zg= -github.com/shuffle/shuffle-shared v0.8.35/go.mod h1:NruHSAscDsW595wpK2r7MeHPGspUEKRNvBpcN1iGbHI= +github.com/shuffle/shuffle-shared v0.8.36 h1:6ij/UdozOPe5SJnbVViFkWO/u6MrEerWGyuOo+xiZ0c= +github.com/shuffle/shuffle-shared v0.8.36/go.mod h1:NruHSAscDsW595wpK2r7MeHPGspUEKRNvBpcN1iGbHI= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= diff --git a/functions/onprem/orborus/go.mod b/functions/onprem/orborus/go.mod index cd796147..de971a67 100644 --- a/functions/onprem/orborus/go.mod +++ b/functions/onprem/orborus/go.mod @@ -10,7 +10,7 @@ require ( github.com/docker/docker v27.5.0+incompatible github.com/docker/go-connections v0.5.0 github.com/satori/go.uuid v1.2.0 - github.com/shuffle/shuffle-shared v0.8.35 + github.com/shuffle/shuffle-shared v0.8.36 k8s.io/api v0.30.2 k8s.io/apimachinery v0.30.2 ) diff --git a/functions/onprem/orborus/go.sum b/functions/onprem/orborus/go.sum index cbbfad08..b23868bc 100644 --- a/functions/onprem/orborus/go.sum +++ b/functions/onprem/orborus/go.sum @@ -301,8 +301,8 @@ github.com/sendgrid/sendgrid-go v3.14.0+incompatible h1:KDSasSTktAqMJCYClHVE94Fc github.com/sendgrid/sendgrid-go v3.14.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= -github.com/shuffle/shuffle-shared v0.8.35 h1:3awc0TrsLLZiQeWD2XGIkTnFbczAG0cMfy1+cB/P7zg= -github.com/shuffle/shuffle-shared v0.8.35/go.mod h1:NruHSAscDsW595wpK2r7MeHPGspUEKRNvBpcN1iGbHI= +github.com/shuffle/shuffle-shared v0.8.36 h1:6ij/UdozOPe5SJnbVViFkWO/u6MrEerWGyuOo+xiZ0c= +github.com/shuffle/shuffle-shared v0.8.36/go.mod h1:NruHSAscDsW595wpK2r7MeHPGspUEKRNvBpcN1iGbHI= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= diff --git a/functions/onprem/worker/go.mod b/functions/onprem/worker/go.mod index 83de43e0..ba3f027c 100644 --- a/functions/onprem/worker/go.mod +++ b/functions/onprem/worker/go.mod @@ -8,7 +8,7 @@ require ( github.com/docker/docker v27.5.0+incompatible github.com/gorilla/mux v1.8.1 github.com/satori/go.uuid v1.2.0 - github.com/shuffle/shuffle-shared v0.8.35 + github.com/shuffle/shuffle-shared v0.8.36 k8s.io/api v0.30.2 k8s.io/apimachinery v0.30.2 k8s.io/client-go v0.30.2 diff --git a/functions/onprem/worker/go.sum b/functions/onprem/worker/go.sum index 49b14df1..8fbbb256 100644 --- a/functions/onprem/worker/go.sum +++ b/functions/onprem/worker/go.sum @@ -294,8 +294,8 @@ github.com/sendgrid/sendgrid-go v3.14.0+incompatible h1:KDSasSTktAqMJCYClHVE94Fc github.com/sendgrid/sendgrid-go v3.14.0+incompatible/go.mod h1:QRQt+LX/NmgVEvmdRw0VT/QgUn499+iza2FnDca9fg8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= -github.com/shuffle/shuffle-shared v0.8.35 h1:3awc0TrsLLZiQeWD2XGIkTnFbczAG0cMfy1+cB/P7zg= -github.com/shuffle/shuffle-shared v0.8.35/go.mod h1:NruHSAscDsW595wpK2r7MeHPGspUEKRNvBpcN1iGbHI= +github.com/shuffle/shuffle-shared v0.8.36 h1:6ij/UdozOPe5SJnbVViFkWO/u6MrEerWGyuOo+xiZ0c= +github.com/shuffle/shuffle-shared v0.8.36/go.mod h1:NruHSAscDsW595wpK2r7MeHPGspUEKRNvBpcN1iGbHI= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= From 5691ec397d4d42b336224f5931ced94f4bf4ac79 Mon Sep 17 00:00:00 2001 From: Frikky Date: Fri, 4 Apr 2025 00:22:06 +0200 Subject: [PATCH 2/5] Update dockerbuild.yaml --- .github/workflows/dockerbuild.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml index 7b719644..570c21f1 100644 --- a/.github/workflows/dockerbuild.yaml +++ b/.github/workflows/dockerbuild.yaml @@ -20,19 +20,19 @@ jobs: include: - app: frontend path: frontend - version: 2.0.2 + version: latest experimental: true - app: backend path: backend - version: 2.0.2 + version: latest experimental: true - app: orborus path: functions/onprem/orborus - version: 2.0.2 + version: latest experimental: true - app: worker path: functions/onprem/worker - version: 2.0.2 + version: latest experimental: true steps: - name: Checkout From 12e6163437efcffc2690d3091b8abb383ce46190 Mon Sep 17 00:00:00 2001 From: Frikky Date: Fri, 4 Apr 2025 00:24:08 +0200 Subject: [PATCH 3/5] Ensuring latest is always built automatically on main --- .github/workflows/dockerbuild.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml index 7b719644..29565093 100644 --- a/.github/workflows/dockerbuild.yaml +++ b/.github/workflows/dockerbuild.yaml @@ -74,6 +74,7 @@ jobs: cache-to: type=local,dest=/tmp/.buildx-cache tags: | ghcr.io/shuffle/shuffle-${{ matrix.app }}:${{ matrix.version }} + ghcr.io/shuffle/shuffle-${{ matrix.app }}:latest ${{ secrets.DOCKERHUB_USERNAME }}/shuffle-${{ matrix.app }}:${{ matrix.version }} frikky/shuffle-${{ matrix.app }}:${{ matrix.version }} frikky/shuffle:${{ matrix.app }} From 41e1dfe848a7f8f968767ad1361e2d686351ca16 Mon Sep 17 00:00:00 2001 From: Pascal Sthamer Date: Fri, 4 Apr 2025 11:27:56 +0200 Subject: [PATCH 4/5] fix helm install command in readme Now that the helm release workflow is fixed, the extra nesting is removed. --- functions/kubernetes/charts/shuffle/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/kubernetes/charts/shuffle/README.md b/functions/kubernetes/charts/shuffle/README.md index e2025f94..90be758d 100644 --- a/functions/kubernetes/charts/shuffle/README.md +++ b/functions/kubernetes/charts/shuffle/README.md @@ -18,7 +18,7 @@ SPDX-License-Identifier: APACHE-2.0 ```sh # Install shuffle via helm (the shuffle namespace is hardcoded into the shuffle source code) -helm install shuffle oci://ghcr.io/shuffle/shuffle/charts/shuffle --namespace shuffle --create-namespace +helm install shuffle oci://ghcr.io/shuffle/charts/shuffle --namespace shuffle --create-namespace ``` Make sure that no other application is deployed to the shuffle namespace, as shuffle deletes kubernetes resources in this namespace. From eeb8c3ba4c5aa6ed0fc3b533d3c1f40c6713c940 Mon Sep 17 00:00:00 2001 From: Frikky Date: Sat, 5 Apr 2025 17:03:58 +0200 Subject: [PATCH 5/5] Syncup 2.0.2 --- .github/workflows/dockerbuild.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerbuild.yaml b/.github/workflows/dockerbuild.yaml index adfe6ad6..c1e9640c 100644 --- a/.github/workflows/dockerbuild.yaml +++ b/.github/workflows/dockerbuild.yaml @@ -20,19 +20,19 @@ jobs: include: - app: frontend path: frontend - version: latest + version: 2.0.2 experimental: true - app: backend path: backend - version: latest + version: 2.0.2 experimental: true - app: orborus path: functions/onprem/orborus - version: latest + version: 2.0.2 experimental: true - app: worker path: functions/onprem/worker - version: latest + version: 2.0.2 experimental: true steps: - name: Checkout