Skip to content

Commit

Permalink
Fix grammer errors in code comments
Browse files Browse the repository at this point in the history
  • Loading branch information
rayzhou2017 committed May 20, 2020
1 parent 6f97e3d commit 66a312a
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 26 deletions.
5 changes: 1 addition & 4 deletions build/hypersphere/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions build/ks-apiserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 1 addition & 4 deletions build/ks-controller-manager/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/controller-manager/app/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion cmd/ks-apiserver/app/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 ("---").
Expand Down
4 changes: 2 additions & 2 deletions config/default/manager_auth_proxy_patch.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
5 changes: 2 additions & 3 deletions docs/powered-by-kubesphere.md
Original file line number Diff line number Diff line change
@@ -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/)
Expand Down
9 changes: 5 additions & 4 deletions docs/roadmap.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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

Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion hack/docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions hack/generate_client.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash

set -e

GV="network:v1alpha1 servicemesh:v1alpha2 tenant:v1alpha1 devops:v1alpha1 iam:v1alpha2 devops:v1alpha3 cluster:v1alpha1"
Expand Down

0 comments on commit 66a312a

Please sign in to comment.