Skip to content

Commit 63e08c7

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #670 from Huang-Wei/bump-k8s-v1.28
bump k8s deps to v1.28.4
2 parents ffba3d3 + dca7acf commit 63e08c7

File tree

927 files changed

+61627
-23448
lines changed

Some content is hidden

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

927 files changed

+61627
-23448
lines changed

‎apis/config/scheme/scheme.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424

2525
"sigs.k8s.io/scheduler-plugins/apis/config"
2626
"sigs.k8s.io/scheduler-plugins/apis/config/v1"
27-
"sigs.k8s.io/scheduler-plugins/apis/config/v1beta2"
2827
"sigs.k8s.io/scheduler-plugins/apis/config/v1beta3"
2928
)
3029

@@ -44,6 +43,5 @@ func init() {
4443
func AddToScheme(scheme *runtime.Scheme) {
4544
utilruntime.Must(config.AddToScheme(scheme))
4645
utilruntime.Must(v1.AddToScheme(scheme))
47-
utilruntime.Must(v1beta2.AddToScheme(scheme))
4846
utilruntime.Must(v1beta3.AddToScheme(scheme))
4947
}

‎apis/config/scheme/scheme_test.go

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030

3131
"sigs.k8s.io/scheduler-plugins/apis/config"
3232
v1 "sigs.k8s.io/scheduler-plugins/apis/config/v1"
33-
"sigs.k8s.io/scheduler-plugins/apis/config/v1beta2"
3433
"sigs.k8s.io/scheduler-plugins/apis/config/v1beta3"
3534
"sigs.k8s.io/scheduler-plugins/pkg/coscheduling"
3635
"sigs.k8s.io/scheduler-plugins/pkg/networkaware/networkoverhead"
@@ -55,11 +54,11 @@ func TestCodecsDecodePluginConfig(t *testing.T) {
5554
wantErr string
5655
wantProfiles []schedconfig.KubeSchedulerProfile
5756
}{
58-
// v1beta2 tests
57+
// v1beta3 tests
5958
{
60-
name: "v1beta2 all plugin args in default profile",
59+
name: "v1beta3 all plugin args in default profile",
6160
data: []byte(`
62-
apiVersion: kubescheduler.config.k8s.io/v1beta2
61+
apiVersion: kubescheduler.config.k8s.io/v1beta3
6362
kind: KubeSchedulerConfiguration
6463
profiles:
6564
- schedulerName: scheduler-plugins
@@ -68,7 +67,6 @@ profiles:
6867
args:
6968
permitWaitingTimeSeconds: 10
7069
podGroupBackoffSeconds: 0
71-
deniedPGExpirationTimeSeconds: 3
7270
- name: NodeResourcesAllocatable
7371
args:
7472
mode: Least
@@ -104,7 +102,7 @@ profiles:
104102
wantProfiles: []schedconfig.KubeSchedulerProfile{
105103
{
106104
SchedulerName: "scheduler-plugins",
107-
Plugins: defaults.PluginsV1beta2,
105+
Plugins: defaults.PluginsV1beta3,
108106
PluginConfig: []schedconfig.PluginConfig{
109107
{
110108
Name: coscheduling.Name,
@@ -149,8 +147,8 @@ profiles:
149147
InsecureSkipVerify: false,
150148
},
151149
WatcherAddress: "http://deadbeef:2020"},
152-
SafeVarianceMargin: v1beta2.DefaultSafeVarianceMargin,
153-
SafeVarianceSensitivity: v1beta2.DefaultSafeVarianceSensitivity,
150+
SafeVarianceMargin: v1beta3.DefaultSafeVarianceMargin,
151+
SafeVarianceSensitivity: v1beta3.DefaultSafeVarianceSensitivity,
154152
},
155153
},
156154
{
@@ -195,9 +193,9 @@ profiles:
195193
},
196194
},
197195
{
198-
name: "v1beta2 plugin args unspecified to verify the default profile",
196+
name: "v1beta3 plugin args unspecified to verify the default profile",
199197
data: []byte(`
200-
apiVersion: kubescheduler.config.k8s.io/v1beta2
198+
apiVersion: kubescheduler.config.k8s.io/v1beta3
201199
kind: KubeSchedulerConfiguration
202200
profiles:
203201
- schedulerName: scheduler-plugins
@@ -216,7 +214,7 @@ profiles:
216214
wantProfiles: []schedconfig.KubeSchedulerProfile{
217215
{
218216
SchedulerName: "scheduler-plugins",
219-
Plugins: defaults.PluginsV1beta2,
217+
Plugins: defaults.PluginsV1beta3,
220218
PluginConfig: []schedconfig.PluginConfig{
221219
{
222220
Name: coscheduling.Name,
@@ -261,8 +259,8 @@ profiles:
261259
Token: "",
262260
},
263261
WatcherAddress: ""},
264-
SafeVarianceMargin: v1beta2.DefaultSafeVarianceMargin,
265-
SafeVarianceSensitivity: v1beta2.DefaultSafeVarianceSensitivity,
262+
SafeVarianceMargin: v1beta3.DefaultSafeVarianceMargin,
263+
SafeVarianceSensitivity: v1beta3.DefaultSafeVarianceSensitivity,
266264
},
267265
},
268266
{
@@ -307,9 +305,9 @@ profiles:
307305
},
308306
},
309307
{
310-
name: "v1beta2 coscheduling plugin args illegal to get validation error",
308+
name: "v1beta3 coscheduling plugin args illegal to get validation error",
311309
data: []byte(`
312-
apiVersion: kubescheduler.config.k8s.io/v1beta2
310+
apiVersion: kubescheduler.config.k8s.io/v1beta3
313311
kind: KubeSchedulerConfiguration
314312
profiles:
315313
- schedulerName: scheduler-plugins
@@ -649,10 +647,10 @@ func TestCodecsEncodePluginConfig(t *testing.T) {
649647
version schema.GroupVersion
650648
want string
651649
}{
652-
// v1beta2 tests
650+
// v1beta3 tests
653651
{
654-
name: "v1beta2 plugins",
655-
version: v1beta2.SchemeGroupVersion,
652+
name: "v1beta3 plugins",
653+
version: v1beta3.SchemeGroupVersion,
656654
obj: &schedconfig.KubeSchedulerConfiguration{
657655
Profiles: []schedconfig.KubeSchedulerProfile{
658656
{
@@ -700,15 +698,15 @@ func TestCodecsEncodePluginConfig(t *testing.T) {
700698
InsecureSkipVerify: false,
701699
},
702700
WatcherAddress: "http://deadbeef:2020"},
703-
SafeVarianceMargin: v1beta2.DefaultSafeVarianceMargin,
704-
SafeVarianceSensitivity: v1beta2.DefaultSafeVarianceSensitivity,
701+
SafeVarianceMargin: v1beta3.DefaultSafeVarianceMargin,
702+
SafeVarianceSensitivity: v1beta3.DefaultSafeVarianceSensitivity,
705703
},
706704
},
707705
},
708706
},
709707
},
710708
},
711-
want: `apiVersion: kubescheduler.config.k8s.io/v1beta2
709+
want: `apiVersion: kubescheduler.config.k8s.io/v1beta3
712710
clientConnection:
713711
acceptContentTypes: ""
714712
burst: 0
@@ -717,7 +715,6 @@ clientConnection:
717715
qps: 0
718716
enableContentionProfiling: false
719717
enableProfiling: false
720-
healthzBindAddress: ""
721718
kind: KubeSchedulerConfiguration
722719
leaderElection:
723720
leaderElect: false
@@ -727,20 +724,19 @@ leaderElection:
727724
resourceName: ""
728725
resourceNamespace: ""
729726
retryPeriod: 0s
730-
metricsBindAddress: ""
731727
parallelism: 0
732728
podInitialBackoffSeconds: 0
733729
podMaxBackoffSeconds: 0
734730
profiles:
735731
- pluginConfig:
736732
- args:
737-
apiVersion: kubescheduler.config.k8s.io/v1beta2
733+
apiVersion: kubescheduler.config.k8s.io/v1beta3
738734
kind: CoschedulingArgs
739735
permitWaitingTimeSeconds: 10
740736
podGroupBackoffSeconds: 0
741737
name: Coscheduling
742738
- args:
743-
apiVersion: kubescheduler.config.k8s.io/v1beta2
739+
apiVersion: kubescheduler.config.k8s.io/v1beta3
744740
kind: NodeResourcesAllocatableArgs
745741
mode: Least
746742
resources:
@@ -750,7 +746,7 @@ profiles:
750746
weight: 1
751747
name: NodeResourcesAllocatable
752748
- args:
753-
apiVersion: kubescheduler.config.k8s.io/v1beta2
749+
apiVersion: kubescheduler.config.k8s.io/v1beta3
754750
defaultRequests:
755751
cpu: "1"
756752
defaultRequestsMultiplier: "1.8"
@@ -764,7 +760,7 @@ profiles:
764760
watcherAddress: http://deadbeef:2020
765761
name: TargetLoadPacking
766762
- args:
767-
apiVersion: kubescheduler.config.k8s.io/v1beta2
763+
apiVersion: kubescheduler.config.k8s.io/v1beta3
768764
kind: LoadVariationRiskBalancingArgs
769765
metricProvider:
770766
address: http://prometheus-k8s.monitoring.svc.cluster.local:9090
@@ -830,8 +826,8 @@ profiles:
830826
InsecureSkipVerify: false,
831827
},
832828
WatcherAddress: "http://deadbeef:2020"},
833-
SafeVarianceMargin: v1beta2.DefaultSafeVarianceMargin,
834-
SafeVarianceSensitivity: v1beta2.DefaultSafeVarianceSensitivity,
829+
SafeVarianceMargin: v1beta3.DefaultSafeVarianceMargin,
830+
SafeVarianceSensitivity: v1beta3.DefaultSafeVarianceSensitivity,
835831
},
836832
},
837833
{
@@ -1016,8 +1012,8 @@ profiles:
10161012
InsecureSkipVerify: false,
10171013
},
10181014
WatcherAddress: "http://deadbeef:2020"},
1019-
SafeVarianceMargin: v1beta2.DefaultSafeVarianceMargin,
1020-
SafeVarianceSensitivity: v1beta2.DefaultSafeVarianceSensitivity,
1015+
SafeVarianceMargin: v1beta3.DefaultSafeVarianceMargin,
1016+
SafeVarianceSensitivity: v1beta3.DefaultSafeVarianceSensitivity,
10211017
},
10221018
},
10231019
{

‎apis/config/v1beta2/conversion.go

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)