Skip to content

Commit 76d75df

Browse files
authored
Merge pull request #1831 from swastik959/updatego-v2.11
[v2.11] updated go version
2 parents 2c02e98 + 8ae530a commit 76d75df

File tree

11 files changed

+11
-13
lines changed

11 files changed

+11
-13
lines changed

.github/workflows/apidiff.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
fetch-depth: 0
1111
- uses: actions/setup-go@v5
1212
with:
13-
go-version: 1.23.x
13+
go-version: 1.24.x
1414
- name: Generate API diff
1515
run: make apidiff

.github/workflows/e2e-branch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: Install Go
4747
uses: actions/setup-go@v5
4848
with:
49-
go-version: 1.23.x
49+
go-version: 1.24.x
5050
- uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
5151
with:
5252
version: v0.23.0

.github/workflows/lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Install Go
1515
uses: actions/setup-go@v5
1616
with:
17-
go-version: 1.23.x
17+
go-version: 1.24.x
1818
- name: Analysis
1919
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
2020
with:

.github/workflows/unit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Install Go
1212
uses: actions/setup-go@v5
1313
with:
14-
go-version: 1.23.x
14+
go-version: 1.24.x
1515
- name: Run tests
1616
run: |
1717
make test

.github/workflows/update-rancher-dep.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
env:
1919
GOARCH: amd64
2020
CGO_ENABLED: 0
21-
SETUP_GO_VERSION: '1.23.*'
21+
SETUP_GO_VERSION: '1.24.*'
2222

2323
jobs:
2424
create-rancher-pr:

.github/workflows/verify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Install Go
1212
uses: actions/setup-go@v5
1313
with:
14-
go-version: 1.23.x
14+
go-version: 1.24.x
1515
- name: Run make verify
1616
run: |
1717
make verify

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
run:
22
timeout: 5m
3-
go: "1.23"
3+
go: "1.24"
44
tests: false
55
allow-parallel-runners: true
66

Dockerfile.dapper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN zypper -n update && \
88

99
ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
1010
GOPATH=/go CGO_ENABLED=0 PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
11-
RUN curl -sLf https://storage.googleapis.com/golang/go1.23.6.linux-${ARCH}.tar.gz | tar -xzf - -C /usr/local/
11+
RUN curl -sLf https://storage.googleapis.com/golang/go1.24.9.linux-${ARCH}.tar.gz | tar -xzf - -C /usr/local/
1212
# workaround for https://bugzilla.suse.com/show_bug.cgi?id=1183043
1313
RUN if [ "${ARCH}" == "arm64" ]; then \
1414
zypper -n install binutils-gold ; \

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/rancher/eks-operator
22

3-
go 1.23.0
4-
5-
toolchain go1.24.1
3+
go 1.24.9
64

75
replace k8s.io/client-go => k8s.io/client-go v0.32.1
86

package/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM registry.suse.com/bci/bci-base:15.6 AS base
55
RUN sed -i 's/^CREATE_MAIL_SPOOL=yes/CREATE_MAIL_SPOOL=no/' /etc/default/useradd
66
RUN useradd --uid 1007 eks-operator
77

8-
FROM --platform=$BUILDPLATFORM registry.suse.com/bci/golang:1.23 AS builder
8+
FROM --platform=$BUILDPLATFORM registry.suse.com/bci/golang:1.24 AS builder
99

1010
WORKDIR /app
1111
COPY go.mod go.sum ./

0 commit comments

Comments
 (0)