From f91f428634d7e4a30fb5dfa4cd8f41ab38a0a8f1 Mon Sep 17 00:00:00 2001 From: Xinbo Weng Date: Fri, 23 Dec 2016 19:46:04 +0800 Subject: [PATCH] fix duplicated 'the' and some 'a/an' errors Signed-off-by: Xinbo Weng --- cmd/localkube/cmd/options.go | 2 +- cmd/localkube/cmd/root.go | 4 ++-- hack/jenkins/release_build_and_upload.sh | 10 +++++----- hack/jenkins/release_github_page.sh | 13 ++++++------- hack/jenkins/release_update_releases_json.sh | 6 +++--- pkg/minikube/cluster/credentials.go | 2 +- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/cmd/localkube/cmd/options.go b/cmd/localkube/cmd/options.go index 588458c95a..62fb19723e 100644 --- a/cmd/localkube/cmd/options.go +++ b/cmd/localkube/cmd/options.go @@ -50,7 +50,7 @@ func NewLocalkubeServer() *localkube.LocalkubeServer { // AddFlags adds flags for a specific LocalkubeServer func AddFlags(s *localkube.LocalkubeServer) { flag.BoolVar(&s.Containerized, "containerized", s.Containerized, "If kubelet should run in containerized mode") - flag.BoolVar(&s.EnableDNS, "enable-dns", s.EnableDNS, "DEPRECATED: Please run kube-dns as an cluster addon") + flag.BoolVar(&s.EnableDNS, "enable-dns", s.EnableDNS, "DEPRECATED: Please run kube-dns as a cluster addon") flag.StringVar(&s.DNSDomain, "dns-domain", s.DNSDomain, "The cluster dns domain") flag.IPVar(&s.DNSIP, "dns-ip", s.DNSIP, "The cluster dns IP") flag.StringVar(&s.LocalkubeDirectory, "localkube-directory", s.LocalkubeDirectory, "The directory localkube will store files in") diff --git a/cmd/localkube/cmd/root.go b/cmd/localkube/cmd/root.go index 6617214d34..c1d71cd84c 100644 --- a/cmd/localkube/cmd/root.go +++ b/cmd/localkube/cmd/root.go @@ -25,8 +25,8 @@ import ( var RootCmd = &cobra.Command{ Use: "localkube", - Short: "localkube is a all-in-one kubernetes binary.", - Long: `localkube is a all-in-one kubernetes binary that runs all Kubernetes server binaries.`, + Short: "localkube is an all-in-one kubernetes binary.", + Long: `localkube is an all-in-one kubernetes binary that runs all Kubernetes server binaries.`, Run: func(command *cobra.Command, args []string) { StartLocalkube() }, diff --git a/hack/jenkins/release_build_and_upload.sh b/hack/jenkins/release_build_and_upload.sh index 2e4cb1304e..d59ac9b316 100755 --- a/hack/jenkins/release_build_and_upload.sh +++ b/hack/jenkins/release_build_and_upload.sh @@ -18,11 +18,11 @@ # This is intended to be run on a new release tag in order to build/upload the required files for a release # The script expects the following env variabls: -# VERSION_MAJOR: The the major version of the tag to be released. -# VERSION_MINOR: The the minor version of the tag to be released. -# VERSION_BUILD: The the build version of the tag to be released. +# VERSION_MAJOR: The major version of the tag to be released. +# VERSION_MINOR: The minor version of the tag to be released. +# VERSION_BUILD: The build version of the tag to be released. # BUCKET: The GCP bucket the build files should be uploaded to. -# GITHUB_TOKEN: The Github API access token. Injected by the Jenkins credential provider. +# GITHUB_TOKEN: The Github API access token. Injected by the Jenkins credential provider. set -e @@ -47,7 +47,7 @@ gsutil cp out/minikube-darwin-amd64.sha256 gs://$BUCKET/releases/$TAGNAME/ gsutil cp out/minikube-windows-amd64.exe gs://$BUCKET/releases/$TAGNAME/ gsutil cp out/minikube-windows-amd64.exe.sha256 gs://$BUCKET/releases/$TAGNAME/ -make out/minikube-installer.exe +make out/minikube-installer.exe gsutil cp out/minikube-installer.exe gs://$BUCKET/releases/$TAGNAME/ make out/minikube_${DEB_VERSION}.deb diff --git a/hack/jenkins/release_github_page.sh b/hack/jenkins/release_github_page.sh index 7cce3793da..fd3fd78618 100755 --- a/hack/jenkins/release_github_page.sh +++ b/hack/jenkins/release_github_page.sh @@ -18,13 +18,13 @@ # This is intended to be run on a new release tag in order to generate the github release page for that release # The script expects the following env variabls: -# VERSION_MAJOR: The the major version of the tag to be released. -# VERSION_MINOR: The the minor version of the tag to be released. -# VERSION_BUILD: The the build version of the tag to be released. +# VERSION_MAJOR: The major version of the tag to be released. +# VERSION_MINOR: The minor version of the tag to be released. +# VERSION_BUILD: The build version of the tag to be released. # ISO_SHA256: The sha 256 of the minikube-iso for the current release -# GITHUB_TOKEN: The Github API access token. Injected by the Jenkins credential provider. +# GITHUB_TOKEN: The Github API access token. Injected by the Jenkins credential provider. -set -e +set -e export TAGNAME=v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}-${VERSION_BUILD} @@ -90,7 +90,7 @@ ${WINDOWS_SHA256} ### ISO \`\`\`shell $ openssl sha256 minikube.iso -SHA256(minikube.iso)= +SHA256(minikube.iso)= ${ISO_SHA256} \`\`\` " @@ -116,4 +116,3 @@ github-release upload --user ${GITHUB_ORGANIZATION} --repo ${GITHUB_REPO} --tag github-release upload --user ${GITHUB_ORGANIZATION} --repo ${GITHUB_REPO} --tag ${TAGNAME} --name "minikube-windows-amd64.sha256" --file out/minikube-windows-amd64.exe.sha256 github-release upload --user ${GITHUB_ORGANIZATION} --repo ${GITHUB_REPO} --tag ${TAGNAME} --name "minikube-installer.exe" --file out/minikube-installer.exe github-release upload --user ${GITHUB_ORGANIZATION} --repo ${GITHUB_REPO} --tag ${TAGNAME} --name "minikube_${DEB_VERSION}.deb" --file out/minikube_${DEB_VERSION}.deb - diff --git a/hack/jenkins/release_update_releases_json.sh b/hack/jenkins/release_update_releases_json.sh index 4c9467fdd7..6343b4d16b 100644 --- a/hack/jenkins/release_update_releases_json.sh +++ b/hack/jenkins/release_update_releases_json.sh @@ -18,9 +18,9 @@ # This is intended to be run on a new release tag in order to generate the github release page for that release # The script expects the following env variabls: -# VERSION_MAJOR: The the major version of the tag to be released. -# VERSION_MINOR: The the minor version of the tag to be released. -# VERSION_BUILD: The the build version of the tag to be released. +# VERSION_MAJOR: The major version of the tag to be released. +# VERSION_MINOR: The minor version of the tag to be released. +# VERSION_BUILD: The build version of the tag to be released. set -e diff --git a/pkg/minikube/cluster/credentials.go b/pkg/minikube/cluster/credentials.go index 26f42daac8..9e451cfaf9 100644 --- a/pkg/minikube/cluster/credentials.go +++ b/pkg/minikube/cluster/credentials.go @@ -24,7 +24,7 @@ import ( ) var ( - // This is the internalIP the the API server and other components communicate on. + // This is the internalIP , the API server and other components communicate on. internalIP = net.ParseIP(util.DefaultServiceClusterIP) )