Merge pull request #100008 from wangyysde/issue99675

Add descriptions to api/extensions/v1beta1/types.go

api/openapi-spec/swagger.json

@@ -11802,7 +11802,8 @@
           "type": "string"
         },
         "http": {
-          "$ref": "#/definitions/io.k8s.api.extensions.v1beta1.HTTPIngressRuleValue"
+          "$ref": "#/definitions/io.k8s.api.extensions.v1beta1.HTTPIngressRuleValue",
+          "description": "http is a list of http selectors pointing to backends. A path is matched against the path of an incoming request. Currently it can contain characters disallowed from the conventional \"path\" part of a URL as defined by RFC 3986. Paths must begin with a '/'. A backend defines the referenced service endpoint to which the traffic will be forwarded to."
         }
       },
       "type": "object"

hack/.descriptions_failures

@@ -5,7 +5,6 @@
 ./staging/src/k8s.io/api/certificates/v1/types.go
 ./staging/src/k8s.io/api/certificates/v1beta1/types.go
 ./staging/src/k8s.io/api/core/v1/types.go
-./staging/src/k8s.io/api/extensions/v1beta1/types.go
 ./staging/src/k8s.io/api/flowcontrol/v1alpha1/types.go
 ./staging/src/k8s.io/api/flowcontrol/v1beta1/types.go
 ./staging/src/k8s.io/api/networking/v1/types.go

staging/src/k8s.io/api/extensions/v1beta1/generated.proto

@@ -210,6 +210,9 @@ message DaemonSetStatus {
   repeated DaemonSetCondition conditions = 10;
 }
 
+// DaemonSetUpdateStrategy indicates the strategy that the DaemonSet
+// controller will use to perform updates. It includes any additional parameters
+// necessary to perform the update for the indicated strategy.
 message DaemonSetUpdateStrategy {
   // Type of daemon set update. Can be "RollingUpdate" or "OnDelete".
   // Default is OnDelete.
@@ -580,7 +583,12 @@ message IngressRule {
 // mixing different types of rules in a single Ingress is disallowed, so exactly
 // one of the following must be set.
 message IngressRuleValue {
-  // +optional
+  // http is a list of http selectors pointing to backends.
+  // A path is matched against the path of an incoming request. Currently it can
+  // contain characters disallowed from the conventional "path" part of a URL
+  // as defined by RFC 3986. Paths must begin with a '/'.
+  // A backend defines the referenced service endpoint to which the traffic
+  // will be forwarded to.
   optional HTTPIngressRuleValue http = 1;
 }
 

staging/src/k8s.io/api/extensions/v1beta1/types.go

@@ -329,6 +329,9 @@ type DeploymentList struct {
 	Items []Deployment `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
 
+// DaemonSetUpdateStrategy indicates the strategy that the DaemonSet
+// controller will use to perform updates. It includes any additional parameters
+// necessary to perform the update for the indicated strategy.
 type DaemonSetUpdateStrategy struct {
 	// Type of daemon set update. Can be "RollingUpdate" or "OnDelete".
 	// Default is OnDelete.
@@ -731,7 +734,12 @@ type IngressRuleValue struct {
 	// 2. Consider adding fields for ingress-type specific global options
 	// usable by a loadbalancer, like http keep-alive.
 
-	// +optional
+	// http is a list of http selectors pointing to backends.
+	// A path is matched against the path of an incoming request. Currently it can
+	// contain characters disallowed from the conventional "path" part of a URL
+	// as defined by RFC 3986. Paths must begin with a '/'.
+	// A backend defines the referenced service endpoint to which the traffic
+	// will be forwarded to.
 	HTTP *HTTPIngressRuleValue `json:"http,omitempty" protobuf:"bytes,1,opt,name=http"`
 }
 

staging/src/k8s.io/api/extensions/v1beta1/types_swagger_doc_generated.go

@@ -122,6 +122,7 @@ func (DaemonSetStatus) SwaggerDoc() map[string]string {
 }
 
 var map_DaemonSetUpdateStrategy = map[string]string{
+	"":              "DaemonSetUpdateStrategy indicates the strategy that the DaemonSet controller will use to perform updates. It includes any additional parameters necessary to perform the update for the indicated strategy.",
 	"type":          "Type of daemon set update. Can be \"RollingUpdate\" or \"OnDelete\". Default is OnDelete.",
 	"rollingUpdate": "Rolling update config params. Present only if type = \"RollingUpdate\".",
 }
@@ -321,7 +322,8 @@ func (IngressRule) SwaggerDoc() map[string]string {
 }
 
 var map_IngressRuleValue = map[string]string{
-	"": "IngressRuleValue represents a rule to apply against incoming requests. If the rule is satisfied, the request is routed to the specified backend. Currently mixing different types of rules in a single Ingress is disallowed, so exactly one of the following must be set.",
+	"":     "IngressRuleValue represents a rule to apply against incoming requests. If the rule is satisfied, the request is routed to the specified backend. Currently mixing different types of rules in a single Ingress is disallowed, so exactly one of the following must be set.",
+	"http": "http is a list of http selectors pointing to backends. A path is matched against the path of an incoming request. Currently it can contain characters disallowed from the conventional \"path\" part of a URL as defined by RFC 3986. Paths must begin with a '/'. A backend defines the referenced service endpoint to which the traffic will be forwarded to.",
 }
 
 func (IngressRuleValue) SwaggerDoc() map[string]string {