diff --git a/.github/workflows/e2e/package/Dockerfile b/.github/workflows/e2e/package/Dockerfile index b9425c9a..6d6591a3 100644 --- a/.github/workflows/e2e/package/Dockerfile +++ b/.github/workflows/e2e/package/Dockerfile @@ -1,9 +1,9 @@ -FROM registry.suse.com/bci/golang:1.19 AS helm +FROM registry.suse.com/bci/golang:1.20 AS helm RUN zypper -n install git RUN git -C / clone --branch release-v3.9.0 --depth=1 https://github.com/rancher/helm RUN make -C /helm -FROM registry.suse.com/bci/golang:1.19 +FROM registry.suse.com/bci/golang:1.20 ARG ARCH=amd64 ENV KUBECTL_VERSION v1.21.8 diff --git a/Dockerfile.dapper b/Dockerfile.dapper index b039d8b1..faae2fb8 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,9 +1,9 @@ -FROM registry.suse.com/bci/golang:1.19 AS helm +FROM registry.suse.com/bci/golang:1.20 AS helm RUN zypper -n install git RUN git -C / clone --branch release-v3.9.0 --depth=1 https://github.com/rancher/helm RUN make -C /helm -FROM registry.suse.com/bci/golang:1.19 +FROM registry.suse.com/bci/golang:1.20 ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH diff --git a/go.mod b/go.mod index 609b78a9..fbbf6c57 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/rancher/prometheus-federator -go 1.19 +go 1.20 replace ( k8s.io/api => k8s.io/api v0.25.4