diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml index 81f7bba0a9..9bf1abdf3a 100644 --- a/.github/workflows/release-candidate.yaml +++ b/.github/workflows/release-candidate.yaml @@ -7,7 +7,7 @@ jobs: rc: name: Push release candidate tag runs-on: ubuntu-latest - container: public.ecr.aws/eksctl/eksctl-build:9b9ac54ee74f36fa22be8c7ec24f695dbd4c0d72 + container: public.ecr.aws/eksctl/eksctl-build:eaf4a14a339e450945ccb11301cf50cfd692d5e5 steps: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index de33c2bedb..90003d9bed 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -7,7 +7,7 @@ jobs: rc: name: Push release tag runs-on: ubuntu-latest - container: public.ecr.aws/eksctl/eksctl-build:9b9ac54ee74f36fa22be8c7ec24f695dbd4c0d72 + container: public.ecr.aws/eksctl/eksctl-build:eaf4a14a339e450945ccb11301cf50cfd692d5e5 steps: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2 diff --git a/.github/workflows/update-generated.yaml b/.github/workflows/update-generated.yaml index e4aa647eea..7394b433eb 100644 --- a/.github/workflows/update-generated.yaml +++ b/.github/workflows/update-generated.yaml @@ -18,7 +18,7 @@ jobs: resource: ["coredns", "aws-node", "nvidia-device-plugin"] name: Update ${{ matrix.resource }} and open PR runs-on: ubuntu-latest - container: public.ecr.aws/eksctl/eksctl-build:9b9ac54ee74f36fa22be8c7ec24f695dbd4c0d72 + container: public.ecr.aws/eksctl/eksctl-build:eaf4a14a339e450945ccb11301cf50cfd692d5e5 env: GOPRIVATE: "" steps: diff --git a/.requirements b/.requirements index 866aecdf2f..56fffcc9e1 100644 --- a/.requirements +++ b/.requirements @@ -5,7 +5,6 @@ github.com/golangci/golangci-lint/cmd/golangci-lint github.com/onsi/ginkgo/v2/ginkgo@v2.22.2 github.com/vektra/mockery/v2 github.com/github-release/github-release -golang.org/x/tools/cmd/stringer k8s.io/code-generator/cmd/client-gen k8s.io/code-generator/cmd/deepcopy-gen k8s.io/code-generator/cmd/defaulter-gen diff --git a/Dockerfile b/Dockerfile index 65e4fa210a..662251de7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:9b9ac54ee74f36fa22be8c7ec24f695dbd4c0d72 +ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:eaf4a14a339e450945ccb11301cf50cfd692d5e5 FROM $BUILD_IMAGE as build WORKDIR /src diff --git a/build/docker/build_image_manifest b/build/docker/build_image_manifest index 9b9ac54ee7..eaf4a14a33 100644 --- a/build/docker/build_image_manifest +++ b/build/docker/build_image_manifest @@ -5,7 +5,6 @@ "github.com/onsi/ginkgo/v2 v2.22.2" "github.com/vektra/mockery/v2 v2.52.2" "github.com/github-release/github-release v0.10.0" -"golang.org/x/tools v0.30.0" "k8s.io/code-generator v0.32.1" "k8s.io/code-generator v0.32.1" "k8s.io/code-generator v0.32.1" @@ -14,5 +13,5 @@ "sigs.k8s.io/mdtoc v1.1.0" "github.com/vburenin/ifacemaker v1.2.1" 100644 blob 4110115ebb2fc751cf9a4a04c9c710f5269337ab build/docker/Dockerfile -100644 blob 866aecdf2fd299e1c4355b2d7d8c9decaedbfe19 .requirements +100644 blob 56fffcc9e1948995e7903f0de2d08332cbfdd423 .requirements 100755 blob c1129ff1ff85ac2c53f908a577675ea59a9325a7 build/scripts/install-build-deps.sh diff --git a/build/docker/image_tag b/build/docker/image_tag index 7e77b69f8f..492e67c10c 100644 --- a/build/docker/image_tag +++ b/build/docker/image_tag @@ -1 +1 @@ -9b9ac54ee74f36fa22be8c7ec24f695dbd4c0d72 +eaf4a14a339e450945ccb11301cf50cfd692d5e5 diff --git a/go.mod b/go.mod index fd3234a1d5..f011fd672c 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,6 @@ require ( golang.org/x/crypto v0.33.0 golang.org/x/oauth2 v0.25.0 golang.org/x/sync v0.11.0 - golang.org/x/tools v0.30.0 gopkg.in/yaml.v2 v2.4.0 helm.sh/helm/v3 v3.17.0 k8s.io/api v0.32.1 @@ -406,6 +405,7 @@ require ( golang.org/x/term v0.29.0 // indirect golang.org/x/text v0.22.0 // indirect golang.org/x/time v0.8.0 // indirect + golang.org/x/tools v0.30.0 // indirect google.golang.org/api v0.215.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect google.golang.org/grpc v1.67.3 // indirect diff --git a/tools.go b/tools.go index 1a669ea1a2..db6ed42a56 100644 --- a/tools.go +++ b/tools.go @@ -12,7 +12,6 @@ import ( _ "github.com/maxbrunsfeld/counterfeiter/v6" _ "github.com/vburenin/ifacemaker" _ "github.com/vektra/mockery/v2" - _ "golang.org/x/tools/cmd/stringer" _ "k8s.io/code-generator/cmd/client-gen" _ "k8s.io/code-generator/cmd/deepcopy-gen" _ "k8s.io/code-generator/cmd/defaulter-gen"