From e9695cba4cdd53c37a70b86fd7236f2e5255fc9f Mon Sep 17 00:00:00 2001 From: yuswift Date: Thu, 15 Jul 2021 11:06:07 +0800 Subject: [PATCH] fix spelling typo Signed-off-by: yuswift --- config/crds/devops.kubesphere.io_s2ibuilders.yaml | 2 +- docs/roadmap.md | 2 +- hack/deploy-kubesphere.sh | 4 ++-- pkg/controller/loginrecord/loginrecord_controller_test.go | 2 +- pkg/controller/namespace/namespace_controller_test.go | 2 +- .../serviceaccount/serviceaccount_controller_test.go | 2 +- pkg/controller/storage/capability/capability_controller.go | 2 +- pkg/controller/workspace/workspace_controller_test.go | 2 +- pkg/controller/workspacerole/workspacerole_controller_test.go | 2 +- .../workspacerolebinding_controller_test.go | 2 +- .../workspacetemplate/workspacetemplate_controller_test.go | 2 +- pkg/models/monitoring/utils.go | 2 +- pkg/models/openpitrix/applications_test.go | 4 ++-- pkg/server/params/params.go | 2 +- pkg/simple/client/devops/jenkins/pipeline.go | 2 +- pkg/simple/client/network/ippool/ipam/ipam.go | 2 +- .../kubesphere.io/api/devops/v1alpha1/openapi_generated.go | 2 +- .../src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types.go | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/config/crds/devops.kubesphere.io_s2ibuilders.yaml b/config/crds/devops.kubesphere.io_s2ibuilders.yaml index 28ee72ff6..f4531ccee 100644 --- a/config/crds/devops.kubesphere.io_s2ibuilders.yaml +++ b/config/crds/devops.kubesphere.io_s2ibuilders.yaml @@ -51,7 +51,7 @@ spec: description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster Important: Run "make" to regenerate code after modifying this file' properties: addHost: - description: AddHost Add a line to /etc/hosts for test purpose or private use in LAN. Its format is host:IP,muliple hosts can be added by using multiple --add-host + description: AddHost Add a line to /etc/hosts for test purpose or private use in LAN. Its format is host:IP,multiple hosts can be added by using multiple --add-host items: type: string type: array diff --git a/docs/roadmap.md b/docs/roadmap.md index 55ced85d7..9e78f5f4e 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -67,7 +67,7 @@ KubeSphere Roadmap demonstrates a list of open source product development plans ### Observability -- [x] Utilizing existing Promethues stack setup. [#3068](https://github.com/kubesphere/kubesphere/issues/3068) [#1164](https://github.com/kubesphere/ks-installer/pull/1164) [Guide](https://kubesphere.io/docs/faq/observability/byop/) +- [x] Utilizing existing Prometheus stack setup. [#3068](https://github.com/kubesphere/kubesphere/issues/3068) [#1164](https://github.com/kubesphere/ks-installer/pull/1164) [Guide](https://kubesphere.io/docs/faq/observability/byop/) #### Custom monitoring [#3067](https://github.com/kubesphere/kubesphere/issues/3067) diff --git a/hack/deploy-kubesphere.sh b/hack/deploy-kubesphere.sh index b1d5c192d..54dc08016 100755 --- a/hack/deploy-kubesphere.sh +++ b/hack/deploy-kubesphere.sh @@ -45,7 +45,7 @@ fi wget --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --tries 3 https://raw.githubusercontent.com/kubesphere/ks-installer/master/deploy/kubesphere-installer.yaml wget --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --tries 3 https://raw.githubusercontent.com/kubesphere/ks-installer/master/deploy/cluster-configuration.yaml -#TODO: override ks-apiserver and ks-controller-manager images with specific tag +#TODO: override ks-apiserver and ks-controller-manager images with specific tag kubectl apply -f kubesphere-installer.yaml kubectl apply -f cluster-configuration.yaml @@ -53,4 +53,4 @@ kubectl apply -f cluster-configuration.yaml wait_for_installation_finish # Expose KubeSphere API Server -kubectl -n kubesphere-system patch svc ks-apiserver -p '{"spec":{"type":"NodePort","ports":[{"name":"ks-apiserver","port":80,"protocal":"TCP","targetPort":9090,"nodePort":30881}]}}' +kubectl -n kubesphere-system patch svc ks-apiserver -p '{"spec":{"type":"NodePort","ports":[{"name":"ks-apiserver","port":80,"protocol":"TCP","targetPort":9090,"nodePort":30881}]}}' diff --git a/pkg/controller/loginrecord/loginrecord_controller_test.go b/pkg/controller/loginrecord/loginrecord_controller_test.go index 50c0d5dbf..b3d5a5276 100644 --- a/pkg/controller/loginrecord/loginrecord_controller_test.go +++ b/pkg/controller/loginrecord/loginrecord_controller_test.go @@ -94,7 +94,7 @@ var _ = Describe("LoginRecord", func() { controller = NewLoginRecordController(k8sClient, ksClient, loginRecordInformer, userInformer, time.Hour, 1) }) - // Add Tests for OpenAPI validation (or additonal CRD features) specified in + // Add Tests for OpenAPI validation (or additional CRD features) specified in // your API definition. // Avoid adding tests for vanilla CRUD operations because they would // test Kubernetes API server, which isn't the goal here. diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go index 6464fd1f3..7e81805a8 100644 --- a/pkg/controller/namespace/namespace_controller_test.go +++ b/pkg/controller/namespace/namespace_controller_test.go @@ -46,7 +46,7 @@ var _ = Describe("Namespace", func() { Expect(k8sClient.Create(context.Background(), workspace)).Should(Succeed()) }) - // Add Tests for OpenAPI validation (or additonal CRD features) specified in + // Add Tests for OpenAPI validation (or additional CRD features) specified in // your API definition. // Avoid adding tests for vanilla CRUD operations because they would // test Kubernetes API server, which isn't the goal here. diff --git a/pkg/controller/serviceaccount/serviceaccount_controller_test.go b/pkg/controller/serviceaccount/serviceaccount_controller_test.go index 87f53c4b3..84bdfe569 100644 --- a/pkg/controller/serviceaccount/serviceaccount_controller_test.go +++ b/pkg/controller/serviceaccount/serviceaccount_controller_test.go @@ -76,7 +76,7 @@ var _ = Describe("ServiceAccount", func() { } }) - // Add Tests for OpenAPI validation (or additonal CRD features) specified in + // Add Tests for OpenAPI validation (or additional CRD features) specified in // your API definition. // Avoid adding tests for vanilla CRUD operations because they would // test Kubernetes API server, which isn't the goal here. diff --git a/pkg/controller/storage/capability/capability_controller.go b/pkg/controller/storage/capability/capability_controller.go index 7fce92afb..c4ae762ca 100644 --- a/pkg/controller/storage/capability/capability_controller.go +++ b/pkg/controller/storage/capability/capability_controller.go @@ -128,7 +128,7 @@ func NewController( // ProvisionerCapability acts as a value source of its relevant StorageClassCapabilities // so when a PC is created/updated, the corresponding SCCs should be created(if not exists)/updated - // we achive this by simply enqueueing the StorageClasses of the same provisioner + // we achieve this by simply enqueueing the StorageClasses of the same provisioner // but don't overdo by cascade deleting the SCCs when a PC is deleted // since the role of PCs is more like a template rather than owner to SCCs diff --git a/pkg/controller/workspace/workspace_controller_test.go b/pkg/controller/workspace/workspace_controller_test.go index 129a02885..917750b5c 100644 --- a/pkg/controller/workspace/workspace_controller_test.go +++ b/pkg/controller/workspace/workspace_controller_test.go @@ -33,7 +33,7 @@ var _ = Describe("Workspace", func() { const timeout = time.Second * 30 const interval = time.Second * 1 - // Add Tests for OpenAPI validation (or additonal CRD features) specified in + // Add Tests for OpenAPI validation (or additional CRD features) specified in // your API definition. // Avoid adding tests for vanilla CRUD operations because they would // test Kubernetes API server, which isn't the goal here. diff --git a/pkg/controller/workspacerole/workspacerole_controller_test.go b/pkg/controller/workspacerole/workspacerole_controller_test.go index 5b44d10a7..e1a85d210 100644 --- a/pkg/controller/workspacerole/workspacerole_controller_test.go +++ b/pkg/controller/workspacerole/workspacerole_controller_test.go @@ -47,7 +47,7 @@ var _ = Describe("WorkspaceRole", func() { Expect(k8sClient.Create(context.Background(), workspace)).Should(Succeed()) }) - // Add Tests for OpenAPI validation (or additonal CRD features) specified in + // Add Tests for OpenAPI validation (or additional CRD features) specified in // your API definition. // Avoid adding tests for vanilla CRUD operations because they would // test Kubernetes API server, which isn't the goal here. diff --git a/pkg/controller/workspacerolebinding/workspacerolebinding_controller_test.go b/pkg/controller/workspacerolebinding/workspacerolebinding_controller_test.go index ed8bdcfa9..c842b5819 100644 --- a/pkg/controller/workspacerolebinding/workspacerolebinding_controller_test.go +++ b/pkg/controller/workspacerolebinding/workspacerolebinding_controller_test.go @@ -47,7 +47,7 @@ var _ = Describe("WorkspaceRoleBinding", func() { Expect(k8sClient.Create(context.Background(), workspace)).Should(Succeed()) }) - // Add Tests for OpenAPI validation (or additonal CRD features) specified in + // Add Tests for OpenAPI validation (or additional CRD features) specified in // your API definition. // Avoid adding tests for vanilla CRUD operations because they would // test Kubernetes API server, which isn't the goal here. diff --git a/pkg/controller/workspacetemplate/workspacetemplate_controller_test.go b/pkg/controller/workspacetemplate/workspacetemplate_controller_test.go index 58fa3039d..957b6e29c 100644 --- a/pkg/controller/workspacetemplate/workspacetemplate_controller_test.go +++ b/pkg/controller/workspacetemplate/workspacetemplate_controller_test.go @@ -61,7 +61,7 @@ var _ = Describe("WorkspaceTemplate", func() { Expect(err).NotTo(HaveOccurred()) }) - // Add Tests for OpenAPI validation (or additonal CRD features) specified in + // Add Tests for OpenAPI validation (or additional CRD features) specified in // your API definition. // Avoid adding tests for vanilla CRUD operations because they would // test Kubernetes API server, which isn't the goal here. diff --git a/pkg/models/monitoring/utils.go b/pkg/models/monitoring/utils.go index 5b369b0bd..7ab50e766 100644 --- a/pkg/models/monitoring/utils.go +++ b/pkg/models/monitoring/utils.go @@ -203,7 +203,7 @@ func updateMetricStatData(metric monitoring.Metric, scalingMap map[string]float6 metricData := metric.MetricData for index, metricValue := range metricData.MetricValues { - // calulate min, max, avg value first, then squash points with factor + // calculate min, max, avg value first, then squash points with factor if metricData.MetricType == monitoring.MetricTypeMatrix { metricData.MetricValues[index].MinValue = getMinPointValue(metricValue.Series) metricData.MetricValues[index].MaxValue = getMaxPointValue(metricValue.Series) diff --git a/pkg/models/openpitrix/applications_test.go b/pkg/models/openpitrix/applications_test.go index 18330b66f..b8227d1bd 100644 --- a/pkg/models/openpitrix/applications_test.go +++ b/pkg/models/openpitrix/applications_test.go @@ -47,7 +47,7 @@ func TestOpenPitrixApp(t *testing.T) { // validate package validateResp, err := appOperator.ValidatePackage(validateReq) if err != nil || validateResp.Error != "" { - klog.Errorf("validate pacakge failed, error: %s", err) + klog.Errorf("validate package failed, error: %s", err) t.FailNow() } @@ -58,7 +58,7 @@ func TestOpenPitrixApp(t *testing.T) { // validate corrupted package validateResp, err = appOperator.ValidatePackage(validateReq) if err == nil { - klog.Errorf("validate pacakge failed, error: %s", err) + klog.Errorf("validate package failed, error: %s", err) t.FailNow() } diff --git a/pkg/server/params/params.go b/pkg/server/params/params.go index 0f33e90be..6403bf8cc 100644 --- a/pkg/server/params/params.go +++ b/pkg/server/params/params.go @@ -56,7 +56,7 @@ func ParsePaging(req *restful.Request) (limit, offset int) { } offset = (page - 1) * limit - // use the explict offset + // use the explicit offset if start := req.QueryParameter("start"); start != "" { offset = AtoiOrDefault(start, offset) } diff --git a/pkg/simple/client/devops/jenkins/pipeline.go b/pkg/simple/client/devops/jenkins/pipeline.go index c1d89c304..f8fff086f 100644 --- a/pkg/simple/client/devops/jenkins/pipeline.go +++ b/pkg/simple/client/devops/jenkins/pipeline.go @@ -115,7 +115,7 @@ func (p *Pipeline) ListPipelines() (*devops.PipelineList, error) { } klog.Errorf("API '%s' request response code is '%d'", p.Path, jErr.Code) } else { - err = fmt.Errorf("unknow errors happend when communicate with Jenkins") + err = fmt.Errorf("unknow errors happened when communicate with Jenkins") } return nil, err } diff --git a/pkg/simple/client/network/ippool/ipam/ipam.go b/pkg/simple/client/network/ippool/ipam/ipam.go index cfb6b94e5..19aeecc56 100644 --- a/pkg/simple/client/network/ippool/ipam/ipam.go +++ b/pkg/simple/client/network/ippool/ipam/ipam.go @@ -237,7 +237,7 @@ func (c IPAMClient) autoAssign(handleID string, attrs map[string]string, request func (c IPAMClient) assignFromExistingBlock(block *v1alpha1.IPAMBlock, handleID string, attrs map[string]string) (*cnet.IPNet, error) { ips := block.AutoAssign(1, handleID, attrs) if len(ips) == 0 { - return nil, fmt.Errorf("block %s has no availabe IP", block.BlockName()) + return nil, fmt.Errorf("block %s has no available IP", block.BlockName()) } err := c.incrementHandle(handleID, block, 1) diff --git a/staging/src/kubesphere.io/api/devops/v1alpha1/openapi_generated.go b/staging/src/kubesphere.io/api/devops/v1alpha1/openapi_generated.go index 38985398a..776087938 100644 --- a/staging/src/kubesphere.io/api/devops/v1alpha1/openapi_generated.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha1/openapi_generated.go @@ -14823,7 +14823,7 @@ func schema_pkg_apis_devops_v1alpha1_S2iConfig(ref common.ReferenceCallback) com }, "addHost": { SchemaProps: spec.SchemaProps{ - Description: "AddHost Add a line to /etc/hosts for test purpose or private use in LAN. Its format is host:IP,muliple hosts can be added by using multiple --add-host", + Description: "AddHost Add a line to /etc/hosts for test purpose or private use in LAN. Its format is host:IP,multiple hosts can be added by using multiple --add-host", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ diff --git a/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types.go b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types.go index 225cf6a54..80525c091 100644 --- a/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types.go +++ b/staging/src/kubesphere.io/api/devops/v1alpha1/s2ibuilder_types.go @@ -392,7 +392,7 @@ type S2iConfig struct { // This url can be a reference within the builder image if the scheme is specified as image:// ImageScriptsURL string `json:"imageScriptsUrl,omitempty"` - // AddHost Add a line to /etc/hosts for test purpose or private use in LAN. Its format is host:IP,muliple hosts can be added by using multiple --add-host + // AddHost Add a line to /etc/hosts for test purpose or private use in LAN. Its format is host:IP,multiple hosts can be added by using multiple --add-host AddHost []string `json:"addHost,omitempty"` // Export Push the result image to specify image registry in tag