From f00cf713934555e6edd635bd7477f028056eda50 Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Tue, 30 Jun 2020 15:02:56 +0800 Subject: [PATCH] Promote NonPreempt feature gate to beta (#91899) * update nonpreempt featuregate to beta * update Kubernetes-commit: 209117413f32ec64e800dc32f69055ef2af75d54 --- Godeps/Godeps.json | 2 +- go.mod | 4 ++-- go.sum | 2 +- pkg/cmd/create/create_priorityclass.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 74bb71bfd..e49321624 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -752,7 +752,7 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "3b5342aabbeb" + "Rev": "aaebd44608df" }, { "ImportPath": "k8s.io/apimachinery", diff --git a/go.mod b/go.mod index 4d148bac0..702b08bf9 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4 gopkg.in/yaml.v2 v2.2.8 - k8s.io/api v0.0.0-20200627130740-3b5342aabbeb + k8s.io/api v0.0.0-20200630090439-aaebd44608df k8s.io/apimachinery v0.0.0-20200630050232-61490fe38e78 k8s.io/cli-runtime v0.0.0-20200626132723-2eb52e397b36 k8s.io/client-go v0.0.0-20200626130735-db5293afc7bf @@ -49,7 +49,7 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20200627130740-3b5342aabbeb + k8s.io/api => k8s.io/api v0.0.0-20200630090439-aaebd44608df k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200630050232-61490fe38e78 k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200626132723-2eb52e397b36 k8s.io/client-go => k8s.io/client-go v0.0.0-20200626130735-db5293afc7bf diff --git a/go.sum b/go.sum index dd9eae1ec..932af965a 100644 --- a/go.sum +++ b/go.sum @@ -499,7 +499,7 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -k8s.io/api v0.0.0-20200627130740-3b5342aabbeb/go.mod h1:vQNZO9B7m8N2djMqqgLa34Z2LCUrTXLWN98egCzDhrU= +k8s.io/api v0.0.0-20200630090439-aaebd44608df/go.mod h1:cQk/DBCsCL81chJRAZjSBZ4suDeNugUZE3LqnYmbQ8Q= k8s.io/apimachinery v0.0.0-20200630050232-61490fe38e78/go.mod h1:m5QoVMHU94aieNFPfLqf7WmU8HLVLm3JasG64COkSXQ= k8s.io/cli-runtime v0.0.0-20200626132723-2eb52e397b36/go.mod h1:OhgKaSIb4QiRuP7OgZhF1AVYpJWPqZGCUEBrz43EVLU= k8s.io/client-go v0.0.0-20200626130735-db5293afc7bf/go.mod h1:xWyNNU1CYxp5Qle29OSU49QrlzME3jkGOpv9FsbIFr4= diff --git a/pkg/cmd/create/create_priorityclass.go b/pkg/cmd/create/create_priorityclass.go index 2388b840c..3d4aba1ab 100644 --- a/pkg/cmd/create/create_priorityclass.go +++ b/pkg/cmd/create/create_priorityclass.go @@ -76,7 +76,7 @@ func NewCmdCreatePriorityClass(f cmdutil.Factory, ioStreams genericclioptions.IO cmd.Flags().Int32("value", 0, i18n.T("the value of this priority class.")) cmd.Flags().Bool("global-default", false, i18n.T("global-default specifies whether this PriorityClass should be considered as the default priority.")) cmd.Flags().String("description", "", i18n.T("description is an arbitrary string that usually provides guidelines on when this priority class should be used.")) - cmd.Flags().String("preemption-policy", "", i18n.T("preemption-policy is the policy for preempting pods with lower priority.")) + cmd.Flags().String("preemption-policy", "PreemptLowerPriority", i18n.T("preemption-policy is the policy for preempting pods with lower priority.")) cmdutil.AddFieldManagerFlagVar(cmd, &options.CreateSubcommandOptions.FieldManager, "kubectl-create") return cmd }