Skip to content

Commit 1f957b5

Browse files
authored
Merge pull request #86 from rimolive/rmartine-keep-rebasing
Fix CVEs for k8s APIs and tekton
2 parents 5a626b4 + 0ecd25b commit 1f957b5

File tree

2 files changed

+78
-411
lines changed

2 files changed

+78
-411
lines changed

go.mod

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ require (
1717
github.com/go-openapi/validate v0.20.3
1818
github.com/go-sql-driver/mysql v1.7.1
1919
github.com/golang/glog v1.2.0
20-
github.com/golang/protobuf v1.5.3
20+
github.com/golang/protobuf v1.5.4
2121
github.com/google/addlicense v0.0.0-20200906110928-a0294312aa76
22-
github.com/google/cel-go v0.12.6
22+
github.com/google/cel-go v0.12.7
2323
github.com/google/go-cmp v0.6.0
2424
github.com/google/uuid v1.5.0
2525
github.com/gorilla/mux v1.8.0
@@ -51,12 +51,12 @@ require (
5151
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect
5252
google.golang.org/grpc v1.60.1
5353
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
54-
google.golang.org/protobuf v1.32.0
54+
google.golang.org/protobuf v1.33.0
5555
gopkg.in/yaml.v3 v3.0.1
56-
k8s.io/api v0.27.2
57-
k8s.io/apimachinery v0.27.3
58-
k8s.io/client-go v0.27.2
59-
k8s.io/code-generator v0.27.2
56+
k8s.io/api v0.27.16
57+
k8s.io/apimachinery v0.27.16
58+
k8s.io/client-go v0.27.16
59+
k8s.io/code-generator v0.27.16
6060
k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
6161
knative.dev/pkg v0.0.0-20231023150739-56bfe0dd9626
6262
sigs.k8s.io/controller-runtime v0.11.1
@@ -116,7 +116,7 @@ require (
116116
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
117117
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
118118
github.com/gorilla/websocket v1.5.0 // indirect
119-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
119+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
120120
github.com/hashicorp/errwrap v1.1.0 // indirect
121121
github.com/hashicorp/go-multierror v1.1.1 // indirect
122122
github.com/hashicorp/go-uuid v1.0.3 // indirect
@@ -197,7 +197,7 @@ require (
197197
gopkg.in/ini.v1 v1.67.0 // indirect
198198
gopkg.in/yaml.v2 v2.4.0 // indirect
199199
k8s.io/apiextensions-apiserver v0.27.2 // indirect
200-
k8s.io/component-base v0.27.2 // indirect
200+
k8s.io/component-base v0.27.16 // indirect
201201
k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 // indirect
202202
k8s.io/klog/v2 v2.100.1 // indirect
203203
k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 // indirect
@@ -206,12 +206,16 @@ require (
206206
)
207207

208208
replace (
209+
github.com/containerd/containerd => github.com/containerd/containerd v1.7.13
209210
github.com/kubeflow/kfp-tekton/tekton-catalog/cache => github.com/kubeflow/kfp-tekton/tekton-catalog/cache v0.0.0-20231127195001-a75d4b3711ff
210211
github.com/kubeflow/kfp-tekton/tekton-catalog/objectstore => github.com/kubeflow/kfp-tekton/tekton-catalog/objectstore v0.0.0-20231127195001-a75d4b3711ff
212+
github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.12
211213
k8s.io/api => k8s.io/api v0.25.9
212-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.5
214+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.16
215+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.15
213216
k8s.io/client-go => k8s.io/client-go v0.25.9
214217
k8s.io/code-generator => k8s.io/code-generator v0.25.9
218+
k8s.io/component-bsae => k8s.io/component-base v0.27.16
215219
k8s.io/kubernetes => k8s.io/kubernetes v1.11.1
216220
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.2.9
217221
)

0 commit comments

Comments
 (0)