mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-13 10:33:35 +00:00
rebase: update kubernetes to v1.21.2
Updated kubernetes packages to latest release. resizefs package has been included into k8s.io/mount-utils package. updated code to use the same. Updates: #1968 Signed-off-by: Rakshith R <rar@redhat.com>
This commit is contained in:
9
vendor/k8s.io/component-base/cli/flag/sectioned.go
generated
vendored
9
vendor/k8s.io/component-base/cli/flag/sectioned.go
generated
vendored
@ -31,6 +31,8 @@ type NamedFlagSets struct {
|
||||
Order []string
|
||||
// FlagSets stores the flag sets by name.
|
||||
FlagSets map[string]*pflag.FlagSet
|
||||
// NormalizeNameFunc is the normalize function which used to initialize FlagSets created by NamedFlagSets.
|
||||
NormalizeNameFunc func(f *pflag.FlagSet, name string) pflag.NormalizedName
|
||||
}
|
||||
|
||||
// FlagSet returns the flag set with the given name and adds it to the
|
||||
@ -40,7 +42,12 @@ func (nfs *NamedFlagSets) FlagSet(name string) *pflag.FlagSet {
|
||||
nfs.FlagSets = map[string]*pflag.FlagSet{}
|
||||
}
|
||||
if _, ok := nfs.FlagSets[name]; !ok {
|
||||
nfs.FlagSets[name] = pflag.NewFlagSet(name, pflag.ExitOnError)
|
||||
flagSet := pflag.NewFlagSet(name, pflag.ExitOnError)
|
||||
flagSet.SetNormalizeFunc(pflag.CommandLine.GetNormalizeFunc())
|
||||
if nfs.NormalizeNameFunc != nil {
|
||||
flagSet.SetNormalizeFunc(nfs.NormalizeNameFunc)
|
||||
}
|
||||
nfs.FlagSets[name] = flagSet
|
||||
nfs.Order = append(nfs.Order, name)
|
||||
}
|
||||
return nfs.FlagSets[name]
|
||||
|
59
vendor/k8s.io/component-base/cli/flag/string_slice_flag.go
generated
vendored
Normal file
59
vendor/k8s.io/component-base/cli/flag/string_slice_flag.go
generated
vendored
Normal file
@ -0,0 +1,59 @@
|
||||
/*
|
||||
Copyright 2021 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package flag
|
||||
|
||||
import (
|
||||
goflag "flag"
|
||||
"strings"
|
||||
|
||||
"github.com/spf13/pflag"
|
||||
)
|
||||
|
||||
// StringSlice implements goflag.Value and plfag.Value,
|
||||
// and allows set to be invoked repeatedly to accumulate values.
|
||||
type StringSlice struct {
|
||||
value *[]string
|
||||
changed bool
|
||||
}
|
||||
|
||||
func NewStringSlice(s *[]string) *StringSlice {
|
||||
return &StringSlice{value: s}
|
||||
}
|
||||
|
||||
var _ goflag.Value = &StringSlice{}
|
||||
var _ pflag.Value = &StringSlice{}
|
||||
|
||||
func (s *StringSlice) String() string {
|
||||
if s == nil || s.value == nil {
|
||||
return ""
|
||||
}
|
||||
return strings.Join(*s.value, " ")
|
||||
}
|
||||
|
||||
func (s *StringSlice) Set(val string) error {
|
||||
if s.value == nil || !s.changed {
|
||||
v := make([]string, 0)
|
||||
s.value = &v
|
||||
}
|
||||
*s.value = append(*s.value, val)
|
||||
s.changed = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (StringSlice) Type() string {
|
||||
return "sliceString"
|
||||
}
|
Reference in New Issue
Block a user