Skip to content

Commit e7a7a8d

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2129 from chiragkyal/custom-host
OCPBUGS-34373: Bump library-go to fix routes/custom-host permission for externalCertificate
2 parents d831e17 + 1140fa4 commit e7a7a8d

File tree

28 files changed

+49
-117
lines changed

28 files changed

+49
-117
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ require (
5151
github.com/openshift/api v0.0.0-20241001152557-e415140e5d5f
5252
github.com/openshift/apiserver-library-go v0.0.0-20241001175710-6064b62894a6
5353
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
54-
github.com/openshift/library-go v0.0.0-20241001171606-756adf2188fc
54+
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060
5555
github.com/pkg/errors v0.9.1
5656
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
5757
github.com/prometheus/client_golang v1.19.1

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,8 @@ github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWpri
506506
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f/go.mod h1:KiZi2mJRH1TOJ3FtBDYS6YvUL30s/iIXaGSUrSa36mo=
507507
github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2 h1:ls1C5cvJbA5CbOwbA4Nx/W+tRvXgKDc9XT81bg3sxCA=
508508
github.com/openshift/google-cadvisor v0.49.0-openshift-4.17-2/go.mod h1:s6Fqwb2KiWG6leCegVhw4KW40tf9f7m+SF1aXiE8Wsk=
509-
github.com/openshift/library-go v0.0.0-20241001171606-756adf2188fc h1:QXYkFJn7wLTHAI56l+9DJnLrNynGtXjyOZLgiIglTnE=
510-
github.com/openshift/library-go v0.0.0-20241001171606-756adf2188fc/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
509+
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 h1:jiDC7d8d+jmjv2WfiMY0+Uf55q11MGyYkGGqXnfqWTU=
510+
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0=
511511
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240806135314-3946b2b7b2a8 h1:HJvLw9nNfoqCs16h505eP8E1kVmq6KNdzGm5csPlYsQ=
512512
github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240806135314-3946b2b7b2a8/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
513513
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

‎openshift-kube-apiserver/admission/route/hostassignment/admission.go

-5
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,6 @@ func (a *hostAssignment) Admit(ctx context.Context, attributes admission.Attribu
136136
return errors.NewInvalid(attributes.GetKind().GroupKind(), attributes.GetName(), errs)
137137
}
138138

139-
errs = hostassignment.ValidateHostExternalCertificate(ctx, r, old, a.sarClient, a.validationOpts)
140-
if len(errs) > 0 {
141-
return errors.NewInvalid(attributes.GetKind().GroupKind(), attributes.GetName(), errs)
142-
}
143-
144139
errs = hostassignment.ValidateHostUpdate(ctx, r, old, a.sarClient, a.validationOpts)
145140
if len(errs) > 0 {
146141
return errors.NewInvalid(attributes.GetKind().GroupKind(), attributes.GetName(), errs)

‎staging/src/k8s.io/api/go.sum

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

‎staging/src/k8s.io/apiextensions-apiserver/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ require (
7878
github.com/modern-go/reflect2 v1.0.2 // indirect
7979
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8080
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
81-
github.com/openshift/library-go v0.0.0-20241001171606-756adf2188fc // indirect
81+
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 // indirect
8282
github.com/pkg/errors v0.9.1 // indirect
8383
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
8484
github.com/prometheus/client_golang v1.19.1 // indirect

‎staging/src/k8s.io/apiextensions-apiserver/go.sum

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

‎staging/src/k8s.io/apiserver/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
2121
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
2222
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
23-
github.com/openshift/library-go v0.0.0-20241001171606-756adf2188fc
23+
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060
2424
github.com/spf13/pflag v1.0.5
2525
github.com/stretchr/testify v1.9.0
2626
go.etcd.io/etcd/api/v3 v3.5.14

‎staging/src/k8s.io/apiserver/go.sum

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

‎staging/src/k8s.io/cloud-provider/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ require (
6060
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6161
github.com/modern-go/reflect2 v1.0.2 // indirect
6262
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
63-
github.com/openshift/library-go v0.0.0-20241001171606-756adf2188fc // indirect
63+
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 // indirect
6464
github.com/pkg/errors v0.9.1 // indirect
6565
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6666
github.com/prometheus/client_golang v1.19.1 // indirect

‎staging/src/k8s.io/cloud-provider/go.sum

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

‎staging/src/k8s.io/component-base/go.sum

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

‎staging/src/k8s.io/component-helpers/go.sum

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

‎staging/src/k8s.io/controller-manager/go.sum

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

‎staging/src/k8s.io/dynamic-resource-allocation/go.sum

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

‎staging/src/k8s.io/kube-aggregator/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ require (
6565
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6666
github.com/modern-go/reflect2 v1.0.2 // indirect
6767
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
68-
github.com/openshift/library-go v0.0.0-20241001171606-756adf2188fc // indirect
68+
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 // indirect
6969
github.com/pkg/errors v0.9.1 // indirect
7070
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7171
github.com/prometheus/client_golang v1.19.1 // indirect

‎staging/src/k8s.io/kube-aggregator/go.sum

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

‎staging/src/k8s.io/kube-controller-manager/go.sum

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

‎staging/src/k8s.io/kubelet/go.sum

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

‎staging/src/k8s.io/pod-security-admission/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ require (
5858
github.com/modern-go/reflect2 v1.0.2 // indirect
5959
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6060
github.com/onsi/gomega v1.33.1 // indirect
61-
github.com/openshift/library-go v0.0.0-20241001171606-756adf2188fc // indirect
61+
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 // indirect
6262
github.com/pkg/errors v0.9.1 // indirect
6363
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6464
github.com/prometheus/client_golang v1.19.1 // indirect

‎staging/src/k8s.io/pod-security-admission/go.sum

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

‎staging/src/k8s.io/sample-apiserver/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ require (
5555
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5656
github.com/modern-go/reflect2 v1.0.2 // indirect
5757
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
58-
github.com/openshift/library-go v0.0.0-20241001171606-756adf2188fc // indirect
58+
github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 // indirect
5959
github.com/pkg/errors v0.9.1 // indirect
6060
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6161
github.com/prometheus/client_golang v1.19.1 // indirect

0 commit comments

Comments
 (0)