Go: Bump to v1.22.5. (#11634)
This commit is contained in:
parent
56c83284c7
commit
26036777c9
13 changed files with 23 additions and 22 deletions
|
@ -1 +1 @@
|
|||
1.22.4
|
||||
1.22.5
|
||||
|
|
4
go.mod
4
go.mod
|
@ -1,8 +1,6 @@
|
|||
module k8s.io/ingress-nginx
|
||||
|
||||
go 1.22.0
|
||||
|
||||
toolchain go1.22.4
|
||||
go 1.22.5
|
||||
|
||||
require (
|
||||
dario.cat/mergo v1.0.0
|
||||
|
|
2
go.work
2
go.work
|
@ -1,4 +1,4 @@
|
|||
go 1.22.0
|
||||
go 1.22.5
|
||||
|
||||
use (
|
||||
.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
module k8s.io/ingress-nginx/custom-error-pages
|
||||
|
||||
go 1.21
|
||||
go 1.22.5
|
||||
|
||||
require github.com/prometheus/client_golang v1.11.1
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
ARG GOLANG_VERSION
|
||||
|
||||
FROM golang:${GOLANG_VERSION}-alpine3.18 as builder
|
||||
FROM golang:${GOLANG_VERSION}-alpine3.20 as builder
|
||||
RUN mkdir /authsvc
|
||||
WORKDIR /authsvc
|
||||
COPY . ./
|
||||
|
@ -9,4 +9,4 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o authsvc authsvc.go
|
|||
FROM gcr.io/distroless/base-debian11
|
||||
COPY --from=builder /authsvc/authsvc /
|
||||
EXPOSE 8080
|
||||
ENTRYPOINT ["/authsvc"]
|
||||
ENTRYPOINT ["/authsvc"]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
module example.com/authsvc
|
||||
|
||||
go 1.21
|
||||
go 1.22.5
|
||||
|
||||
require k8s.io/apimachinery v0.23.1
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
# limitations under the License.
|
||||
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
|
||||
|
||||
|
@ -30,4 +30,4 @@ FROM gcr.io/distroless/static:nonroot
|
|||
COPY --from=builder /go/src/k8s.io/ingress-nginx/images/fastcgi/fastcgi-helloserver /
|
||||
USER nonroot:nonroot
|
||||
|
||||
CMD ["/fastcgi-helloserver"]
|
||||
CMD ["/fastcgi-helloserver"]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
ARG GOLANG_VERSION
|
||||
|
||||
FROM golang:${GOLANG_VERSION}-alpine3.18 as build
|
||||
FROM golang:${GOLANG_VERSION}-alpine3.20 as build
|
||||
|
||||
WORKDIR /go/src/greeter-server
|
||||
|
||||
|
@ -15,4 +15,4 @@ COPY --from=build /greeter-server /
|
|||
|
||||
EXPOSE 50051
|
||||
|
||||
CMD ["/greeter-server"]
|
||||
CMD ["/greeter-server"]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
module github.com/jet/kube-webhook-certgen
|
||||
|
||||
go 1.21
|
||||
go 1.22.5
|
||||
|
||||
require (
|
||||
github.com/onrik/logrus v0.11.0
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
# 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
|
||||
COPY . /opt/third_party/
|
||||
|
@ -24,14 +24,14 @@ RUN apk update \
|
|||
&& apk add -U bash \
|
||||
&& bash /opt/third_party/build.sh -p
|
||||
|
||||
ENV NINJA_STATUS "[%p/%f/%t] "
|
||||
ENV NINJA_STATUS="[%p/%f/%t] "
|
||||
|
||||
# install otel_ngx_module.so
|
||||
FROM base as nginx
|
||||
FROM base AS nginx
|
||||
ARG NGINX_VERSION=1.25.3
|
||||
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
|
||||
COPY . .
|
||||
|
@ -39,7 +39,7 @@ COPY . .
|
|||
RUN go mod download
|
||||
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=nginx /etc/nginx/modules /etc/nginx/modules
|
||||
|
||||
|
|
|
@ -52,7 +52,10 @@ Help()
|
|||
|
||||
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 \
|
||||
linux-headers \
|
||||
cmake \
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
module init-otel
|
||||
|
||||
go 1.21
|
||||
go 1.22.5
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
module k8s.io/ingress-nginx/magefiles
|
||||
|
||||
go 1.21
|
||||
go 1.22.5
|
||||
|
||||
require (
|
||||
github.com/blang/semver/v4 v4.0.0
|
||||
|
|
Loading…
Reference in a new issue