Skip to content

Commit f5e3cbd

Browse files
ibihimibihim
authored
Merge pull request #309 from ibihim/rc-v0.18.1
bump deps and cut release v0.18.1
2 parents 7946418 + 3479918 commit f5e3cbd

File tree

16 files changed

+229
-243
lines changed

16 files changed

+229
-243
lines changed

‎.github/workflows/build.yml

+21-24
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
name: Go
2-
32
on: [push, pull_request]
4-
53
env:
64
QUAY_PATH: quay.io/brancz/kube-rbac-proxy
7-
go-version: '1.22.4'
8-
kind-version: 'v0.20.0'
9-
5+
go-version: '1.23'
6+
kind-version: 'v0.24.0'
107
jobs:
118
check-license:
129
runs-on: ubuntu-latest
@@ -83,23 +80,23 @@ jobs:
8380
name: Publish container image to Quay
8481
if: github.event_name == 'push'
8582
needs:
86-
- check-license
87-
- generate
88-
- build
89-
- unit-tests
90-
- e2e-tests
83+
- check-license
84+
- generate
85+
- build
86+
- unit-tests
87+
- e2e-tests
9188
steps:
92-
- name: Checkout
93-
uses: actions/checkout@v2
94-
- name: Setup golang for building
95-
uses: actions/setup-go@v2
96-
with:
97-
go-version: ${{ env.go-version }}
98-
- name: Login to Quay.io
99-
uses: docker/login-action@v1
100-
with:
101-
registry: quay.io
102-
username: ${{ secrets.QUAY_USERNAME }}
103-
password: ${{ secrets.QUAY_PASSWORD }}
104-
- name: Build images and push
105-
run: ./scripts/publish.sh
89+
- name: Checkout
90+
uses: actions/checkout@v2
91+
- name: Setup golang for building
92+
uses: actions/setup-go@v2
93+
with:
94+
go-version: ${{ env.go-version }}
95+
- name: Login to Quay.io
96+
uses: docker/login-action@v1
97+
with:
98+
registry: quay.io
99+
username: ${{ secrets.QUAY_USERNAME }}
100+
password: ${{ secrets.QUAY_PASSWORD }}
101+
- name: Build images and push
102+
run: ./scripts/publish.sh

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.18.1 / 2024-06-05
2+
3+
- [ENHANCEMENT] Bump deps, in particular go-jose and golang (->CVE) and k8s (v1.31)
4+
15
## 0.18.0 / 2024-06-05
26

37
- [ENHANCEMENT] Bump deps, in particular otel (>CVE) and k8s (v1.30)

‎RELEASE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Release shepherds are chosen on a voluntary basis.
88
| release series | date of release (year-month-day) | release shepherd |
99
|----------------|----------------------------------|---------------------------------------------|
1010
| v0.19.0 | TBD | Krzysztof Ostrowski (GitHub: @ibihim) |
11+
| v0.18.1 | 2024-08-30 | Krzysztof Ostrowski (GitHub: @ibihim) |
1112
| v0.18.0 | 2024-06-05 | Krzysztof Ostrowski (GitHub: @ibihim) |
1213
| v0.17.1 | 2024-05-07 | Krzysztof Ostrowski (GitHub: @ibihim) |
1314
| v0.17.0 | 2024-04-18 | Krzysztof Ostrowski (GitHub: @ibihim) |
@@ -143,4 +144,3 @@ to be pushed to Quay.io.
143144

144145
If the release has happened in the latest release branch, merge the changes into
145146
main.
146-

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.18.0
1+
v0.18.1

‎examples/non-resource-url-token-request/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ spec:
7878
serviceAccountName: kube-rbac-proxy
7979
containers:
8080
- name: kube-rbac-proxy
81-
image: quay.io/brancz/kube-rbac-proxy:v0.18.0
81+
image: quay.io/brancz/kube-rbac-proxy:v0.18.1
8282
args:
8383
- "--secure-listen-address=0.0.0.0:8443"
8484
- "--upstream=http://127.0.0.1:8081/"

‎examples/non-resource-url-token-request/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
serviceAccountName: kube-rbac-proxy
6464
containers:
6565
- name: kube-rbac-proxy
66-
image: quay.io/brancz/kube-rbac-proxy:v0.18.0
66+
image: quay.io/brancz/kube-rbac-proxy:v0.18.1
6767
args:
6868
- "--secure-listen-address=0.0.0.0:8443"
6969
- "--upstream=http://127.0.0.1:8081/"

‎examples/non-resource-url/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ spec:
8181
serviceAccountName: kube-rbac-proxy
8282
containers:
8383
- name: kube-rbac-proxy
84-
image: quay.io/brancz/kube-rbac-proxy:v0.18.0
84+
image: quay.io/brancz/kube-rbac-proxy:v0.18.1
8585
args:
8686
- "--secure-listen-address=0.0.0.0:8443"
8787
- "--upstream=http://127.0.0.1:8081/"

