From f15c8d0cf5755464c6fdbd5dfa6724f29bfe7f8f Mon Sep 17 00:00:00 2001 From: "Aaron.L.Xu" Date: Tue, 20 Dec 2016 20:24:03 -0800 Subject: [PATCH] update-federation-openapi-spec.sh and fix issue 38962 --- federation/apis/openapi-spec/swagger.json | 2 +- hack/lib/etcd.sh | 2 +- pkg/generated/openapi/zz_generated.openapi.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/federation/apis/openapi-spec/swagger.json b/federation/apis/openapi-spec/swagger.json index 625efbed4d4..646d4add032 100644 --- a/federation/apis/openapi-spec/swagger.json +++ b/federation/apis/openapi-spec/swagger.json @@ -10247,7 +10247,7 @@ } }, "v1beta1.ClusterStatus": { - "description": "ClusterStatus is information about the current status of a cluster updated by cluster controller peridocally.", + "description": "ClusterStatus is information about the current status of a cluster updated by cluster controller periodically.", "properties": { "conditions": { "description": "Conditions is an array of current cluster conditions.", diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh index 03ad07c0f34..5ef4cc8380b 100755 --- a/hack/lib/etcd.sh +++ b/hack/lib/etcd.sh @@ -40,7 +40,7 @@ kube::etcd::validate() { export PATH=$KUBE_ROOT/third_party/etcd:$PATH hash etcd echo $PATH - ls $KUBE_ROOT/third_party/etcd + #ls $KUBE_ROOT/third_party/etcd version=$(etcd --version | head -n 1 | cut -d " " -f 3) if [[ "${version}" < "${ETCD_VERSION}" ]]; then kube::log::usage "etcd version ${ETCD_VERSION} or greater required." diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 9cb6d540cf3..7feb3cffc5c 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -9782,7 +9782,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{ "v1beta1.ClusterStatus": { Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "ClusterStatus is information about the current status of a cluster updated by cluster controller peridocally.", + Description: "ClusterStatus is information about the current status of a cluster updated by cluster controller periodically.", Properties: map[string]spec.Schema{ "conditions": { SchemaProps: spec.SchemaProps{