From 911579a90c465c5080cbcb6e5decb34c0de91f08 Mon Sep 17 00:00:00 2001 From: Harsimran Singh Maan <maan.harry@gmail.com> Date: Mon, 20 Jan 2025 09:40:42 -0800 Subject: [PATCH] Update to go 1.23.5 --- Dockerfile.dapper | 7 ++----- examples/distroless/Dockerfile.helper | 2 +- examples/distroless/Dockerfile.provisioner | 2 +- go.mod | 6 +++--- go.sum | 12 ++++++------ 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index b92783da..2dea9fba 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,14 +1,11 @@ -FROM golang:1.23.4-alpine +FROM golang:1.23.5-alpine ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN apk -U add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq RUN rm -rf /go/src /go/pkg -RUN if [ "${ARCH}" == "amd64" ]; then \ - curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.41.1; \ - fi; \ - if [ "${ARCH}" == "amd64" ] || [ "${ARCH}" == "arm64" ]; then \ +RUN if [ "${ARCH}" == "amd64" ] || [ "${ARCH}" == "arm64" ]; then \ kind_version=$(curl -sL https://api.github.com/repos/kubernetes-sigs/kind/releases/latest | jq -r ".tag_name") && curl -sL "https://kind.sigs.k8s.io/dl/${kind_version}/kind-linux-${ARCH}" -o kind && install kind /usr/local/bin; \ kubectl_version=$(curl -sL https://dl.k8s.io/release/stable.txt) && curl -sLO "https://dl.k8s.io/release/${kubectl_version}/bin/linux/${ARCH}/kubectl" && install kubectl /usr/local/bin; \ curl -sL "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv5.5.0/kustomize_v5.5.0_linux_${ARCH}.tar.gz" | tar -zxv -C /usr/local/bin; \ diff --git a/examples/distroless/Dockerfile.helper b/examples/distroless/Dockerfile.helper index 05f357d9..acaf320a 100644 --- a/examples/distroless/Dockerfile.helper +++ b/examples/distroless/Dockerfile.helper @@ -1,4 +1,4 @@ -FROM golang:1.23.4-alpine AS builder +FROM golang:1.23.5-alpine AS builder COPY main.go /main.go COPY go.mod /go.mod diff --git a/examples/distroless/Dockerfile.provisioner b/examples/distroless/Dockerfile.provisioner index bb720b33..3238052e 100644 --- a/examples/distroless/Dockerfile.provisioner +++ b/examples/distroless/Dockerfile.provisioner @@ -1,4 +1,4 @@ -FROM golang:1.23.4-alpine AS builder +FROM golang:1.23.5-alpine AS builder ARG GIT_REPO ARG GIT_BRANCH diff --git a/go.mod b/go.mod index 141af301..f6ca5ede 100644 --- a/go.mod +++ b/go.mod @@ -8,9 +8,9 @@ require ( github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.10.0 github.com/urfave/cli v1.22.16 - k8s.io/api v0.32.0 - k8s.io/apimachinery v0.32.0 - k8s.io/client-go v0.32.0 + k8s.io/api v0.32.1 + k8s.io/apimachinery v0.32.1 + k8s.io/client-go v0.32.1 k8s.io/klog/v2 v2.130.1 sigs.k8s.io/sig-storage-lib-external-provisioner/v10 v10.0.1 sigs.k8s.io/yaml v1.4.0 diff --git a/go.sum b/go.sum index 49469fe2..6eb1f382 100644 --- a/go.sum +++ b/go.sum @@ -167,12 +167,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= -k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= -k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg= -k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= -k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8= +k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc= +k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k= +k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs= +k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU= +k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg= -- GitLab