Skip to content

Commit 4d7f6ea

Browse files
committed
kms-e2e: use setup_env / respect GOTOOLCHAIN
1 parent cd451c6 commit 4d7f6ea

File tree

2 files changed

+17
-7
lines changed
  • staging/src/k8s.io/kms/internal/plugins/_mock
  • test/e2e/testing-manifests/auth/encrypt

2 files changed

+17
-7
lines changed

staging/src/k8s.io/kms/internal/plugins/_mock/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ WORKDIR /workspace/kms/internal/plugins/_mock
2323

2424
ARG TARGETARCH
2525
ARG TARGETPLATFORM
26+
ARG GOTOOLCHAIN
2627
RUN CGO_ENABLED=1 GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on go build -a -o mock-kms-plugin plugin.go
2728

2829
FROM alpine:latest

test/e2e/testing-manifests/auth/encrypt/run-e2e.sh

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ set -o errexit
2525
set -o nounset
2626
set -o pipefail
2727

28+
KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/../../../../.. && pwd -P)"
29+
source "${KUBE_ROOT}/hack/lib/init.sh"
30+
2831
readonly cluster_name="kms"
2932
readonly registry_name="kind-registry"
3033
readonly kind_network="kind"
@@ -35,6 +38,7 @@ build_and_push_mock_plugin() {
3538
--no-cache \
3639
--platform linux/amd64 \
3740
--output=type=docker \
41+
--build-arg=GOTOOLCHAIN="${GOTOOLCHAIN}" \
3842
-t localhost:5000/mock-kms-provider:e2e \
3943
-f staging/src/k8s.io/kms/internal/plugins/_mock/Dockerfile staging/src/k8s.io/ \
4044
--progress=plain;
@@ -136,18 +140,23 @@ main(){
136140
export ARTIFACTS="${ARTIFACTS:-${PWD}/_artifacts}"
137141
mkdir -p "${ARTIFACTS}"
138142

139-
export GO111MODULE=on;
140-
go install sigs.k8s.io/kind@latest;
141-
go install sigs.k8s.io/kubetest2@latest;
142-
go install sigs.k8s.io/kubetest2/kubetest2-kind@latest;
143-
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest;
143+
kube::golang::setup_env
144+
(
145+
# just while installing external tools
146+
export GO111MODULE=on GOTOOLCHAIN=auto
147+
# TODO: consider using specific versions to avoid surprise breaking changes
148+
go install sigs.k8s.io/kind@latest
149+
go install sigs.k8s.io/kubetest2@latest
150+
go install sigs.k8s.io/kubetest2/kubetest2-kind@latest
151+
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
152+
)
144153

145154
# The build e2e.test, ginkgo and kubectl binaries + copy to dockerized dir is
146155
# because of https://github.com/kubernetes-sigs/kubetest2/issues/184
147-
make all WHAT="test/e2e/e2e.test vendor/github.com/onsi/ginkgo/v2/ginkgo cmd/kubectl";
156+
make all WHAT="test/e2e/e2e.test vendor/github.com/onsi/ginkgo/v2/ginkgo cmd/kubectl"
148157
mkdir -p _output/dockerized/bin/linux/amd64;
149158
for binary in kubectl e2e.test ginkgo; do
150-
cp -f _output/local/go/bin/${binary} _output/dockerized/bin/linux/amd64/${binary};
159+
cp -f _output/local/go/bin/${binary} _output/dockerized/bin/linux/amd64/${binary}
151160
done;
152161

153162
create_registry

0 commit comments

Comments
 (0)