update dependencies

Signed-off-by: hongming <talonwan@yunify.com>

vendor/sigs.k8s.io/controller-tools/pkg/crd/markers/crd.go

@@ -45,6 +45,9 @@ var CRDMarkers = []*definitionWithHelp{
 
 	must(markers.MakeDefinition("kubebuilder:skipversion", markers.DescribesType, SkipVersion{})).
 		WithHelp(SkipVersion{}.Help()),
+
+	must(markers.MakeDefinition("kubebuilder:unservedversion", markers.DescribesType, UnservedVersion{})).
+		WithHelp(UnservedVersion{}.Help()),
 }
 
 // TODO: categories and singular used to be annotations types
@@ -277,6 +280,9 @@ func (s Resource) ApplyToCRD(crd *apiext.CustomResourceDefinitionSpec, version s
 	if s.Path != "" {
 		crd.Names.Plural = s.Path
 	}
+	if s.Singular != "" {
+		crd.Names.Singular = s.Singular
+	}
 	crd.Names.ShortNames = s.ShortName
 	crd.Names.Categories = s.Categories
 
@@ -290,4 +296,23 @@ func (s Resource) ApplyToCRD(crd *apiext.CustomResourceDefinitionSpec, version s
 	return nil
 }
 
+// +controllertools:marker:generateHelp:category=CRD
+
+// UnservedVersion does not serve this version.
+//
+// This is useful if you need to drop support for a version in favor of a newer version.
+type UnservedVersion struct{}
+
+func (s UnservedVersion) ApplyToCRD(crd *apiext.CustomResourceDefinitionSpec, version string) error {
+	for i := range crd.Versions {
+		ver := &crd.Versions[i]
+		if ver.Name != version {
+			continue
+		}
+		ver.Served = false
+		break
+	}
+	return nil
+}
+
 // NB(directxman12): singular was historically distinct, so we keep it here for backwards compat

vendor/sigs.k8s.io/controller-tools/pkg/crd/markers/topology.go

@@ -0,0 +1,155 @@
+/*
+Copyright 2019 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 markers
+
+import (
+	"fmt"
+
+	apiext "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	"sigs.k8s.io/controller-tools/pkg/markers"
+)
+
+// TopologyMarkers specify topology markers (i.e. markers that describe if a
+// list behaves as an associative-list or a set, if a map is atomic or not).
+var TopologyMarkers = []*definitionWithHelp{
+	must(markers.MakeDefinition("listMapKey", markers.DescribesField, ListMapKey(""))).
+		WithHelp(ListMapKey("").Help()),
+	must(markers.MakeDefinition("listType", markers.DescribesField, ListType(""))).
+		WithHelp(ListType("").Help()),
+	must(markers.MakeDefinition("mapType", markers.DescribesField, MapType(""))).
+		WithHelp(MapType("").Help()),
+	must(markers.MakeDefinition("structType", markers.DescribesField, StructType(""))).
+		WithHelp(StructType("").Help()),
+}
+
+func init() {
+	AllDefinitions = append(AllDefinitions, TopologyMarkers...)
+}
+
+// +controllertools:marker:generateHelp:category="CRD processing"
+
+// ListType specifies the type of data-structure that the list
+// represents (map, set, atomic).
+//
+// Possible data-structure types of a list are:
+//
+// - "map": it needs to have a key field, which will be used to build an
+//   associative list. A typical example is a the pod container list,
+//   which is indexed by the container name.
+//
+// - "set": Fields need to be "scalar", and there can be only one
+//   occurrence of each.
+//
+// - "atomic": All the fields in the list are treated as a single value,
+//   are typically manipulated together by the same actor.
+type ListType string
+
+// +controllertools:marker:generateHelp:category="CRD processing"
+
+// ListMapKey specifies the keys to map listTypes.
+//
+// It indicates the index of a map list. They can be repeated if multiple keys
+// must be used. It can only be used when ListType is set to map, and the keys
+// should be scalar types.
+type ListMapKey string
+
+// +controllertools:marker:generateHelp:category="CRD processing"
+
+// MapType specifies the level of atomicity of the map;
+// i.e. whether each item in the map is independent of the others,
+// or all fields are treated as a single unit.
+//
+// Possible values:
+//
+// - "granular": items in the map are independent of each other,
+//   and can be manipulated by different actors.
+//   This is the default behavior.
+//
+// - "atomic": all fields are treated as one unit.
+//   Any changes have to replace the entire map.
+type MapType string
+
+// +controllertools:marker:generateHelp:category="CRD processing"
+
+// StructType specifies the level of atomicity of the struct;
+// i.e. whether each field in the struct is independent of the others,
+// or all fields are treated as a single unit.
+//
+// Possible values:
+//
+// - "granular": fields in the struct are independent of each other,
+//   and can be manipulated by different actors.
+//   This is the default behavior.
+//
+// - "atomic": all fields are treated as one unit.
+//   Any changes have to replace the entire struct.
+type StructType string
+
+func (l ListType) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
+	if schema.Type != "array" {
+		return fmt.Errorf("must apply listType to an array")
+	}
+	if l != "map" && l != "atomic" && l != "set" {
+		return fmt.Errorf(`ListType must be either "map", "set" or "atomic"`)
+	}
+	p := string(l)
+	schema.XListType = &p
+	return nil
+}
+
+func (l ListType) ApplyFirst() {}
+
+func (l ListMapKey) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
+	if schema.Type != "array" {
+		return fmt.Errorf("must apply listMapKey to an array")
+	}
+	if schema.XListType == nil || *schema.XListType != "map" {
+		return fmt.Errorf("must apply listMapKey to an associative-list")
+	}
+	schema.XListMapKeys = append(schema.XListMapKeys, string(l))
+	return nil
+}
+
+func (m MapType) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
+	if schema.Type != "object" {
+		return fmt.Errorf("must apply mapType to an object")
+	}
+
+	if m != "atomic" && m != "granular" {
+		return fmt.Errorf(`MapType must be either "granular" or "atomic"`)
+	}
+
+	p := string(m)
+	schema.XMapType = &p
+
+	return nil
+}
+
+func (s StructType) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
+	if schema.Type != "object" && schema.Type != "" {
+		return fmt.Errorf("must apply structType to an object; either explicitly set or defaulted through an empty schema type")
+	}
+
+	if s != "atomic" && s != "granular" {
+		return fmt.Errorf(`StructType must be either "granular" or "atomic"`)
+	}
+
+	p := string(s)
+	schema.XMapType = &p
+
+	return nil
+}

vendor/sigs.k8s.io/controller-tools/pkg/crd/markers/zz_generated.markerhelp.go

@@ -84,6 +84,39 @@ func (Format) Help() *markers.DefinitionHelp {
 	}
 }
 
+func (ListMapKey) Help() *markers.DefinitionHelp {
+	return &markers.DefinitionHelp{
+		Category: "CRD processing",
+		DetailedHelp: markers.DetailedHelp{
+			Summary: "specifies the keys to map listTypes. ",
+			Details: "It indicates the index of a map list. They can be repeated if multiple keys must be used. It can only be used when ListType is set to map, and the keys should be scalar types.",
+		},
+		FieldHelp: map[string]markers.DetailedHelp{},
+	}
+}
+
+func (ListType) Help() *markers.DefinitionHelp {
+	return &markers.DefinitionHelp{
+		Category: "CRD processing",
+		DetailedHelp: markers.DetailedHelp{
+			Summary: "specifies the type of data-structure that the list represents (map, set, atomic). ",
+			Details: "Possible data-structure types of a list are: \n - \"map\": it needs to have a key field, which will be used to build an   associative list. A typical example is a the pod container list,   which is indexed by the container name. \n - \"set\": Fields need to be \"scalar\", and there can be only one   occurrence of each. \n - \"atomic\": All the fields in the list are treated as a single value,   are typically manipulated together by the same actor.",
+		},
+		FieldHelp: map[string]markers.DetailedHelp{},
+	}
+}
+
+func (MapType) Help() *markers.DefinitionHelp {
+	return &markers.DefinitionHelp{
+		Category: "CRD processing",
+		DetailedHelp: markers.DetailedHelp{
+			Summary: "specifies the level of atomicity of the map; i.e. whether each item in the map is independent of the others, or all fields are treated as a single unit. ",
+			Details: "Possible values: \n - \"granular\": items in the map are independent of each other,   and can be manipulated by different actors.   This is the default behavior. \n - \"atomic\": all fields are treated as one unit.   Any changes have to replace the entire map.",
+		},
+		FieldHelp: map[string]markers.DetailedHelp{},
+	}
+}
+
 func (MaxItems) Help() *markers.DefinitionHelp {
 	return &markers.DefinitionHelp{
 		Category: "CRD validation",
@@ -244,8 +277,8 @@ func (Resource) Help() *markers.DefinitionHelp {
 				Details: "The singular form is otherwise defaulted off the plural (path).",
 			},
 			"Scope": markers.DetailedHelp{
-				Summary: "overrides the scope of the CRD (cluster vs namespaced). ",
-				Details: "Scope defaults to \"namespaced\".  Cluster-scoped (\"cluster\") resources don't exist in namespaces.",
+				Summary: "overrides the scope of the CRD (Cluster vs Namespaced). ",
+				Details: "Scope defaults to \"Namespaced\".  Cluster-scoped (\"Cluster\") resources don't exist in namespaces.",
 			},
 		},
 	}
@@ -273,6 +306,17 @@ func (StorageVersion) Help() *markers.DefinitionHelp {
 	}
 }
 
+func (StructType) Help() *markers.DefinitionHelp {
+	return &markers.DefinitionHelp{
+		Category: "CRD processing",
+		DetailedHelp: markers.DetailedHelp{
+			Summary: "specifies the level of atomicity of the struct; i.e. whether each field in the struct is independent of the others, or all fields are treated as a single unit. ",
+			Details: "Possible values: \n - \"granular\": fields in the struct are independent of each other,   and can be manipulated by different actors.   This is the default behavior. \n - \"atomic\": all fields are treated as one unit.   Any changes have to replace the entire struct.",
+		},
+		FieldHelp: map[string]markers.DetailedHelp{},
+	}
+}
+
 func (SubresourceScale) Help() *markers.DefinitionHelp {
 	return &markers.DefinitionHelp{
 		Category: "CRD",
@@ -330,6 +374,17 @@ func (UniqueItems) Help() *markers.DefinitionHelp {
 	}
 }
 
+func (UnservedVersion) Help() *markers.DefinitionHelp {
+	return &markers.DefinitionHelp{
+		Category: "CRD",
+		DetailedHelp: markers.DetailedHelp{
+			Summary: "does not serve this version. ",
+			Details: "This is useful if you need to drop support for a version in favor of a newer version.",
+		},
+		FieldHelp: map[string]markers.DetailedHelp{},
+	}
+}
+
 func (XEmbeddedResource) Help() *markers.DefinitionHelp {
 	return &markers.DefinitionHelp{
 		Category: "CRD validation",