Skip to content

Commit 4775d25

Browse files
authored
Merge pull request #711 from Huang-Wei/bump-v0.28.8
bump k8s deps to v1.28.8
2 parents bbd3027 + 4d3d41c commit 4775d25

File tree

671 files changed

+8613
-7641
lines changed

Some content is hidden

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

671 files changed

+8613
-7641
lines changed

cmd/controller/app/server.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2222
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
2323
"k8s.io/klog/v2/klogr"
24-
2524
ctrl "sigs.k8s.io/controller-runtime"
2625
"sigs.k8s.io/controller-runtime/pkg/healthz"
26+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
2727

2828
schedulingv1a1 "sigs.k8s.io/scheduler-plugins/apis/scheduling/v1alpha1"
2929
"sigs.k8s.io/scheduler-plugins/pkg/controllers"
@@ -48,9 +48,10 @@ func Run(s *ServerRunOptions) error {
4848
// Controller Runtime Controllers
4949
ctrl.SetLogger(klogr.New())
5050
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
51-
Scheme: scheme,
52-
MetricsBindAddress: s.MetricsAddr,
53-
Port: 9443,
51+
Scheme: scheme,
52+
Metrics: metricsserver.Options{
53+
BindAddress: s.MetricsAddr,
54+
},
5455
HealthProbeBindAddress: s.ProbeAddr,
5556
LeaderElection: s.EnableLeaderElection,
5657
LeaderElectionID: "sched-plugins-controllers",

go.mod

Lines changed: 62 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ require (
1616
github.com/spf13/pflag v1.0.5
1717
github.com/stretchr/testify v1.8.4
1818
gonum.org/v1/gonum v0.12.0
19-
k8s.io/api v0.28.4
20-
k8s.io/apimachinery v0.28.4
21-
k8s.io/apiserver v0.28.4
22-
k8s.io/client-go v0.28.4
23-
k8s.io/code-generator v0.28.4
24-
k8s.io/component-base v0.28.4
25-
k8s.io/component-helpers v0.28.4
19+
k8s.io/api v0.28.8
20+
k8s.io/apimachinery v0.28.8
21+
k8s.io/apiserver v0.28.8
22+
k8s.io/client-go v0.28.8
23+
k8s.io/code-generator v0.28.8
24+
k8s.io/component-base v0.28.8
25+
k8s.io/component-helpers v0.28.8
2626
k8s.io/klog/hack/tools v0.0.0-20210917071902-331d2323a192
2727
k8s.io/klog/v2 v2.100.1
28-
k8s.io/kube-scheduler v0.28.4
29-
k8s.io/kubernetes v1.28.4
28+
k8s.io/kube-scheduler v0.28.8
29+
k8s.io/kubernetes v1.28.8
3030
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
31-
sigs.k8s.io/controller-runtime v0.15.0
31+
sigs.k8s.io/controller-runtime v0.16.5
3232
sigs.k8s.io/security-profiles-operator v0.4.0
3333
sigs.k8s.io/yaml v1.3.0
3434
)
@@ -48,8 +48,8 @@ require (
4848
github.com/crossplane/crossplane-runtime v0.14.1-0.20210713194031-85b19c28ea88 // indirect
4949
github.com/davecgh/go-spew v1.1.1 // indirect
5050
github.com/docker/distribution v2.8.2+incompatible // indirect
51-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
52-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
51+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
52+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5353
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5454
github.com/felixge/httpsnoop v1.0.3 // indirect
5555
github.com/francoispqt/gojay v1.2.13 // indirect
@@ -60,7 +60,7 @@ require (
6060
github.com/go-openapi/swag v0.22.3 // indirect
6161
github.com/gogo/protobuf v1.3.2 // indirect
6262
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
63-
github.com/golang/protobuf v1.5.3 // indirect
63+
github.com/golang/protobuf v1.5.4 // indirect
6464
github.com/google/cel-go v0.16.1 // indirect
6565
github.com/google/gnostic-models v0.6.8 // indirect
6666
github.com/google/gofuzz v1.2.0 // indirect
@@ -106,76 +106,75 @@ require (
106106
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
107107
go.opentelemetry.io/otel/trace v1.10.0 // indirect
108108
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
109-
go.uber.org/atomic v1.10.0 // indirect
110109
go.uber.org/multierr v1.11.0 // indirect
111-
go.uber.org/zap v1.24.0 // indirect
112-
golang.org/x/crypto v0.14.0 // indirect
110+
go.uber.org/zap v1.25.0 // indirect
111+
golang.org/x/crypto v0.16.0 // indirect
113112
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
114-
golang.org/x/mod v0.12.0 // indirect
115-
golang.org/x/net v0.17.0 // indirect
113+
golang.org/x/mod v0.14.0 // indirect
114+
golang.org/x/net v0.19.0 // indirect
116115
golang.org/x/oauth2 v0.8.0 // indirect
117-
golang.org/x/sync v0.3.0 // indirect
118-
golang.org/x/sys v0.13.0 // indirect
119-
golang.org/x/term v0.13.0 // indirect
120-
golang.org/x/text v0.13.0 // indirect
116+
golang.org/x/sync v0.5.0 // indirect
117+
golang.org/x/sys v0.15.0 // indirect
118+
golang.org/x/term v0.15.0 // indirect
119+
golang.org/x/text v0.14.0 // indirect
121120
golang.org/x/time v0.3.0 // indirect
122-
golang.org/x/tools v0.12.0 // indirect
123-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
121+
golang.org/x/tools v0.16.1 // indirect
122+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
124123
google.golang.org/appengine v1.6.7 // indirect
125124
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
126125
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
127126
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
128127
google.golang.org/grpc v1.56.3 // indirect
129-
google.golang.org/protobuf v1.31.0 // indirect
128+
google.golang.org/protobuf v1.33.0 // indirect
130129
gopkg.in/inf.v0 v0.9.1 // indirect
131130
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
132131
gopkg.in/yaml.v2 v2.4.0 // indirect
133132
gopkg.in/yaml.v3 v3.0.1 // indirect
134-
k8s.io/apiextensions-apiserver v0.28.4 // indirect
135-
k8s.io/cloud-provider v0.28.4 // indirect
136-
k8s.io/controller-manager v0.28.4 // indirect
137-
k8s.io/csi-translation-lib v0.28.4 // indirect
138-
k8s.io/dynamic-resource-allocation v0.28.4 // indirect
133+
k8s.io/apiextensions-apiserver v0.28.8 // indirect
134+
k8s.io/cloud-provider v0.28.8 // indirect
135+
k8s.io/controller-manager v0.28.8 // indirect
136+
k8s.io/csi-translation-lib v0.28.8 // indirect
137+
k8s.io/dynamic-resource-allocation v0.28.8 // indirect
139138
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
140-
k8s.io/kms v0.28.4 // indirect
139+
k8s.io/kms v0.28.8 // indirect
141140
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
142-
k8s.io/kubelet v0.28.4 // indirect
143-
k8s.io/metrics v0.28.4 // indirect
144-
k8s.io/mount-utils v0.28.4 // indirect
141+
k8s.io/kubelet v0.28.8 // indirect
142+
k8s.io/metrics v0.28.8 // indirect
143+
k8s.io/mount-utils v0.28.8 // indirect
145144
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
146145
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
147146
sigs.k8s.io/release-utils v0.3.0 // indirect
148147
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
149148
)
150149

151150
replace (
152-
k8s.io/api => k8s.io/api v0.28.4
153-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4
154-
k8s.io/apimachinery => k8s.io/apimachinery v0.28.4
155-
k8s.io/apiserver => k8s.io/apiserver v0.28.4
156-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.4
157-
k8s.io/client-go => k8s.io/client-go v0.28.4
158-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4
159-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
160-
k8s.io/code-generator => k8s.io/code-generator v0.28.4
161-
k8s.io/component-base => k8s.io/component-base v0.28.4
162-
k8s.io/component-helpers => k8s.io/component-helpers v0.28.4
163-
k8s.io/controller-manager => k8s.io/controller-manager v0.28.4
164-
k8s.io/cri-api => k8s.io/cri-api v0.28.4
165-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4
166-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.4
167-
k8s.io/endpointslice => k8s.io/endpointslice v0.28.4
168-
k8s.io/kms => k8s.io/kms v0.28.4
169-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4
170-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4
171-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
172-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
173-
k8s.io/kubectl => k8s.io/kubectl v0.28.4
174-
k8s.io/kubelet => k8s.io/kubelet v0.28.4
175-
k8s.io/kubernetes => k8s.io/kubernetes v1.28.4
176-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4
177-
k8s.io/metrics => k8s.io/metrics v0.28.4
178-
k8s.io/mount-utils => k8s.io/mount-utils v0.28.4
179-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.4
180-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4
151+
k8s.io/api => k8s.io/api v0.28.8
152+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.8
153+
k8s.io/apimachinery => k8s.io/apimachinery v0.28.8
154+
k8s.io/apiserver => k8s.io/apiserver v0.28.8
155+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.8
156+
k8s.io/client-go => k8s.io/client-go v0.28.8
157+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.8
158+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.8
159+
k8s.io/code-generator => k8s.io/code-generator v0.28.8
160+
k8s.io/component-base => k8s.io/component-base v0.28.8
161+
k8s.io/component-helpers => k8s.io/component-helpers v0.28.8
162+
k8s.io/controller-manager => k8s.io/controller-manager v0.28.8
163+
k8s.io/cri-api => k8s.io/cri-api v0.28.8
164+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.8
165+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.8
166+
k8s.io/endpointslice => k8s.io/endpointslice v0.28.8
167+
k8s.io/kms => k8s.io/kms v0.28.8
168+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.8
169+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.8
170+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.8
171+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.8
172+
k8s.io/kubectl => k8s.io/kubectl v0.28.8
173+
k8s.io/kubelet => k8s.io/kubelet v0.28.8
174+
k8s.io/kubernetes => k8s.io/kubernetes v1.28.8
175+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.8
176+
k8s.io/metrics => k8s.io/metrics v0.28.8
177+
k8s.io/mount-utils => k8s.io/mount-utils v0.28.8
178+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.8
179+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.8
181180
)

0 commit comments

Comments
 (0)