Skip to content

Commit e2d00b2

Browse files
Merge pull request #942 from flavianmissi/OCPBUGS-20710
[release-4.14] OCPBUGS-20710: mitigate effects of rapid reset
2 parents b0ee859 + 5660145 commit e2d00b2

File tree

219 files changed

+21161
-4743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+21161
-4743
lines changed

go.mod

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@ require (
2929
github.com/gophercloud/utils v0.0.0-20221124081324-7bac6f5cdf99
3030
github.com/goware/urlx v0.3.2
3131
github.com/jongio/azidext/go/azidext v0.4.0
32-
github.com/openshift/api v0.0.0-20230804173756-26b8597c4de2
32+
github.com/openshift/api v0.0.0-20230807132801-600991d550ac
3333
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
34-
github.com/openshift/client-go v0.0.0-20230120202327-72f107311084
35-
github.com/openshift/library-go v0.0.0-20230120214501-9bc305884fcb
34+
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb
35+
github.com/openshift/library-go v0.0.0-20231020125025-211b32f1a1f2
3636
github.com/prometheus/client_golang v1.15.1
3737
github.com/prometheus/client_model v0.4.0
3838
github.com/prometheus/common v0.44.0
3939
github.com/spf13/cobra v1.6.1
4040
github.com/stretchr/testify v1.8.4
41-
golang.org/x/net v0.11.0
41+
golang.org/x/net v0.17.0
4242
golang.org/x/oauth2 v0.8.0
4343
golang.org/x/time v0.3.0
4444
google.golang.org/api v0.126.0
4545
gopkg.in/yaml.v2 v2.4.0
4646
k8s.io/api v0.27.4
47-
k8s.io/apimachinery v0.27.4
47+
k8s.io/apimachinery v0.28.0-alpha.0.0.20231013002001-194b6f8ddf62
4848
k8s.io/client-go v0.27.4
4949
k8s.io/klog/v2 v2.100.1
50-
k8s.io/utils v0.0.0-20230209194617-a36077c30491
50+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
5151
)
5252

5353
require (
@@ -147,11 +147,11 @@ require (
147147
go.uber.org/atomic v1.7.0 // indirect
148148
go.uber.org/multierr v1.6.0 // indirect
149149
go.uber.org/zap v1.19.0 // indirect
150-
golang.org/x/crypto v0.10.0 // indirect
150+
golang.org/x/crypto v0.14.0 // indirect
151151
golang.org/x/sync v0.2.0 // indirect
152-
golang.org/x/sys v0.9.0 // indirect
153-
golang.org/x/term v0.9.0 // indirect
154-
golang.org/x/text v0.10.0 // indirect
152+
golang.org/x/sys v0.13.0 // indirect
153+
golang.org/x/term v0.13.0 // indirect
154+
golang.org/x/text v0.13.0 // indirect
155155
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
156156
google.golang.org/appengine v1.6.7 // indirect
157157
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
@@ -164,15 +164,15 @@ require (
164164
gopkg.in/ini.v1 v1.62.0 // indirect
165165
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
166166
gopkg.in/yaml.v3 v3.0.1 // indirect
167-
k8s.io/apiextensions-apiserver v0.26.1 // indirect
167+
k8s.io/apiextensions-apiserver v0.27.4 // indirect
168168
k8s.io/apiserver v0.27.4 // indirect
169169
k8s.io/component-base v0.27.4 // indirect
170170
k8s.io/kms v0.27.4 // indirect
171-
k8s.io/kube-aggregator v0.26.1 // indirect
171+
k8s.io/kube-aggregator v0.27.4 // indirect
172172
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
173173
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
174174
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
175-
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
175+
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
176176
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
177177
sigs.k8s.io/yaml v1.3.0 // indirect
178178
)

go.sum

Lines changed: 28 additions & 309 deletions
Large diffs are not rendered by default.

pkg/metrics/server.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package metrics
22

33
import (
4+
"crypto/tls"
45
"fmt"
56
"net/http"
67

@@ -32,8 +33,9 @@ func RunServer(port int) {
3233
router := http.NewServeMux()
3334
router.Handle("/metrics", handler)
3435
srv := &http.Server{
35-
Addr: bindAddr,
36-
Handler: router,
36+
Addr: bindAddr,
37+
Handler: router,
38+
TLSNextProto: map[string]func(*http.Server, *tls.Conn, http.Handler){}, // disable HTTP/2
3739
}
3840

3941
if err := srv.ListenAndServeTLS(tlsCRT, tlsKey); err != nil {

vendor/github.com/openshift/api/machine/v1/0000_10_controlplanemachineset.crd.yaml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/machine/v1/stable.controlplanemachineset.openstack.testsuite.yaml

Lines changed: 39 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/machine/v1/types_controlplanemachineset.go

Lines changed: 7 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/machine/v1/zz_generated.swagger_doc_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/api/operator/v1/types_ingress.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)