Skip to content

Commit e3f1c1f

Browse files
mlbiammlbiam
authored
Merge pull request #56 from mlbiam/master
1.0.7 build
2 parents e24311e + f8f47de commit e3f1c1f

File tree

7 files changed

+305
-271
lines changed

7 files changed

+305
-271
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
6868
- name: generate tag
6969
run: |-
70-
export PROJ_VERSION="1.0.6"
70+
export PROJ_VERSION="1.0.7"
7171
echo "Project Version: $PROJ_VERSION"
7272
echo "TAG=$PROJ_VERSION-$(echo $GITHUB_SHA | cut -c 1-6)" >> $GITHUB_ENV
7373
echo "SHORT_TAG=$PROJ_VERSION" >> $GITHUB_ENV
@@ -90,7 +90,6 @@ jobs:
9090
9191
- name: sign images
9292
run: |-
93-
cosign sign -y ${{ secrets.OU_CONTAINER_DEST }}:${{ env.TAG }}
9493
cosign sign -y ghcr.io/${{ env.REPO }}:${{ env.TAG }}
9594
9695
- uses: anchore/sbom-action@v0
@@ -107,15 +106,14 @@ jobs:
107106

108107
- name: attach sbom to images
109108
run: |-
110-
cosign attach sbom --sbom /tmp/spdxd ${{ secrets.OU_CONTAINER_DEST }}:${{ env.TAG }}
111109
cosign attach sbom --sbom /tmp/spdxg ghcr.io/${{ env.REPO }}:${{ env.TAG }}
112110
113-
DH_SBOM_SHA=$(cosign verify --certificate-oidc-issuer-regexp='.*' --certificate-identity-regexp='.*' ${{ secrets.OU_CONTAINER_DEST }}:${{ env.TAG }} 2>/dev/null | jq -r '.[0].critical.image["docker-manifest-digest"]' | cut -c 8-)
111+
114112
GH_SBOM_SHA=$(cosign verify --certificate-oidc-issuer-regexp='.*' --certificate-identity-regexp='.*' ghcr.io/${{ env.REPO }}:${{ env.TAG }} 2>/dev/null | jq -r '.[0].critical.image["docker-manifest-digest"]' | cut -c 8-)
115113

116-
echo "DH_SBOM_SHA: $DH_SBOM_SHA"
114+
117115
echo "GH_SBOM_SHA: $GH_SBOM_SHA"
118116

