Skip to content

Commit 9c7efcb

Browse files
authored
Merge pull request #137 from openshift-kni/bump-deps-apiserver
[KNI] deps: consume apiserver fixes
2 parents 0049ae5 + c624909 commit 9c7efcb

File tree

25 files changed

+347
-97
lines changed

25 files changed

+347
-97
lines changed

go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ require (
5757
github.com/gogo/protobuf v1.3.2 // indirect
5858
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5959
github.com/golang/protobuf v1.5.2 // indirect
60-
github.com/google/cel-go v0.12.6 // indirect
60+
github.com/google/cel-go v0.12.7 // indirect
6161
github.com/google/gnostic v0.5.7-v3refs // indirect
6262
github.com/google/gofuzz v1.1.0 // indirect
6363
github.com/google/uuid v1.3.0 // indirect
@@ -91,7 +91,7 @@ require (
9191
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
9292
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
9393
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
94-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
94+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
9595
go.opentelemetry.io/otel v1.10.0 // indirect
9696
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
9797
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
@@ -106,7 +106,7 @@ require (
106106
golang.org/x/crypto v0.14.0 // indirect
107107
golang.org/x/exp v0.0.0-20210220032938-85be41e4509f // indirect
108108
golang.org/x/mod v0.9.0 // indirect
109-
golang.org/x/net v0.10.0 // indirect
109+
golang.org/x/net v0.17.0 // indirect
110110
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
111111
golang.org/x/sync v0.1.0 // indirect
112112
golang.org/x/sys v0.13.0 // indirect
@@ -140,8 +140,8 @@ require (
140140
replace (
141141
k8s.io/api => k8s.io/api v0.26.7
142142
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.7
143-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.7
144-
k8s.io/apiserver => k8s.io/apiserver v0.26.7
143+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.10-0.20231013031804-4eaec8069337
144+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20231013073434-9cb9f629e95d
145145
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.7
146146
k8s.io/client-go => k8s.io/client-go v0.26.7
147147
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.7

go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
218218
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
219219
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
220220
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
221-
github.com/google/cel-go v0.12.6 h1:kjeKudqV0OygrAqA9fX6J55S8gj+Jre2tckIm5RoG4M=
222-
github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
221+
github.com/google/cel-go v0.12.7 h1:jM6p55R0MKBg79hZjn1zs2OlrywZ1Vk00rxVvad1/O0=
222+
github.com/google/cel-go v0.12.7/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
223223
github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
224224
github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
225225
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -500,8 +500,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
500500
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
501501
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 h1:xFSRQBbXF6VvYRf2lqMJXxoB72XI1K/azav8TekHHSw=
502502
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0/go.mod h1:h8TWwRAhQpOd0aM5nYsRD8+flnkj+526GEIVlarH7eY=
503-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 h1:Ajldaqhxqw/gNzQA45IKFWLdG7jZuXX/wBW1d5qvbUI=
504-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0/go.mod h1:9NiG9I2aHTKkcxqCILhjtyNA1QEiCjdBACv4IvrFQ+c=
503+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 h1:sxoY9kG1s1WpSYNyzm24rlwH4lnRYFXUVVBmKMBfRgw=
504+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1/go.mod h1:9NiG9I2aHTKkcxqCILhjtyNA1QEiCjdBACv4IvrFQ+c=
505505
go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4=
506506
go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ=
507507
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 h1:TaB+1rQhddO1sF71MpZOZAuSPW1klK2M8XxfrBMfK7Y=
@@ -850,10 +850,10 @@ k8s.io/api v0.26.7 h1:Lf4iEBEJb5OFNmawtBfSZV/UNi9riSJ0t1qdhyZqI40=
850850
k8s.io/api v0.26.7/go.mod h1:Vk9bMadzA49UHPmHB//lX7VRCQSXGoVwfLd3Sc1SSXI=
851851
k8s.io/apiextensions-apiserver v0.26.7 h1:L7ImW831auK1ZQBtNJPaG5qyrFxeISEBlgfZJfnaIPk=
852852
k8s.io/apiextensions-apiserver v0.26.7/go.mod h1:3DbZBfS3kO7/Jaj7qqzcBtPcKP0/KcklyAnk8zc+fs4=
853-
k8s.io/apimachinery v0.26.7 h1:590jSBwaSHCAFCqltaEogY/zybFlhGsnLteLpuF2wig=
854-
k8s.io/apimachinery v0.26.7/go.mod h1:qYzLkrQ9lhrZRh0jNKo2cfvf/R1/kQONnSiyB7NUJU0=
855-
k8s.io/apiserver v0.26.7 h1:NX/zBZZn4R+Cq6shwyn8Pn8REd0yJJ16dbtv9WkEVEU=
856-
k8s.io/apiserver v0.26.7/go.mod h1:r0wDRWHI7VL/KlQLTkJJBVGZ3KeNfv+VetlyRtr86xs=
853+
k8s.io/apimachinery v0.26.10-0.20231013031804-4eaec8069337 h1:EFmhWOObora6Lls8QMTY5KutQK+cTYvpOp0TRyD7dn0=
854+
k8s.io/apimachinery v0.26.10-0.20231013031804-4eaec8069337/go.mod h1:iT1ZP4JBP34wwM+ZQ8ByPEQ81u043iqAcsJYftX9amM=
855+
k8s.io/apiserver v0.0.0-20231013073434-9cb9f629e95d h1:RkFi8em4g+Cd0uBw4vYn4gcPhvRwd8rwBOlnFK9f4jI=
856+
k8s.io/apiserver v0.0.0-20231013073434-9cb9f629e95d/go.mod h1:S/x9DgQUJhBfof88gqRgfF43ESaV1NZDqfaPa+GSEIw=
857857
k8s.io/client-go v0.26.7 h1:hyU9aKHlwVOykgyxzGYkrDSLCc4+mimZVyUJjPyUn1E=
858858
k8s.io/client-go v0.26.7/go.mod h1:okYjy0jtq6sdeztALDvCh24tg4opOQS1XNvsJlERDAo=
859859
k8s.io/cloud-provider v0.26.7 h1:J4wYrZ+pvNMQULvNuChLdYXLGf8veBX+vUVfgwo+eoU=

vendor/github.com/google/cel-go/checker/cost.go

+14-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/handler.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/version.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go

+9-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/dispatcher.go

+13-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/dispatcher.go

+16-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiserver/pkg/cel/library/cost.go

+43-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiserver/pkg/endpoints/filters/authentication.go

+38
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiserver/pkg/endpoints/handlers/patch.go

-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/apiserver/pkg/endpoints/handlers/update.go

-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)