From 211fbaacb17a1485790467a862e744dd3c4b1564 Mon Sep 17 00:00:00 2001 From: Somtochi Onyekwere Date: Thu, 30 Nov 2023 13:31:27 +0100 Subject: [PATCH 1/2] use bitnami oci chart for minio Signed-off-by: Somtochi Onyekwere --- hack/ci/e2e.sh | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/hack/ci/e2e.sh b/hack/ci/e2e.sh index d4bde9a20..26931d64d 100755 --- a/hack/ci/e2e.sh +++ b/hack/ci/e2e.sh @@ -6,16 +6,14 @@ CREATE_CLUSTER="${CREATE_CLUSTER:-true}" KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-kind}" LOAD_IMG_INTO_KIND="${LOAD_IMG_INTO_KIND:-true}" BUILD_PLATFORM="${BUILD_PLATFORM:-linux/amd64}" -MINIO_HELM_VER="${MINIO_HELM_VER:-v6.3.1}" -# Older tags do not bundle multiple architectures. Newer tags are 5-6 times larger. -MINIO_TAG="${MINIO_TAG:-RELEASE.2020-09-17T04-49-20Z}" +MINIO_HELM_VER="${MINIO_HELM_VER:-12.10.3}" IMG=test/source-controller TAG=latest -MC_RELEASE=mc.RELEASE.2021-12-16T23-38-39Z -MC_AMD64_SHA256=d14302bbdaa180a073c1627ff9fbf55243221e33d47e32df61a950f635810978 -MC_ARM64_SHA256=00791995bf8d102e3159e23b3af2f5e6f4c784fafd88c60161dcf3f0169aa217 +MC_RELEASE=mc.RELEASE.2023-11-20T16-30-59Z +MC_AMD64_SHA256=fdd901a5169d676f32483f9a2de977b7ff3a4fe83e254dcbc35e7a1545591565 +MC_ARM64_SHA256=09816180f560875d344dc436ed4ec1348b3ff0c836ae9cf0415fef602489cc11 ROOT_DIR="$(git rev-parse --show-toplevel)" BUILD_DIR="${ROOT_DIR}/build" @@ -87,15 +85,13 @@ kubectl -n source-system delete -f "${ROOT_DIR}/config/testdata/helmchart-values echo "Setup Minio" kubectl create ns minio -helm repo add minio https://helm.min.io/ --force-update -helm upgrade minio minio/minio --wait -i \ +helm upgrade minio oci://registry-1.docker.io/bitnamicharts/minio --wait -i \ --version "${MINIO_HELM_VER}" \ --namespace minio \ - --set accessKey=myaccesskey \ - --set secretKey=mysecretkey \ + --set auth.rootUser=myaccesskey \ + --set auth.rootPassword=mysecretkey \ --set resources.requests.memory=128Mi \ - --set persistence.enable=false \ - --set image.tag="${MINIO_TAG}" + --set persistence.enable=false kubectl -n minio port-forward svc/minio 9000:9000 &>/dev/null & sleep 2 From 0f58d251e9e1ea1be286ac9af0c4ecad6ac63d61 Mon Sep 17 00:00:00 2001 From: Somtochi Onyekwere Date: Thu, 30 Nov 2023 14:29:35 +0100 Subject: [PATCH 2/2] increase timeout Signed-off-by: Somtochi Onyekwere --- hack/ci/e2e.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/hack/ci/e2e.sh b/hack/ci/e2e.sh index 26931d64d..ad4aaad7a 100755 --- a/hack/ci/e2e.sh +++ b/hack/ci/e2e.sh @@ -87,6 +87,7 @@ echo "Setup Minio" kubectl create ns minio helm upgrade minio oci://registry-1.docker.io/bitnamicharts/minio --wait -i \ --version "${MINIO_HELM_VER}" \ + --timeout 10m0s \ --namespace minio \ --set auth.rootUser=myaccesskey \ --set auth.rootPassword=mysecretkey \