Skip to content

Commit 6d3a6b6

Browse files
authored
Release v1.8.2 and Update Go to v1.21.1 (#10379)
* Bump Go version to 1.21.1 (#10377) * Bump Go version to 1.21.1 * Bump testrunner image * Fix lint error on datadog struct * Revert lint on 1.8 * Fix http default backend test * Fix http default backend test * Fix http default backend test (#10382)
1 parent a281bf0 commit 6d3a6b6

File tree

22 files changed

+150
-68
lines changed

22 files changed

+150
-68
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,6 @@ jobs:
6262
- 'charts/ingress-nginx/**/*'
6363
- 'NGINX_BASE'
6464
65-
66-
security:
67-
runs-on: ubuntu-latest
68-
steps:
69-
70-
- name: Checkout
71-
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
72-
73-
- name: Run Gosec Security Scanner
74-
uses: securego/gosec@c5ea1b7bdd9efc3792e513258853552b0ae31e06 # v2.16.0
75-
with:
76-
# G601 for zz_generated.deepcopy.go
77-
# G306 TODO: Expect WriteFile permissions to be 0600 or less
78-
# G307 TODO: Deferring unsafe method "Close"
79-
args: -exclude=G109,G601,G104,G204,G304,G306,G307 -tests=false -exclude-dir=test -exclude-dir=images/ -exclude-dir=docs/ ./...
80-
8165
lint:
8266
runs-on: ubuntu-latest
8367
needs: changes
@@ -86,12 +70,11 @@ jobs:
8670
steps:
8771
- name: Checkout
8872
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
89-
9073
- name: Set up Go
9174
id: go
9275
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
9376
with:
94-
go-version: '1.20'
77+
go-version: '1.21.1'
9578
check-latest: true
9679

9780
- name: Run Lint
@@ -110,7 +93,7 @@ jobs:
11093
id: go
11194
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
11295
with:
113-
go-version: '1.20'
96+
go-version: '1.21.1'
11497
check-latest: true
11598

11699
- name: Run go-fmt
@@ -129,7 +112,7 @@ jobs:
129112
id: go
130113
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
131114
with:
132-
go-version: '1.20'
115+
go-version: '1.21.1'
133116
check-latest: true
134117

135118
- name: Run test
@@ -150,7 +133,7 @@ jobs:
150133
id: go
151134
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
152135
with:
153-
go-version: '1.20'
136+
go-version: '1.21.1'
154137
check-latest: true
155138

156139
- name: Set up QEMU
@@ -216,7 +199,7 @@ jobs:
216199
- name: Setup Go
217200
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
218201
with:
219-
go-version: '1.20'
202+
go-version: '1.21.1'
220203
check-latest: true
221204

222205
- name: cache
@@ -474,7 +457,7 @@ jobs:
474457
if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }}
475458
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
476459
with:
477-
go-version: '1.20'
460+
go-version: '1.21.1'
478461
check-latest: true
479462

480463
- name: kube-webhook-certgen image build

.github/workflows/plugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set up Go
2525
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
2626
with:
27-
go-version: 1.20
27+
go-version: '1.21.1'
2828
check-latest: true
2929

3030
- name: Run GoReleaser

TAG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.8.1
1+
v1.8.2

build/run-in-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function cleanup {
4444
}
4545
trap cleanup EXIT
4646

47-
E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v20230623-d50c7193b@sha256:e5c68dc56934c273850bfb75c0348a2819756669baf59fcdce9e16771537b247}
47+
E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v20230907-5bb82dcb7@sha256:421cda0f65a949b8b67b5e62a45071702d19ed458a3e2ba753171b0e66943210}
4848

4949
if [[ "$RUNTIME" == podman ]]; then
5050
# Podman does not support both tag and digest

go.mod

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/ingress-nginx
22

3-
go 1.20
3+
go 1.21.1
44

