Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

backport: upgrade golang to latest patch of go 1.21 in release/3.1.x #5905

Merged
merged 2 commits into from
Apr 23, 2024
Merged

backport: upgrade golang to latest patch of go 1.21 in release/3.1.x #5905

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d30654
upgrade golang to latest patch of go 1.21
randmonkey Apr 23, 2024
503607c
pin to go 1.21.9
randmonkey Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### Standard binary
# Build the manager binary
FROM golang:1.21.6 as builder
FROM golang:1.21 as builder
randmonkey marked this conversation as resolved.
Show resolved Hide resolved

ARG TARGETPLATFORM
ARG TARGETOS
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build a manager binary with debug symbols and download Delve
FROM golang:1.21.6 as builder
FROM golang:1.21 as builder

ARG TARGETPLATFORM
ARG TARGETOS
Expand Down Expand Up @@ -32,7 +32,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH="${TARGETARCH}" GO111MODULE=on make _build.d

### Debug
# Create an image that runs a debug build with Delve installed
FROM golang:1.21.6 AS debug
FROM golang:1.21 AS debug
RUN go install github.com/go-delve/delve/cmd/dlv@latest
# We want all source so Delve file location operations work
COPY --from=builder /workspace/bin/manager-debug /
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/kong/kubernetes-ingress-controller/v3

go 1.21.6
go 1.21.9

// TODO: this is disabled by FOSSA action doesn't support go 1.21's toolchain clause:
//
Expand Down
2 changes: 0 additions & 2 deletions third_party/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module github.com/kong/kubernetes-ingress-controller/tools

go 1.21

toolchain go1.21.0

require (
github.com/elastic/crd-ref-docs v0.0.10
github.com/go-delve/delve v1.22.0
Expand Down
Loading