DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Go: Bump to v1.22.5. (#11634)

Browse source
This commit is contained in:
Marco Ebert 2024-08-05 17:26:59 +02:00 committed by GitHub
parent 56c83284c7
commit 26036777c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GOLANG_VERSION
View file

@ -1 +1 @@
1.22.4 1.22.5

4
go.mod
View file

@ -1,8 +1,6 @@
module k8s.io/ingress-nginx module k8s.io/ingress-nginx
go 1.22.0 go 1.22.5
toolchain go1.22.4
require ( require (
dario.cat/mergo v1.0.0 dario.cat/mergo v1.0.0

2
go.work
View file

@ -1,4 +1,4 @@
go 1.22.0 go 1.22.5
use ( use (
. .

2
images/custom-error-pages/rootfs/go.mod
View file

@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/custom-error-pages module k8s.io/ingress-nginx/custom-error-pages
go 1.21 go 1.22.5
require github.com/prometheus/client_golang v1.11.1 require github.com/prometheus/client_golang v1.11.1

4
images/ext-auth-example-authsvc/rootfs/Dockerfile
View file

@ -1,6 +1,6 @@
ARG GOLANG_VERSION ARG GOLANG_VERSION
FROM golang:${GOLANG_VERSION}-alpine3.18 as builder FROM golang:${GOLANG_VERSION}-alpine3.20 as builder
RUN mkdir /authsvc RUN mkdir /authsvc
WORKDIR /authsvc WORKDIR /authsvc
COPY . ./ COPY . ./
@ -9,4 +9,4 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o authsvc authsvc.go
FROM gcr.io/distroless/base-debian11 FROM gcr.io/distroless/base-debian11
COPY --from=builder /authsvc/authsvc / COPY --from=builder /authsvc/authsvc /
EXPOSE 8080 EXPOSE 8080
ENTRYPOINT ["/authsvc"] ENTRYPOINT ["/authsvc"]

2
images/ext-auth-example-authsvc/rootfs/go.mod
View file

@ -1,6 +1,6 @@
module example.com/authsvc module example.com/authsvc
go 1.21 go 1.22.5
require k8s.io/apimachinery v0.23.1 require k8s.io/apimachinery v0.23.1

4
images/fastcgi-helloserver/rootfs/Dockerfile
View file

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
ARG GOLANG_VERSION ARG GOLANG_VERSION
FROM golang:${GOLANG_VERSION}-alpine3.18 as builder FROM golang:${GOLANG_VERSION}-alpine3.20 as builder
WORKDIR /go/src/k8s.io/ingress-nginx/images/fastcgi WORKDIR /go/src/k8s.io/ingress-nginx/images/fastcgi
@ -30,4 +30,4 @@ FROM gcr.io/distroless/static:nonroot
COPY --from=builder /go/src/k8s.io/ingress-nginx/images/fastcgi/fastcgi-helloserver / COPY --from=builder /go/src/k8s.io/ingress-nginx/images/fastcgi/fastcgi-helloserver /
USER nonroot:nonroot USER nonroot:nonroot
CMD ["/fastcgi-helloserver"] CMD ["/fastcgi-helloserver"]

4
images/go-grpc-greeter-server/rootfs/Dockerfile
View file

@ -1,6 +1,6 @@
ARG GOLANG_VERSION ARG GOLANG_VERSION
FROM golang:${GOLANG_VERSION}-alpine3.18 as build FROM golang:${GOLANG_VERSION}-alpine3.20 as build
WORKDIR /go/src/greeter-server WORKDIR /go/src/greeter-server
@ -15,4 +15,4 @@ COPY --from=build /greeter-server /
EXPOSE 50051 EXPOSE 50051
CMD ["/greeter-server"] CMD ["/greeter-server"]

2
images/kube-webhook-certgen/rootfs/go.mod
View file

@ -1,6 +1,6 @@
module github.com/jet/kube-webhook-certgen module github.com/jet/kube-webhook-certgen
go 1.21 go 1.22.5
require ( require (
github.com/onrik/logrus v0.11.0 github.com/onrik/logrus v0.11.0

10
images/opentelemetry/rootfs/Dockerfile
View file

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
FROM alpine:3.20.0 as base FROM alpine:3.20.0 AS base
RUN mkdir -p /opt/third_party/install RUN mkdir -p /opt/third_party/install
COPY . /opt/third_party/ COPY . /opt/third_party/
@ -24,14 +24,14 @@ RUN apk update \
&& apk add -U bash \ && apk add -U bash \
&& bash /opt/third_party/build.sh -p && bash /opt/third_party/build.sh -p
ENV NINJA_STATUS "[%p/%f/%t] " ENV NINJA_STATUS="[%p/%f/%t] "
# install otel_ngx_module.so # install otel_ngx_module.so
FROM base as nginx FROM base AS nginx
ARG NGINX_VERSION=1.25.3 ARG NGINX_VERSION=1.25.3
RUN bash /opt/third_party/build.sh -n ${NGINX_VERSION} RUN bash /opt/third_party/build.sh -n ${NGINX_VERSION}
FROM golang:1.21.6-bullseye as build-init FROM golang:1.22.5-bullseye AS build-init
WORKDIR /go/src/app WORKDIR /go/src/app
COPY . . COPY . .
@ -39,7 +39,7 @@ COPY . .
RUN go mod download RUN go mod download
RUN CGO_ENABLED=0 go build -o /go/bin/init_module RUN CGO_ENABLED=0 go build -o /go/bin/init_module
FROM gcr.io/distroless/static-debian11 as final FROM gcr.io/distroless/static-debian11 AS final
COPY --from=build-init /go/bin/init_module / COPY --from=build-init /go/bin/init_module /
COPY --from=nginx /etc/nginx/modules /etc/nginx/modules COPY --from=nginx /etc/nginx/modules /etc/nginx/modules

5
images/opentelemetry/rootfs/build.sh
View file

@ -52,7 +52,10 @@ Help()
prepare() prepare()
{ {
echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories echo "https://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories
echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
apk add \ apk add \
linux-headers \ linux-headers \
cmake \ cmake \

2
images/opentelemetry/rootfs/go.mod
View file

@ -1,3 +1,3 @@
module init-otel module init-otel
go 1.21 go 1.22.5

2
magefiles/go.mod
View file

@ -1,6 +1,6 @@
module k8s.io/ingress-nginx/magefiles module k8s.io/ingress-nginx/magefiles
go 1.21 go 1.22.5
require ( require (
github.com/blang/semver/v4 v4.0.0 github.com/blang/semver/v4 v4.0.0