Merge pull request kubernetes#3948 from chrislovecnm/openapi-updates

Automatic merge from submit-queue. openapi doc updates
justinsb · Nov 29, 2017 · fd7acd1 · fd7acd1
2 parents 33136f9 + da10075
commit fd7acd1
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 6 deletions.
diff --git a/docs/apireference/build/index.html b/docs/apireference/build/index.html
@@ -662,6 +662,7 @@ <h2 id="accessspec-v1alpha2-kops">AccessSpec v1alpha2 kops</h2>
 </tr>
 </tbody>
 </table>
+<p>AccessSpec provides configuration details related to kubeapi dns and ELB access</p>
 <aside class="notice">
 Appears In:
 
@@ -679,11 +680,11 @@ <h2 id="accessspec-v1alpha2-kops">AccessSpec v1alpha2 kops</h2>
 <tbody>
 <tr>
 <td>dns <br /> <em><a href="#dnsaccessspec-v1alpha2-kops">DNSAccessSpec</a></em></td>
-<td></td>
+<td>DNS wil be used to provide config on kube-apiserver elb dns</td>
 </tr>
 <tr>
 <td>loadBalancer <br /> <em><a href="#loadbalanceraccessspec-v1alpha2-kops">LoadBalancerAccessSpec</a></em></td>
-<td></td>
+<td>LoadBalancer is the configuration for the kube-apiserver ELB</td>
 </tr>
 </tbody>
 </table>
@@ -1787,6 +1788,10 @@ <h2 id="externaldnsconfig-v1alpha2-kops">ExternalDNSConfig v1alpha2 kops</h2>
 </thead>
 <tbody>
 <tr>
+<td>disable <br /> <em>boolean</em></td>
+<td>Disable indicates we do not wish to run the dns-controller addon</td>
+</tr>
+<tr>
 <td>watchIngress <br /> <em>boolean</em></td>
 <td>WatchIngress indicates you want the dns-controller to watch and create dns entries for ingress resources</td>
 </tr>
@@ -2587,6 +2592,10 @@ <h2 id="kubecontrollermanagerconfig-v1alpha2-kops">KubeControllerManagerConfig v
 <td>HorizontalPodAutoscalerUpscaleDelay is a duration that specifies how long the autoscaler has to wait before another upscale operation can be performed after the current one has completed.</td>
 </tr>
 <tr>
+<td>horizontalPodAutoscalerUseRestClients <br /> <em>boolean</em></td>
+<td>HorizontalPodAutoscalerUseRestClients determines if the new-style clients should be used if support for custom metrics is enabled.</td>
+</tr>
+<tr>
 <td>image <br /> <em>string</em></td>
 <td>Image is the docker image to use</td>
 </tr>

diff --git a/pkg/openapi/openapi_generated.go b/pkg/openapi/openapi_generated.go
@@ -20811,15 +20811,18 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 		"k8s.io/kops/pkg/apis/kops/v1alpha1.AccessSpec": {
 			Schema: spec.Schema{
 				SchemaProps: spec.SchemaProps{
+					Description: "AccessSpec provides configuration details related to kubeapi dns and ELB access",
 					Properties: map[string]spec.Schema{
 						"dns": {
 							SchemaProps: spec.SchemaProps{
-								Ref: ref("k8s.io/kops/pkg/apis/kops/v1alpha1.DNSAccessSpec"),
+								Description: "DNS wil be used to provide config on kube-apiserver elb dns",
+								Ref:         ref("k8s.io/kops/pkg/apis/kops/v1alpha1.DNSAccessSpec"),
 							},
 						},
 						"loadBalancer": {
 							SchemaProps: spec.SchemaProps{
-								Ref: ref("k8s.io/kops/pkg/apis/kops/v1alpha1.LoadBalancerAccessSpec"),
+								Description: "LoadBalancer is the configuration for the kube-apiserver ELB",
+								Ref:         ref("k8s.io/kops/pkg/apis/kops/v1alpha1.LoadBalancerAccessSpec"),
 							},
 						},
 					},
@@ -22023,6 +22026,13 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 				SchemaProps: spec.SchemaProps{
 					Description: "ExternalDNSConfig are options of the dns-controller",
 					Properties: map[string]spec.Schema{
+						"disable": {
+							SchemaProps: spec.SchemaProps{
+								Description: "Disable indicates we do not wish to run the dns-controller addon",
+								Type:        []string{"boolean"},
+								Format:      "",
+							},
+						},
 						"watchIngress": {
 							SchemaProps: spec.SchemaProps{
 								Description: "WatchIngress indicates you want the dns-controller to watch and create dns entries for ingress resources",
@@ -23210,6 +23220,13 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 								Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Duration"),
 							},
 						},
+						"horizontalPodAutoscalerUseRestClients": {
+							SchemaProps: spec.SchemaProps{
+								Description: "HorizontalPodAutoscalerUseRestClients determines if the new-style clients should be used if support for custom metrics is enabled.",
+								Type:        []string{"boolean"},
+								Format:      "",
+							},
+						},
 						"featureGates": {
 							SchemaProps: spec.SchemaProps{
 								Description: "FeatureGates is set of key=value pairs that describe feature gates for alpha/experimental features.",
@@ -24152,15 +24169,18 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 		"k8s.io/kops/pkg/apis/kops/v1alpha2.AccessSpec": {
 			Schema: spec.Schema{
 				SchemaProps: spec.SchemaProps{
+					Description: "AccessSpec provides configuration details related to kubeapi dns and ELB access",
 					Properties: map[string]spec.Schema{
 						"dns": {
 							SchemaProps: spec.SchemaProps{
-								Ref: ref("k8s.io/kops/pkg/apis/kops/v1alpha2.DNSAccessSpec"),
+								Description: "DNS wil be used to provide config on kube-apiserver elb dns",
+								Ref:         ref("k8s.io/kops/pkg/apis/kops/v1alpha2.DNSAccessSpec"),
 							},
 						},
 						"loadBalancer": {
 							SchemaProps: spec.SchemaProps{
-								Ref: ref("k8s.io/kops/pkg/apis/kops/v1alpha2.LoadBalancerAccessSpec"),
+								Description: "LoadBalancer is the configuration for the kube-apiserver ELB",
+								Ref:         ref("k8s.io/kops/pkg/apis/kops/v1alpha2.LoadBalancerAccessSpec"),
 							},
 						},
 					},
@@ -25384,6 +25404,13 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 				SchemaProps: spec.SchemaProps{
 					Description: "ExternalDNSConfig are options of the dns-controller",
 					Properties: map[string]spec.Schema{
+						"disable": {
+							SchemaProps: spec.SchemaProps{
+								Description: "Disable indicates we do not wish to run the dns-controller addon",
+								Type:        []string{"boolean"},
+								Format:      "",
+							},
+						},
 						"watchIngress": {
 							SchemaProps: spec.SchemaProps{
 								Description: "WatchIngress indicates you want the dns-controller to watch and create dns entries for ingress resources",
@@ -26725,6 +26752,13 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 								Ref:         ref("k8s.io/apimachinery/pkg/apis/meta/v1.Duration"),
 							},
 						},
+						"horizontalPodAutoscalerUseRestClients": {
+							SchemaProps: spec.SchemaProps{
+								Description: "HorizontalPodAutoscalerUseRestClients determines if the new-style clients should be used if support for custom metrics is enabled.",
+								Type:        []string{"boolean"},
+								Format:      "",
+							},
+						},
 						"featureGates": {
 							SchemaProps: spec.SchemaProps{
 								Description: "FeatureGates is set of key=value pairs that describe feature gates for alpha/experimental features.",