‎examples/non-resource-url/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
serviceAccountName: kube-rbac-proxy
6464
containers:
6565
- name: kube-rbac-proxy
66-
image: quay.io/brancz/kube-rbac-proxy:v0.18.0
66+
image: quay.io/brancz/kube-rbac-proxy:v0.18.1
6767
args:
6868
- "--secure-listen-address=0.0.0.0:8443"
6969
- "--upstream=http://127.0.0.1:8081/"

‎examples/oidc/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
serviceAccountName: kube-rbac-proxy
6767
containers:
6868
- name: kube-rbac-proxy
69-
image: quay.io/brancz/kube-rbac-proxy:v0.18.0
69+
image: quay.io/brancz/kube-rbac-proxy:v0.18.1
7070
args:
7171
- "--insecure-listen-address=0.0.0.0:8444"
7272
- "--upstream=http://127.0.0.1:8081/"

‎examples/resource-attributes/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ spec:
9595
serviceAccountName: kube-rbac-proxy
9696
containers:
9797
- name: kube-rbac-proxy
98-
image: quay.io/brancz/kube-rbac-proxy:v0.18.0
98+
image: quay.io/brancz/kube-rbac-proxy:v0.18.1
9999
args:
100100
- "--secure-listen-address=0.0.0.0:8443"
101101
- "--upstream=http://127.0.0.1:8081/"

‎examples/resource-attributes/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ spec:
7777
serviceAccountName: kube-rbac-proxy
7878
containers:
7979
- name: kube-rbac-proxy
80-
image: quay.io/brancz/kube-rbac-proxy:v0.18.0
80+
image: quay.io/brancz/kube-rbac-proxy:v0.18.1
8181
args:
8282
- "--secure-listen-address=0.0.0.0:8443"
8383
- "--upstream=http://127.0.0.1:8081/"

‎examples/rewrites/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ spec:
9797
serviceAccountName: kube-rbac-proxy
9898
containers:
9999
- name: kube-rbac-proxy
100-
image: quay.io/brancz/kube-rbac-proxy:v0.18.0
100+
image: quay.io/brancz/kube-rbac-proxy:v0.18.1
101101
args:
102102
- "--secure-listen-address=0.0.0.0:8443"
103103
- "--upstream=http://127.0.0.1:8081/"

‎examples/rewrites/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
serviceAccountName: kube-rbac-proxy
8080
containers:
8181
- name: kube-rbac-proxy
82-
image: quay.io/brancz/kube-rbac-proxy:v0.18.0
82+
image: quay.io/brancz/kube-rbac-proxy:v0.18.1
8383
args:
8484
- "--secure-listen-address=0.0.0.0:8443"
8585
- "--upstream=http://127.0.0.1:8081/"

‎go.mod

+56-55
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,111 @@
11
module github.com/brancz/kube-rbac-proxy
22

3-
go 1.22.0
4-
5-
toolchain go1.22.3
3+
go 1.23
64

75
require (
86
github.com/ghodss/yaml v1.0.0
97
github.com/google/go-cmp v0.6.0
108
github.com/oklog/run v1.1.0
11-
github.com/spf13/cobra v1.8.0
9+
github.com/spf13/cobra v1.8.1
1210
github.com/spf13/pflag v1.0.5
13-
golang.org/x/net v0.26.0
11+
golang.org/x/net v0.28.0
1412
gopkg.in/yaml.v2 v2.4.0
15-
k8s.io/api v0.30.1
16-
k8s.io/apimachinery v0.30.1
17-
k8s.io/apiserver v0.30.1
18-
k8s.io/client-go v0.30.1
19-
k8s.io/component-base v0.30.1
20-
k8s.io/klog/v2 v2.120.1
13+
k8s.io/api v0.31.0
14+
k8s.io/apimachinery v0.31.0
15+
k8s.io/apiserver v0.31.0
16+
k8s.io/client-go v0.31.0
17+
k8s.io/component-base v0.31.0
18+
k8s.io/klog/v2 v2.130.1
2119
)
2220

