Skip to content

Commit 83706da

Browse files
alexellisalexellis
committed
Update to Go 1.22 and various in go.mod
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
1 parent ac4c706 commit 83706da

File tree

639 files changed

+81936
-41162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

639 files changed

+81936
-41162
lines changed

‎.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Install Go
1919
uses: actions/setup-go@master
2020
with:
21-
go-version: 1.21.x
21+
go-version: 1.22.x
2222
- name: Set up QEMU
2323
uses: docker/setup-qemu-action@v3
2424
- name: Set up Docker Buildx

‎.github/workflows/publish.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Install Go
2222
uses: actions/setup-go@master
2323
with:
24-
go-version: 1.21.x
24+
go-version: 1.22.x
2525
- name: Set up QEMU
2626
uses: docker/setup-qemu-action@v3
2727
- name: Set up Docker Buildx

‎.github/workflows/verify-images.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
verifyImages:
1010
strategy:
1111
matrix:
12-
go-version: [1.21.x]
12+
go-version: [1.22.x]
1313
os: [ubuntu-latest]
1414
runs-on: ${{ matrix.os }}
1515

‎Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM ghcr.io/openfaas/license-check:0.4.2 as license-check
1+
FROM ghcr.io/openfaas/license-check:0.4.2 AS license-check
22

3-
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22 as build
3+
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22 AS build
44

55
ARG TARGETPLATFORM
66
ARG BUILDPLATFORM
@@ -29,8 +29,8 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \
2929
-X github.com/openfaas/faas-netes/version.Version=${VERSION}" \
3030
-o faas-netes .
3131

32-
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.19.1 as ship
33-
LABEL org.label-schema.license="Non-commercial use only" \
32+
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.20.1 AS ship
33+
LABEL org.label-schema.license="OpenFaaS CE EULA - non-commercial" \
3434
org.label-schema.vcs-url="https://github.com/openfaas/faas-netes" \
3535
org.label-schema.vcs-type="Git" \
3636
org.label-schema.name="openfaas/faas-netes" \
@@ -47,8 +47,8 @@ WORKDIR /home/app
4747

4848
EXPOSE 8080
4949

50-
ENV http_proxy ""
51-
ENV https_proxy ""
50+
ENV http_proxy=""
51+
ENV https_proxy=""
5252

5353
COPY --from=build /go/src/github.com/openfaas/faas-netes/faas-netes .
5454
RUN chown -R app:app ./

‎go.mod

+30-33
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
11
module github.com/openfaas/faas-netes
22

3-
go 1.21
3+
go 1.22.0
44

55
require (
66
github.com/google/go-cmp v0.6.0 // indirect
77
github.com/gorilla/mux v1.8.1
8-
github.com/openfaas/faas-provider v0.25.3
8+
github.com/openfaas/faas-provider v0.25.4
99
github.com/pkg/errors v0.9.1
10-
k8s.io/api v0.29.3
11-
k8s.io/apimachinery v0.29.3
12-
k8s.io/client-go v0.29.3
13-
k8s.io/code-generator v0.29.3
10+
k8s.io/api v0.30.2
11+
k8s.io/apimachinery v0.30.2
12+
k8s.io/client-go v0.30.2
13+
k8s.io/code-generator v0.30.2
1414
k8s.io/klog v1.0.0
1515
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
1616
)
1717

18-
require github.com/google/go-containerregistry v0.19.1
18+
require github.com/google/go-containerregistry v0.20.0
1919