119-
cosign sign -y ${{ secrets.OU_CONTAINER_DEST }}:sha256-$DH_SBOM_SHA.sbom
117+
120118
cosign sign -y ghcr.io/${{ env.REPO }}:sha256-$GH_SBOM_SHA.sbom
121119

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# 1.0.7
2+
3+
**enhancements:**
4+
- change oidc config to line up with new kube authenticator [\#55](https://github.com/TremoloSecurity/kube-oidc-proxy/issues/55)
5+
6+
**tasks:**
7+
- 1.0.7 Release [\#54](https://github.com/TremoloSecurity/kube-oidc-proxy/issues/54)
8+
19
# 1.0.6
210

311
**bugs:**

‎go.mod‎

Lines changed: 76 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
module github.com/jetstack/kube-oidc-proxy
22

3-
go 1.20
3+
go 1.22.0
4+
5+
toolchain go1.23.0
46

57
require (
68
github.com/golang/mock v1.6.0
79
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
810
github.com/onsi/ginkgo v1.16.5
9-
github.com/onsi/gomega v1.30.0
11+
github.com/onsi/gomega v1.34.2
1012
github.com/sebest/xff v0.0.0-20210106013422-671bd2870b3a
1113
github.com/sirupsen/logrus v1.9.3
12-
github.com/spf13/cobra v1.8.0
14+
github.com/spf13/cobra v1.8.1
1315
github.com/spf13/pflag v1.0.5
14-
golang.org/x/term v0.14.0
16+
golang.org/x/term v0.24.0
1517
gopkg.in/square/go-jose.v2 v2.6.0
16-
k8s.io/api v0.28.4
17-
k8s.io/apimachinery v0.28.4
18-
k8s.io/apiserver v0.28.4
19-
k8s.io/cli-runtime v0.28.4
20-
k8s.io/client-go v0.28.4
21-
k8s.io/component-base v0.28.4
22-
k8s.io/klog/v2 v2.110.1
23-
sigs.k8s.io/kind v0.20.0
18+
k8s.io/api v0.31.1
19+
k8s.io/apimachinery v0.31.1
20+
k8s.io/apiserver v0.31.1
21+
k8s.io/cli-runtime v0.31.1
22+
k8s.io/client-go v0.31.1
23+
k8s.io/component-base v0.31.1
24+
k8s.io/klog/v2 v2.130.1
25+
sigs.k8s.io/kind v0.24.0
2426
)
2527

2628
replace (
@@ -31,113 +33,115 @@ replace (
3133
)
3234

3335
require (
34-
github.com/BurntSushi/toml v1.0.0 // indirect
36+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
37+
github.com/BurntSushi/toml v1.4.0 // indirect
3538
github.com/NYTimes/gziphandler v1.1.1 // indirect
36-
github.com/alessio/shellescape v1.4.1 // indirect
37-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
39+
github.com/alessio/shellescape v1.4.2 // indirect
40+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3841
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3942
github.com/beorn7/perks v1.0.1 // indirect
4043
github.com/blang/semver/v4 v4.0.0 // indirect
41-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
42-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
44+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
45+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4346
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
4447
github.com/coreos/go-semver v0.3.1 // indirect
4548
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
46-
github.com/davecgh/go-spew v1.1.1 // indirect
47-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
48-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
49+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
50+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4951
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5052
github.com/felixge/httpsnoop v1.0.4 // indirect
51-
github.com/fsnotify/fsnotify v1.6.0 // indirect
53+
github.com/fsnotify/fsnotify v1.7.0 // indirect
54+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5255
github.com/go-errors/errors v1.4.2 // indirect
53-
github.com/go-logr/logr v1.3.0 // indirect
56+
github.com/go-logr/logr v1.4.2 // indirect
5457
github.com/go-logr/stdr v1.2.2 // indirect
5558
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5659
github.com/go-openapi/jsonreference v0.20.2 // indirect
57-
github.com/go-openapi/swag v0.22.3 // indirect
60+
github.com/go-openapi/swag v0.22.4 // indirect
5861
github.com/gogo/protobuf v1.3.2 // indirect
5962
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
60-
github.com/golang/protobuf v1.5.3 // indirect
63+
github.com/golang/protobuf v1.5.4 // indirect
6164
github.com/google/btree v1.0.1 // indirect
62-
github.com/google/cel-go v0.16.1 // indirect
65+
github.com/google/cel-go v0.20.1 // indirect
6366
github.com/google/gnostic-models v0.6.8 // indirect
6467
github.com/google/go-cmp v0.6.0 // indirect
6568
github.com/google/gofuzz v1.2.0 // indirect
6669
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
6770
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
68-
github.com/google/uuid v1.3.1 // indirect
71+
github.com/google/uuid v1.6.0 // indirect
72+
github.com/gorilla/websocket v1.5.0 // indirect
6973
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
7074
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
71-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
75+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
7276
github.com/imdario/mergo v0.3.6 // indirect
7377
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7478
github.com/josharian/intern v1.0.0 // indirect
7579
github.com/json-iterator/go v1.1.12 // indirect
7680
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
7781
github.com/mailru/easyjson v0.7.7 // indirect
78-
github.com/mattn/go-isatty v0.0.14 // indirect
79-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
80-
github.com/moby/spdystream v0.2.0 // indirect
82+
github.com/mattn/go-isatty v0.0.20 // indirect
83+
github.com/moby/spdystream v0.4.0 // indirect
84+
github.com/moby/term v0.5.0 // indirect
8185
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8286
github.com/modern-go/reflect2 v1.0.2 // indirect
8387
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
8488
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
89+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8590
github.com/nxadm/tail v1.4.8 // indirect
86-
github.com/pelletier/go-toml v1.9.4 // indirect
91+
github.com/pelletier/go-toml v1.9.5 // indirect
8792
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
8893
github.com/pkg/errors v0.9.1 // indirect
8994
github.com/pquerna/cachecontrol v0.1.0 // indirect
90-
github.com/prometheus/client_golang v1.16.0 // indirect
91-
github.com/prometheus/client_model v0.4.0 // indirect
92-
github.com/prometheus/common v0.44.0 // indirect
93-
github.com/prometheus/procfs v0.10.1 // indirect
95+
github.com/prometheus/client_golang v1.19.1 // indirect
96+
github.com/prometheus/client_model v0.6.1 // indirect
97+
github.com/prometheus/common v0.55.0 // indirect
98+
github.com/prometheus/procfs v0.15.1 // indirect
9499
github.com/stoewer/go-strcase v1.2.0 // indirect
100+
github.com/x448/float16 v0.8.4 // indirect
95101
github.com/xlab/treeprint v1.2.0 // indirect
96-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
97-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
98-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
99-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
100-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
101-
go.opentelemetry.io/otel v1.21.0 // indirect
102-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
103-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
104-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
105-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
106-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
107-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
102+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
103+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
104+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
105+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
106+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
107+
go.opentelemetry.io/otel v1.28.0 // indirect
108+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
109+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
110+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
111+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
112+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
113+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
108114
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
109-
go.uber.org/atomic v1.10.0 // indirect
110115
go.uber.org/multierr v1.11.0 // indirect
111-
go.uber.org/zap v1.19.0 // indirect
112-
golang.org/x/crypto v0.15.0 // indirect
113-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
114-
golang.org/x/mod v0.12.0 // indirect
115-
golang.org/x/net v0.18.0 // indirect
116-
golang.org/x/oauth2 v0.11.0 // indirect
117-
golang.org/x/sync v0.3.0 // indirect
118-
golang.org/x/sys v0.14.0 // indirect
119-
golang.org/x/text v0.14.0 // indirect
116+
go.uber.org/zap v1.26.0 // indirect
117+
golang.org/x/crypto v0.26.0 // indirect
118+
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
119+
golang.org/x/mod v0.20.0 // indirect
120+
golang.org/x/net v0.28.0 // indirect
121+
golang.org/x/oauth2 v0.21.0 // indirect
122+
golang.org/x/sync v0.8.0 // indirect
123+
golang.org/x/sys v0.25.0 // indirect
124+
golang.org/x/text v0.17.0 // indirect
120125
golang.org/x/time v0.3.0 // indirect
121-
golang.org/x/tools v0.12.0 // indirect
122-
google.golang.org/appengine v1.6.7 // indirect
123-
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
124-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
125-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
126-
google.golang.org/grpc v1.59.0 // indirect
127-
google.golang.org/protobuf v1.31.0 // indirect
126+
golang.org/x/tools v0.24.0 // indirect
127+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
128+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
129+
google.golang.org/grpc v1.65.0 // indirect
130+
google.golang.org/protobuf v1.34.2 // indirect
128131
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
132+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
129133
gopkg.in/inf.v0 v0.9.1 // indirect
130134
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
131135
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
132136
gopkg.in/yaml.v2 v2.4.0 // indirect
133137
gopkg.in/yaml.v3 v3.0.1 // indirect
134-
k8s.io/kms v0.28.4 // indirect
135-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
136-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
137-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
138+
k8s.io/kms v0.31.1 // indirect
139+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
140+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
141+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
138142
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
139-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
140-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
141-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
142-
sigs.k8s.io/yaml v1.3.0 // indirect
143+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
144+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
145+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
146+
sigs.k8s.io/yaml v1.4.0 // indirect
143147
)

0 commit comments

Comments
 (0)