Skip to content

Commit

Permalink
Merge pull request #3856 from chrislovecnm/openapi-updates
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

updating api docs

/assign @justinsb @geojaz @andrewsykim
/approve
  • Loading branch information
Kubernetes Submit Queue authored Nov 15, 2017
2 parents 187aadb + 6c2caed commit e85abf0
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 11 deletions.
12 changes: 10 additions & 2 deletions docs/apireference/build/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2389,7 +2389,7 @@ <h2 id="kubeapiserverconfig-v1alpha2-kops">KubeAPIServerConfig v1alpha2 kops</h2
</tr>
<tr>
<td>etcdKeyFile <br /> <em>string</em></td>
<td>EtcdKeyFile is the path to a orivate key</td>
<td>EtcdKeyFile is the path to a private key</td>
</tr>
<tr>
<td>etcdServers <br /> <em>string array</em></td>
Expand Down Expand Up @@ -2575,8 +2575,16 @@ <h2 id="kubecontrollermanagerconfig-v1alpha2-kops">KubeControllerManagerConfig v
<td>FeatureGates is set of key=value pairs that describe feature gates for alpha/experimental features.</td>
</tr>
<tr>
<td>horizontalPodAutoscalerDownscaleDelay <br /> <em><a href="#duration-v1-meta">Duration</a></em></td>
<td>HorizontalPodAutoscalerDownscaleDelay is a duration that specifies how long the autoscaler has to wait before another downscale operation can be performed after the current one has completed.</td>
</tr>
<tr>
<td>horizontalPodAutoscalerSyncPeriod <br /> <em><a href="#duration-v1-meta">Duration</a></em></td>
<td>HorizontalPodAutoscalerSyncPeriod is the amount of time between syncs During each period, the controller manager queries the resource utilization against the metrics specified in each HorizontalPodAutoscaler definition</td>
<td>HorizontalPodAutoscalerSyncPeriod is the amount of time between syncs During each period, the controller manager queries the resource utilization against the metrics specified in each HorizontalPodAutoscaler definition.</td>
</tr>
<tr>
<td>horizontalPodAutoscalerUpscaleDelay <br /> <em><a href="#duration-v1-meta">Duration</a></em></td>
<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>image <br /> <em>string</em></td>
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ limitations under the License.
package v1alpha1

import (
reflect "reflect"

v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
reflect "reflect"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ limitations under the License.
package v1alpha2

import (
reflect "reflect"

v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
reflect "reflect"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/kops/zz_generated.deepcopy.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ limitations under the License.
package kops

import (
reflect "reflect"

v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
reflect "reflect"
)

func init() {
Expand Down
3 changes: 2 additions & 1 deletion pkg/client/clientset_generated/clientset/scheme/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ limitations under the License.
package scheme

import (
os "os"

announced "k8s.io/apimachinery/pkg/apimachinery/announced"
registered "k8s.io/apimachinery/pkg/apimachinery/registered"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
kops "k8s.io/kops/pkg/apis/kops/install"
os "os"
)

var Scheme = runtime.NewScheme()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ limitations under the License.
package scheme

import (
os "os"

announced "k8s.io/apimachinery/pkg/apimachinery/announced"
registered "k8s.io/apimachinery/pkg/apimachinery/registered"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
kops "k8s.io/kops/pkg/apis/kops/install"
os "os"
)

var Scheme = runtime.NewScheme()
Expand Down
32 changes: 28 additions & 4 deletions pkg/openapi/openapi_generated.go
Original file line number Diff line number Diff line change
Expand Up @@ -22785,7 +22785,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
},
"etcdKeyFile": {
SchemaProps: spec.SchemaProps{
Description: "EtcdKeyFile is the path to a orivate key",
Description: "EtcdKeyFile is the path to a private key",
Type: []string{"string"},
Format: "",
},
Expand Down Expand Up @@ -23194,7 +23194,19 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
},
"horizontalPodAutoscalerSyncPeriod": {
SchemaProps: spec.SchemaProps{
Description: "HorizontalPodAutoscalerSyncPeriod is the amount of time between syncs During each period, the controller manager queries the resource utilization against the metrics specified in each HorizontalPodAutoscaler definition",
Description: "HorizontalPodAutoscalerSyncPeriod is the amount of time between syncs During each period, the controller manager queries the resource utilization against the metrics specified in each HorizontalPodAutoscaler definition.",
Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Duration"),
},
},
"horizontalPodAutoscalerDownscaleDelay": {
SchemaProps: spec.SchemaProps{
Description: "HorizontalPodAutoscalerDownscaleDelay is a duration that specifies how long the autoscaler has to wait before another downscale operation can be performed after the current one has completed.",
Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Duration"),
},
},
"horizontalPodAutoscalerUpscaleDelay": {
SchemaProps: spec.SchemaProps{
Description: "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.",
Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Duration"),
},
},
Expand Down Expand Up @@ -26288,7 +26300,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
},
"etcdKeyFile": {
SchemaProps: spec.SchemaProps{
Description: "EtcdKeyFile is the path to a orivate key",
Description: "EtcdKeyFile is the path to a private key",
Type: []string{"string"},
Format: "",
},
Expand Down Expand Up @@ -26697,7 +26709,19 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
},
"horizontalPodAutoscalerSyncPeriod": {
SchemaProps: spec.SchemaProps{
Description: "HorizontalPodAutoscalerSyncPeriod is the amount of time between syncs During each period, the controller manager queries the resource utilization against the metrics specified in each HorizontalPodAutoscaler definition",
Description: "HorizontalPodAutoscalerSyncPeriod is the amount of time between syncs During each period, the controller manager queries the resource utilization against the metrics specified in each HorizontalPodAutoscaler definition.",
Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Duration"),
},
},
"horizontalPodAutoscalerDownscaleDelay": {
SchemaProps: spec.SchemaProps{
Description: "HorizontalPodAutoscalerDownscaleDelay is a duration that specifies how long the autoscaler has to wait before another downscale operation can be performed after the current one has completed.",
Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Duration"),
},
},
"horizontalPodAutoscalerUpscaleDelay": {
SchemaProps: spec.SchemaProps{
Description: "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.",
Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Duration"),
},
},
Expand Down

0 comments on commit e85abf0

Please sign in to comment.