2321
require (
2422
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2523
github.com/NYTimes/gziphandler v1.1.1 // indirect
26-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
24+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2725
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2826
github.com/beorn7/perks v1.0.1 // indirect
2927
github.com/blang/semver/v4 v4.0.0 // indirect
30-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
31-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
28+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
29+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3230
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
3331
github.com/coreos/go-semver v0.3.1 // indirect
3432
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
35-
github.com/davecgh/go-spew v1.1.1 // indirect
33+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3634
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
37-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
38-
github.com/felixge/httpsnoop v1.0.3 // indirect
35+
github.com/felixge/httpsnoop v1.0.4 // indirect
3936
github.com/fsnotify/fsnotify v1.7.0 // indirect
40-
github.com/go-logr/logr v1.4.1 // indirect
37+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
38+
github.com/go-logr/logr v1.4.2 // indirect
4139
github.com/go-logr/stdr v1.2.2 // indirect
4240
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4341
github.com/go-openapi/jsonreference v0.20.2 // indirect
44-
github.com/go-openapi/swag v0.22.3 // indirect
42+
github.com/go-openapi/swag v0.22.4 // indirect
4543
github.com/gogo/protobuf v1.3.2 // indirect
4644
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4745
github.com/golang/protobuf v1.5.4 // indirect
48-
github.com/google/cel-go v0.17.8 // indirect
46+
github.com/google/cel-go v0.20.1 // indirect
4947
github.com/google/gnostic-models v0.6.8 // indirect
5048
github.com/google/gofuzz v1.2.0 // indirect
5149
github.com/google/uuid v1.6.0 // indirect
5250
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
53-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
51+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
5452
github.com/imdario/mergo v0.3.6 // indirect
5553
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5654
github.com/josharian/intern v1.0.0 // indirect
5755
github.com/json-iterator/go v1.1.12 // indirect
5856
github.com/mailru/easyjson v0.7.7 // indirect
59-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
60-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
57+
github.com/moby/term v0.5.0 // indirect
6158
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6259
github.com/modern-go/reflect2 v1.0.2 // indirect
6360
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6461
github.com/pkg/errors v0.9.1 // indirect
6562
github.com/pquerna/cachecontrol v0.1.0 // indirect
66-
github.com/prometheus/client_golang v1.16.0 // indirect
67-
github.com/prometheus/client_model v0.4.0 // indirect
68-
github.com/prometheus/common v0.44.0 // indirect
69-
github.com/prometheus/procfs v0.10.1 // indirect
63+
github.com/prometheus/client_golang v1.19.1 // indirect
64+
github.com/prometheus/client_model v0.6.1 // indirect
65+
github.com/prometheus/common v0.55.0 // indirect
66+
github.com/prometheus/procfs v0.15.1 // indirect
7067
github.com/stoewer/go-strcase v1.2.0 // indirect
71-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
72-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
73-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
74-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect
75-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
76-
go.opentelemetry.io/otel v1.26.0 // indirect
77-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
78-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
79-
go.opentelemetry.io/otel/metric v1.26.0 // indirect
80-
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
81-
go.opentelemetry.io/otel/trace v1.26.0 // indirect
82-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
68+
github.com/x448/float16 v0.8.4 // indirect
69+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
70+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
71+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
72+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
73+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
74+
go.opentelemetry.io/otel v1.28.0 // indirect
75+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
76+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
77+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
78+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
79+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
80+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
8381
go.uber.org/multierr v1.11.0 // indirect
8482
go.uber.org/zap v1.26.0 // indirect
85-
golang.org/x/crypto v0.24.0 // indirect
86-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
87-
golang.org/x/oauth2 v0.18.0 // indirect
88-
golang.org/x/sync v0.7.0 // indirect
89-
golang.org/x/sys v0.21.0 // indirect
90-
golang.org/x/term v0.21.0 // indirect
91-
golang.org/x/text v0.16.0 // indirect
83+
golang.org/x/crypto v0.26.0 // indirect
84+
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
85+
golang.org/x/oauth2 v0.21.0 // indirect
86+
golang.org/x/sync v0.8.0 // indirect
87+
golang.org/x/sys v0.23.0 // indirect
88+
golang.org/x/term v0.23.0 // indirect
89+
golang.org/x/text v0.17.0 // indirect
9290
golang.org/x/time v0.3.0 // indirect
93-
google.golang.org/appengine v1.6.8 // indirect
9491
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
95-
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
96-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
97-
google.golang.org/grpc v1.64.1 // indirect
98-
google.golang.org/protobuf v1.34.1 // indirect
92+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
93+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
94+
google.golang.org/grpc v1.65.0 // indirect
95+
google.golang.org/protobuf v1.34.2 // indirect
96+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
97+
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
9998
gopkg.in/inf.v0 v0.9.1 // indirect
10099
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
101100
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
102101
gopkg.in/yaml.v3 v3.0.1 // indirect
103-
k8s.io/kms v0.30.1 // indirect
102+
k8s.io/kms v0.31.0 // indirect
104103
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
105-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
106-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
104+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
105+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
107106
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
108107
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
109-
sigs.k8s.io/yaml v1.3.0 // indirect
108+
sigs.k8s.io/yaml v1.4.0 // indirect
110109
)
110+
111+
replace gopkg.in/square/go-jose.v2 => github.com/go-jose/go-jose v2.6.3+incompatible

0 commit comments

Comments
 (0)