2020
require (
2121
github.com/beorn7/perks v1.0.1 // indirect
22-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
22+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2323
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
2424
github.com/davecgh/go-spew v1.1.1 // indirect
25-
github.com/docker/cli v26.0.0+incompatible // indirect
25+
github.com/docker/cli v27.0.3+incompatible // indirect
2626
github.com/docker/distribution v2.8.3+incompatible // indirect
27-
github.com/docker/docker v26.0.0+incompatible // indirect
28-
github.com/docker/docker-credential-helpers v0.8.1 // indirect
29-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
27+
github.com/docker/docker-credential-helpers v0.8.2 // indirect
28+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
3029
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
31-
github.com/go-logr/logr v1.4.1 // indirect
30+
github.com/go-logr/logr v1.4.2 // indirect
3231
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3332
github.com/go-openapi/jsonreference v0.21.0 // indirect
3433
github.com/go-openapi/swag v0.23.0 // indirect
@@ -40,40 +39,38 @@ require (
4039
github.com/imdario/mergo v0.3.16 // indirect
4140
github.com/josharian/intern v1.0.0 // indirect
4241
github.com/json-iterator/go v1.1.12 // indirect
43-
github.com/klauspost/compress v1.17.7 // indirect
42+
github.com/klauspost/compress v1.17.9 // indirect
4443
github.com/mailru/easyjson v0.7.7 // indirect
4544
github.com/mitchellh/go-homedir v1.1.0 // indirect
4645
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4746
github.com/modern-go/reflect2 v1.0.2 // indirect
4847
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
49-
github.com/onsi/gomega v1.30.0 // indirect
5048
github.com/opencontainers/go-digest v1.0.0 // indirect
5149
github.com/opencontainers/image-spec v1.1.0 // indirect
52-
github.com/prometheus/client_golang v1.19.0 // indirect
53-
github.com/prometheus/client_model v0.6.0 // indirect
54-
github.com/prometheus/common v0.51.1 // indirect
55-
github.com/prometheus/procfs v0.13.0 // indirect
50+
github.com/prometheus/client_golang v1.19.1 // indirect
51+
github.com/prometheus/client_model v0.6.1 // indirect
52+
github.com/prometheus/common v0.55.0 // indirect
53+
github.com/prometheus/procfs v0.15.1 // indirect
5654
github.com/sirupsen/logrus v1.9.3 // indirect
5755
github.com/spf13/pflag v1.0.5 // indirect
5856
github.com/vbatts/tar-split v0.11.5 // indirect
59-
golang.org/x/mod v0.16.0 // indirect
60-
golang.org/x/net v0.22.0 // indirect
61-
golang.org/x/oauth2 v0.18.0 // indirect
62-
golang.org/x/sync v0.6.0 // indirect
63-
golang.org/x/sys v0.18.0 // indirect
64-
golang.org/x/term v0.18.0 // indirect
65-
golang.org/x/text v0.14.0 // indirect
57+
golang.org/x/mod v0.19.0 // indirect
58+
golang.org/x/net v0.27.0 // indirect
59+
golang.org/x/oauth2 v0.21.0 // indirect
60+
golang.org/x/sync v0.7.0 // indirect
61+
golang.org/x/sys v0.22.0 // indirect
62+
golang.org/x/term v0.22.0 // indirect
63+
golang.org/x/text v0.16.0 // indirect
6664
golang.org/x/time v0.5.0 // indirect
67-
golang.org/x/tools v0.19.0 // indirect
68-
google.golang.org/appengine v1.6.8 // indirect
69-
google.golang.org/protobuf v1.33.0 // indirect
65+
golang.org/x/tools v0.23.0 // indirect
66+
google.golang.org/protobuf v1.34.2 // indirect
7067
gopkg.in/inf.v0 v0.9.1 // indirect
7168
gopkg.in/yaml.v2 v2.4.0 // indirect
7269
gopkg.in/yaml.v3 v3.0.1 // indirect
73-
k8s.io/gengo v0.0.0-20240310015720-9cff6334dab4 // indirect
74-
k8s.io/klog/v2 v2.120.1 // indirect
75-
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
76-
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
70+
k8s.io/gengo/v2 v2.0.0-20240404160639-a0386bf69313 // indirect
71+
k8s.io/klog/v2 v2.130.1 // indirect
72+
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f // indirect
73+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
7774
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7875
sigs.k8s.io/yaml v1.4.0 // indirect
7976
)

0 commit comments

Comments
 (0)