From 66a312a1e0c0e114ff8e37d25fc23289aae664ba Mon Sep 17 00:00:00 2001 From: Ray Zhou Date: Wed, 20 May 2020 20:31:19 +0800 Subject: [PATCH] Fix grammer errors in code comments --- build/hypersphere/Dockerfile | 5 +---- build/ks-apiserver/Dockerfile | 5 +---- build/ks-controller-manager/Dockerfile | 5 +---- cmd/controller-manager/app/helper.go | 2 +- cmd/ks-apiserver/app/server.go | 2 +- config/default/kustomization.yaml | 4 ++-- config/default/manager_auth_proxy_patch.yaml | 4 ++-- docs/powered-by-kubesphere.md | 5 ++--- docs/roadmap.md | 9 +++++---- hack/docker_build.sh | 1 - hack/generate_client.sh | 1 + 11 files changed, 17 insertions(+), 26 deletions(-) diff --git a/build/hypersphere/Dockerfile b/build/hypersphere/Dockerfile index 2b8dffccbd..0d5ed1e7ed 100644 --- a/build/hypersphere/Dockerfile +++ b/build/hypersphere/Dockerfile @@ -1,10 +1,7 @@ # Copyright 2018 The KubeSphere Authors. All rights reserved. -# Use of this source code is governed by a Apache license +# Use of this source code is governed by an Apache license # that can be found in the LICENSE file. -# Copyright 2018 The KubeSphere Authors. All rights reserved. -# Use of this source code is governed by a Apache license -# that can be found in the LICENSE file. FROM golang:1.12 as hypersphere-builder COPY / /go/src/kubesphere.io/kubesphere diff --git a/build/ks-apiserver/Dockerfile b/build/ks-apiserver/Dockerfile index 6b83416dc2..a2f60675a2 100644 --- a/build/ks-apiserver/Dockerfile +++ b/build/ks-apiserver/Dockerfile @@ -1,10 +1,7 @@ # Copyright 2018 The KubeSphere Authors. All rights reserved. -# Use of this source code is governed by a Apache license +# Use of this source code is governed by an Apache license # that can be found in the LICENSE file. -# Copyright 2018 The KubeSphere Authors. All rights reserved. -# Use of this source code is governed by a Apache license -# that can be found in the LICENSE file. FROM golang:1.12 as ks-apiserver-builder COPY / /go/src/kubesphere.io/kubesphere diff --git a/build/ks-controller-manager/Dockerfile b/build/ks-controller-manager/Dockerfile index ed8a1cc13e..0b9bc86158 100644 --- a/build/ks-controller-manager/Dockerfile +++ b/build/ks-controller-manager/Dockerfile @@ -1,10 +1,7 @@ # Copyright 2018 The KubeSphere Authors. All rights reserved. -# Use of this source code is governed by a Apache license +# Use of this source code is governed by an Apache license # that can be found in the LICENSE file. -# Copyright 2018 The KubeSphere Authors. All rights reserved. -# Use of this source code is governed by a Apache license -# that can be found in the LICENSE file. FROM golang:1.12 as controller-manager-builder COPY / /go/src/kubesphere.io/kubesphere diff --git a/cmd/controller-manager/app/helper.go b/cmd/controller-manager/app/helper.go index 621b3555ee..6913546910 100644 --- a/cmd/controller-manager/app/helper.go +++ b/cmd/controller-manager/app/helper.go @@ -9,7 +9,7 @@ import ( "time" ) -// WaitForAPIServer waits for the API Server's /healthz endpoint to report "ok" with timeout. +// WaitForAPIServer waits for the API Server's /healthz endpoint to report "ok" before timeout. func WaitForAPIServer(client clientset.Interface, timeout time.Duration) error { var lastErr error diff --git a/cmd/ks-apiserver/app/server.go b/cmd/ks-apiserver/app/server.go index 2f6d68f2b9..59dba63366 100644 --- a/cmd/ks-apiserver/app/server.go +++ b/cmd/ks-apiserver/app/server.go @@ -43,7 +43,7 @@ func NewAPIServerCommand() *cobra.Command { cmd := &cobra.Command{ Use: "ks-apiserver", - Long: `The KubeSphere API server validates and configures data for the api objects. + Long: `The KubeSphere API server validates and configures data for the API objects. The API Server services REST operations and provides the frontend to the cluster's shared state through which all other components interact.`, RunE: func(cmd *cobra.Command, args []string) error { diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 69d3bc9b99..3c32ae6e1f 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,4 +1,4 @@ -# Adds namespace to all resources. +# Add namespace to all resources. namespace: t-system # Value of this field is prepended to the @@ -13,7 +13,7 @@ namePrefix: t- # someName: someValue # Each entry in this list must resolve to an existing -# resource definition in YAML. These are the resource +# resource definition in YAML. These are the resource # files that kustomize reads, modifies and emits as a # YAML string, with resources separated by document # markers ("---"). diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml index 9b745f8e9a..f0c5ca903a 100644 --- a/config/default/manager_auth_proxy_patch.yaml +++ b/config/default/manager_auth_proxy_patch.yaml @@ -1,5 +1,5 @@ -# This patch inject a sidecar container which is a HTTP proxy for the controller manager, -# it performs RBAC authorization against the Kubernetes API using SubjectAccessReviews. +# This patch injects a sidecar container which is an HTTP proxy for the controller manager. +# It performs RBAC authorization against the Kubernetes API using SubjectAccessReviews. apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/docs/powered-by-kubesphere.md b/docs/powered-by-kubesphere.md index 94942c19fb..dfe38c1379 100644 --- a/docs/powered-by-kubesphere.md +++ b/docs/powered-by-kubesphere.md @@ -1,9 +1,8 @@ # Powered by KubeSphere -This page documents a list of institutions that are using KubeSphere Container Platform for research, testing and production, -or providing commercial products including KubeSphere. +This page documents a list of institutions that are using KubeSphere Container Platform for research, testing and production, or providing commercial products including KubeSphere. -You can open a Pull Request to submit your institution name and homepage if you are using KubeSphere. Thus we can better understand the user's scenarios and further improve project. +You can open a Pull Request to submit your institution name and homepage if you are using KubeSphere. Thus we can better understand the user's scenarios and further improve the project. - [本来生活](https://www.benlai.com/) - [新浪](https://sina.cn/) diff --git a/docs/roadmap.md b/docs/roadmap.md index 3cb30ef8f3..d79da1f587 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -1,6 +1,6 @@ # KubeSphere Roadmap -KubeSphere Roadmap demonstrates a list of open source product development plans and features being split by the edition and modules, as well as KubeSphere community's anticipation. Obviously, it details the future's direction of KubeSphere, but may change over time. We hope that can help you to get familiar with the project plans and vision through the Roadmap. Of course, if you have any better ideas, welcome to [Issues](https://github.com/kubesphere/kubesphere/issues). +KubeSphere Roadmap demonstrates a list of open source product development plans and features being split by the edition and modules, as well as KubeSphere community's anticipation. Obviously, it details the future's direction of KubeSphere, but may change over time. We hope that can help you to get familiar with the project plans and vision through the Roadmap. Of course, if you have any better ideas, welcome to filing [Issues](https://github.com/kubesphere/kubesphere/issues). ## Release Goals @@ -14,7 +14,7 @@ KubeSphere Roadmap demonstrates a list of open source product development plans | Release v2.0.2| Jul, 2019 | | Release v2.1.0| Nov, 2019 | | Release v2.1.1| Feb, 2020 | -| Release v3.0.0| Mar, 2020 | +| Release v3.0.0| June, 2020 | ## Features @@ -35,8 +35,9 @@ KubeSphere Roadmap demonstrates a list of open source product development plans - [ ] S2I/B2I supports webhook. - [ ] Image registry optimization. - [ ] Pipeline support integration with JIRA. -- [ ] Pipeline integrates the notification of kubesphere. -- [ ] Pipeline integrates kubesphere custom monitoring. +- [ ] Pipeline integrates the notification of KubeSphere. +- [ ] Pipeline integrates KubeSphere custom monitoring. + #### Observability - [ ] Logging console enhancement diff --git a/hack/docker_build.sh b/hack/docker_build.sh index 4b613c5760..00e488ebd7 100755 --- a/hack/docker_build.sh +++ b/hack/docker_build.sh @@ -19,7 +19,6 @@ docker build -f build/ks-apiserver/Dockerfile -t $REPO/ks-apiserver:$TAG . docker build -f build/ks-controller-manager/Dockerfile -t $REPO/ks-controller-manager:$TAG . # Push image to dockerhub, need to support multiple push - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin docker push $REPO/ks-apiserver:$TAG docker push $REPO/ks-controller-manager:$TAG diff --git a/hack/generate_client.sh b/hack/generate_client.sh index 7cf3f1c8d9..552785be75 100755 --- a/hack/generate_client.sh +++ b/hack/generate_client.sh @@ -1,4 +1,5 @@ #!/bin/bash + set -e GV="network:v1alpha1 servicemesh:v1alpha2 tenant:v1alpha1 devops:v1alpha1 iam:v1alpha2 devops:v1alpha3 cluster:v1alpha1"