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

[v0.89] Upgrade golang to v1.22.9 and k8s to v1.27.16 #609

Merged
merged 4 commits into from
Nov 22, 2024
+18 −18
Merged

[v0.89] Upgrade golang to v1.22.9 and k8s to v1.27.16 #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e4c1aa
[v0.89] Upgrade golang to v1.22.9 and k8s to v1.27.16
coutinhop Nov 22, 2024
33b1f12
Fix dockerfiles
coutinhop Nov 22, 2024
9e8e7c1
Remove clang/llc symlinking
coutinhop Nov 22, 2024
bbcec3b
Fix version in arm dockerfile
coutinhop Nov 22, 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
8 changes: 4 additions & 4 deletions Dockerfile.amd64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM calico/bpftool:v5.3-amd64 as bpftool
FROM calico/bpftool:v7.4.0 AS bpftool

FROM golang:1.21.13-bullseye
FROM golang:1.22.9-bullseye

LABEL maintainer="Shaun Crampton <[email protected]>"

ARG GO_LINT_VERSION=v1.54.2
ARG K8S_VERSION=v1.26.14
ARG K8S_VERSION=v1.27.16
ARG LLVM_VERSION=15
ARG MANIFEST_TOOL_VERSION=v1.0.2
ARG MOCKERY_VER=2.27.1
Expand Down Expand Up @@ -70,7 +70,7 @@ RUN \
go install github.com/wadey/gocovmerge@master && \
go install github.com/mikefarah/yq/[email protected] && \
go install github.com/jstemmer/[email protected] && \
go install golang.org/x/tools/cmd/stringer@v0.8.0 && \
go install golang.org/x/tools/cmd/stringer@v0.27.0 && \
go install k8s.io/code-generator/cmd/[email protected] && \
go install k8s.io/code-generator/cmd/[email protected] && \
go install k8s.io/code-generator/cmd/[email protected] && \
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM calico/bpftool:v5.0-arm64 as bpftool
FROM calico/bpftool:v7.4.0-arm64 AS bpftool

FROM --platform=amd64 debian:bullseye as qemu
FROM --platform=amd64 debian:bullseye AS qemu

LABEL maintainer="Reza Ramezanpour <[email protected]>"

Expand All @@ -11,10 +11,10 @@ RUN apt update && apt install -y curl
# Enable non-native runs on amd64 architecture hosts
RUN curl -sfL https://github.com/multiarch/qemu-user-static/releases/download/v${QEMU_VERSION}/qemu-aarch64-static.tar.gz | tar xz -C /usr/bin

FROM arm64v8/golang:1.21.13-bullseye
FROM arm64v8/golang:1.22.9-bullseye

ARG GO_LINT_VERSION=v1.54.2
ARG K8S_VERSION=v1.26.14
ARG K8S_VERSION=v1.27.16
ARG LLVM_VERSION=15
ARG MANIFEST_TOOL_VERSION=v1.0.2
ARG MOCKERY_VER=2.14.0
Expand Down Expand Up @@ -74,7 +74,7 @@ RUN \
go install github.com/wadey/gocovmerge@master && \
go install github.com/mikefarah/yq/[email protected] && \
go install github.com/jstemmer/[email protected] && \
go install golang.org/x/tools/cmd/stringer@v0.8.0 && \
go install golang.org/x/tools/cmd/stringer@v0.27.0 && \
go install k8s.io/code-generator/cmd/[email protected] && \
go install k8s.io/code-generator/cmd/[email protected] && \
go install github.com/swaggo/swag/cmd/[email protected] && \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.armv7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=amd64 alpine:3.17 as qemu
FROM --platform=amd64 alpine:3.19 AS qemu

ARG QEMU_VERSION=7.2.0-1

Expand All @@ -7,12 +7,12 @@ RUN apk --update add curl
# Enable non-native runs on amd64 architecture hosts
RUN curl -sfL https://github.com/multiarch/qemu-user-static/releases/download/v${QEMU_VERSION}/qemu-arm-static.tar.gz | tar xz -C /usr/bin

FROM --platform=linux/arm/v7 arm32v7/golang:1.21.13-alpine3.19
FROM --platform=linux/arm/v7 arm32v7/golang:1.22.9-alpine3.19

LABEL maintainer="Marc Crebassa <[email protected]>"

ARG GO_LINT_VERSION=v1.54.2
ARG K8S_VERSION=v1.26.14
ARG K8S_VERSION=v1.27.16
ARG MANIFEST_TOOL_VERSION=v1.0.2

# Enable non-native builds of this image on an amd64 hosts.
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.ppc64le
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=amd64 alpine:3.17 as qemu
FROM --platform=amd64 alpine:3.19 AS qemu

ARG QEMU_VERSION=7.2.0-1

Expand All @@ -7,12 +7,12 @@ RUN apk --update add curl
# Enable non-native runs on amd64 architecture hosts
RUN curl -sfL https://github.com/multiarch/qemu-user-static/releases/download/v${QEMU_VERSION}/qemu-ppc64le-static.tar.gz | tar xz -C /usr/bin

FROM --platform=linux/ppc64le ppc64le/golang:1.21.13-alpine3.19
FROM --platform=linux/ppc64le ppc64le/golang:1.22.9-alpine3.19

LABEL maintainer="David Wilder <[email protected]>"

ARG GO_LINT_VERSION=v1.54.2
ARG K8S_VERSION=v1.26.14
ARG K8S_VERSION=v1.27.16
ARG MANIFEST_TOOL_VERSION=v1.0.2

# Enable non-native builds of this image on an amd64 hosts.
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.s390x
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=amd64 alpine:3.17 as qemu
FROM --platform=amd64 alpine:3.19 AS qemu

ARG QEMU_VERSION=7.2.0-1

Expand All @@ -7,12 +7,12 @@ RUN apk --update add curl
# Enable non-native runs on amd64 architecture hosts
RUN curl -sfL https://github.com/multiarch/qemu-user-static/releases/download/v${QEMU_VERSION}/qemu-s390x-static.tar.gz | tar xz -C /usr/bin

FROM --platform=linux/s390x s390x/golang:1.21.13-alpine3.19
FROM --platform=linux/s390x s390x/golang:1.22.9-alpine3.19

LABEL maintainer="LoZ Open SourceEcosystem (https://www.ibm.com/developerworks/community/groups/community/lozopensource)"

ARG GO_LINT_VERSION=v1.54.2
ARG K8S_VERSION=v1.26.14
ARG K8S_VERSION=v1.27.16
ARG MANIFEST_TOOL_VERSION=v1.0.2

# Enable non-native builds of this image on an amd64 hosts.
Expand Down