55
require (
66
github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a
@@ -15,7 +15,7 @@ require (
1515
github.com/moul/pb v0.0.0-20220425114252-bca18df4138c
1616
github.com/ncabatoff/process-exporter v0.7.10
1717
github.com/onsi/ginkgo/v2 v2.9.5
18-
github.com/opencontainers/runc v1.1.7
18+
github.com/opencontainers/runc v1.1.9
1919
github.com/pmezard/go-difflib v1.0.0
2020
github.com/prometheus/client_golang v1.16.0
2121
github.com/prometheus/client_model v0.4.0
@@ -25,7 +25,7 @@ require (
2525
github.com/stretchr/testify v1.8.4
2626
github.com/yudai/gojsondiff v1.0.0
2727
github.com/zakjan/cert-chain-resolver v0.0.0-20211122211144-c6b0b792af9a
28-
golang.org/x/crypto v0.11.0
28+
golang.org/x/crypto v0.13.0
2929
google.golang.org/grpc v1.56.1
3030
google.golang.org/grpc/examples v0.0.0-20221220003428-4f16fbe410f7
3131
gopkg.in/go-playground/pool.v3 v3.1.1
@@ -45,13 +45,18 @@ require (
4545
)
4646

4747
require (
48-
github.com/BurntSushi/toml v1.0.0 // indirect
48+
github.com/BurntSushi/toml v1.3.2 // indirect
4949
github.com/beorn7/perks v1.0.1 // indirect
5050
github.com/blang/semver/v4 v4.0.0 // indirect
5151
github.com/cespare/xxhash/v2 v2.2.0 // indirect
52-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
53-
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
52+
github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect
53+
github.com/cilium/ebpf v0.11.0 // indirect
54+
github.com/containerd/console v1.0.3 // indirect
55+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
56+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
57+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
5458
github.com/davecgh/go-spew v1.1.1 // indirect
59+
github.com/docker/go-units v0.5.0 // indirect
5560
github.com/eapache/queue v1.1.0 // indirect
5661
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
5762
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
@@ -63,7 +68,7 @@ require (
6368
github.com/go-openapi/jsonreference v0.20.0 // indirect
6469
github.com/go-openapi/swag v0.19.14 // indirect
6570
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
66-
github.com/godbus/dbus/v5 v5.0.6 // indirect
71+
github.com/godbus/dbus/v5 v5.1.0 // indirect
6772
github.com/gogo/protobuf v1.3.2 // indirect
6873
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6974
github.com/golang/protobuf v1.5.3 // indirect
@@ -83,34 +88,43 @@ require (
8388
github.com/mattn/go-colorable v0.1.13 // indirect
8489
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8590
github.com/mmarkdown/mmark v2.0.40+incompatible // indirect
86-
github.com/moby/sys/mountinfo v0.5.0 // indirect
91+
github.com/moby/sys/mountinfo v0.6.2 // indirect
8792
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8893
github.com/modern-go/reflect2 v1.0.2 // indirect
8994
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
95+
github.com/mrunalp/fileutils v0.5.0 // indirect
9096
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9197
github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833 // indirect
9298
github.com/onsi/ginkgo v1.16.5 // indirect
93-
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
99+
github.com/opencontainers/runtime-spec v1.1.0 // indirect
100+
github.com/opencontainers/selinux v1.11.0 // indirect
94101
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
95102
github.com/pkg/errors v0.9.1 // indirect
96103
github.com/prometheus/procfs v0.10.1 // indirect
104+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
105+
github.com/seccomp/libseccomp-golang v0.10.0 // indirect
97106
github.com/sergi/go-diff v1.1.0 // indirect
98-
github.com/sirupsen/logrus v1.8.1 // indirect
107+
github.com/sirupsen/logrus v1.9.3 // indirect
108+
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
109+
github.com/urfave/cli v1.22.14 // indirect
110+
github.com/vishvananda/netlink v1.1.0 // indirect
111+
github.com/vishvananda/netns v0.0.4 // indirect
99112
github.com/xlab/treeprint v1.1.0 // indirect
100113
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
101114
github.com/yudai/pp v2.0.1+incompatible // indirect
102115
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
103-
golang.org/x/mod v0.10.0 // indirect
104-
golang.org/x/net v0.10.0 // indirect
116+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
117+
golang.org/x/mod v0.12.0 // indirect
118+
golang.org/x/net v0.15.0 // indirect
105119
golang.org/x/oauth2 v0.8.0 // indirect
106-
golang.org/x/sys v0.10.0 // indirect
107-
golang.org/x/term v0.10.0 // indirect
108-
golang.org/x/text v0.11.0 // indirect
120+
golang.org/x/sys v0.12.0 // indirect
121+
golang.org/x/term v0.12.0 // indirect
122+
golang.org/x/text v0.13.0 // indirect
109123
golang.org/x/time v0.3.0 // indirect
110-
golang.org/x/tools v0.9.1 // indirect
124+
golang.org/x/tools v0.13.0 // indirect
111125
google.golang.org/appengine v1.6.7 // indirect
112126
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
113-
google.golang.org/protobuf v1.30.0 // indirect
127+
google.golang.org/protobuf v1.31.0 // indirect
114128
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
115129
gopkg.in/inf.v0 v0.9.1 // indirect
116130
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)