diff --git a/.golangci.yaml b/.golangci.yaml index 5583f24a..ed42829a 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,6 +1,9 @@ run: concurrency: 4 deadline: 10m + # some of the linters don't work correctly with 1.18, ref https://github.com/golangci/golangci-lint/issues/2649 + # we are not using generics, so let's pin this to 1.17 until 1.18 is fully supported + go: "1.17" linters: disable: diff --git a/.test-defs/TestSuiteGvisorBetaSerial.yaml b/.test-defs/TestSuiteGvisorBetaSerial.yaml index 38e3e072..e5d9e0f9 100644 --- a/.test-defs/TestSuiteGvisorBetaSerial.yaml +++ b/.test-defs/TestSuiteGvisorBetaSerial.yaml @@ -22,4 +22,4 @@ spec: -ginkgo.focus="\[BETA\].*\[SERIAL\]" -ginkgo.skip="\[DISRUPTIVE\]" - image: eu.gcr.io/gardener-project/3rd/golang:1.17.9 + image: eu.gcr.io/gardener-project/3rd/golang:1.18.5 diff --git a/Dockerfile b/Dockerfile index bc464dd3..2ce5e1f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ############# builder -FROM golang:1.17.9 AS builder +FROM golang:1.18.5 AS builder WORKDIR /go/src/github.com/gardener/gardener-extension-runtime-gvisor COPY . . @@ -13,7 +13,7 @@ COPY --from=builder /go/bin/gardener-extension-runtime-gvisor /gardener-extensio ENTRYPOINT ["/gardener-extension-runtime-gvisor"] ############# gardener-extension-runtime-gvisor-installation for the installation daemonSet -FROM alpine:3.15.4 AS gardener-extension-runtime-gvisor-installation +FROM alpine:3.16.1 AS gardener-extension-runtime-gvisor-installation COPY --from=builder /usr/local/bin/containerd-shim-runsc-v1 /var/content/containerd-shim-runsc-v1 COPY --from=builder /usr/local/bin/runsc /var/content/runsc