Merge branch 'master' of https://github.com/kubesphere/kubesphere

README.md

@@ -45,7 +45,7 @@ The following screenshots give a close insight into KubeSphere. Please check [Wh
   </tr>
 </table>
 
-## Demo Environment
+## Demo environment
 
 🎮 Using the account `demo1 / Demo123` to log in the [demo environment](https://demo.kubesphere.io/). Please note the account is granted view access. 
 
@@ -111,7 +111,7 @@ KubeSphere uses a loosely-coupled architecture that separates the [frontend](htt
 
 ----
 
-## Latest Release
+## Latest release
 
 🎉 KubeSphere 3.1.1 is now available! See the [Release Notes For 3.1.1](https://kubesphere.io/docs/release/release-v311/) for the updates.
 
@@ -119,7 +119,7 @@ KubeSphere uses a loosely-coupled architecture that separates the [frontend](htt
 
 KubeSphere can run anywhere from on-premise datacenter to any cloud to edge. In addition, it can be deployed on any version-compatible Kubernetes cluster.
 
-### Quick Start
+### Quick start
 
 1. Run the following commands to install KubeSphere on an exiting Kubernetes cluster:
 
@@ -137,10 +137,10 @@ kubectl logs -n kubesphere-system $(kubectl get pod -n kubesphere-system -l app=
 
 > 👨‍💻 No Kubernetes cluster? Try [All-in-one](https://kubesphere.io/docs/quick-start/all-in-one-on-linux/) to install a single-node Kubernetes and KubeSphere on your Linux machine. 
 
-### 🐯 Katacoda for Quick Learning
+### 🐯 Katacoda for quick learning
 
 [Katacoda](https://www.katacoda.com/) allows you to explore how to install KubeSphere on an existing Kubernetes cluster in a browser. You can start the [Katacoda scenario with KubeSphere](https://www.katacoda.com/kubesphere/scenarios/install-kubesphere-on-kubernetes) in minutes.
-### KubeSphere for Hosted Kubernetes Services
+### KubeSphere for hosted Kubernetes services
 
 KubeSphere is hosted on the following cloud providers, you can try KubeSphere by one-click installation on their hosted Kubernetes services. 
 
@@ -153,7 +153,7 @@ You can also install KubeSphere on other hosted Kubernetes services within minut
 
 > 👨‍💻 No internet access? Refer to the [Air-gapped Installation on Kubernetes](https://kubesphere.io/docs/installing-on-kubernetes/on-prem-kubernetes/install-ks-on-linux-airgapped/) or [Air-gapped Installation on Linux](https://kubesphere.io/docs/installing-on-linux/introduction/air-gapped-installation/) for instructions on how to use private registry to install KubeSphere.
 
-## Contributing, Support, Discussion, and Community
+## Contributing, support, discussion, and community
 
 We :heart: your contribution. The [community](https://github.com/kubesphere/community) walks you through how to get started contributing KubeSphere. The [development guide](https://github.com/kubesphere/community/tree/master/developer-guide/development) explains how to set up development environment.
 
@@ -163,7 +163,7 @@ We :heart: your contribution. The [community](https://github.com/kubesphere/comm
 
 Please submit any KubeSphere bugs, issues, and feature requests to [KubeSphere GitHub Issue](https://github.com/kubesphere/kubesphere/issues).
 
-## Who are Using KubeSphere
+## Who are using KubeSphere
 
 The [user case studies](https://kubesphere.io/case/) page includes the user list of the project. You can [leave a comment](https://github.com/kubesphere/kubesphere/issues/4123) to let us know your use case.
 

pkg/models/openpitrix/repos.go

@@ -220,10 +220,6 @@ func (c *repoOperator) ModifyRepo(id string, request *ModifyRepoRequest) error {
 			if userInfo != nil {
 				cred.Password, _ = userInfo.Password()
 				cred.Username = userInfo.Username()
-			} else {
-				// trim the old credential
-				cred.Password, _ = userInfo.Password()
-				cred.Username = userInfo.Username()
 			}
 		} else if strings.HasPrefix(*request.URL, "s3://") {
 			cfg := v1alpha1.S3Config{}

pkg/models/resources/v1alpha3/federatedingress/federatedingresses.go

@@ -73,9 +73,5 @@ func (g *fedIngressGetter) filter(object runtime.Object, filter query.Filter) bo
 	if !ok {
 		return false
 	}
-
-	switch filter.Field {
-	default:
-		return v1alpha3.DefaultObjectMetaFilter(deployment.ObjectMeta, filter)
-	}
+	return v1alpha3.DefaultObjectMetaFilter(deployment.ObjectMeta, filter)
 }

pkg/models/resources/v1alpha3/ingress/ingresses.go

@@ -78,9 +78,5 @@ func (g *ingressGetter) filter(object runtime.Object, filter query.Filter) bool
 	if !ok {
 		return false
 	}
-
-	switch filter.Field {
-	default:
-		return v1alpha3.DefaultObjectMetaFilter(deployment.ObjectMeta, filter)
-	}
+	return v1alpha3.DefaultObjectMetaFilter(deployment.ObjectMeta, filter)
 }

pkg/models/tenant/metering.go

@@ -242,16 +242,9 @@ func (t *tenantOperator) makeQueryOptions(user user.Info, q meteringv1alpha1.Que
 			return
 		}
 		if decision != authorizer.DecisionAllow {
-			if q.WorkspaceName != "" {
-				// specified by WorkspaceName & NamespaceName and not allowed
-				if q.NamespaceName != "" {
-					return qo, errors.New(fmt.Sprintf(meteringv1alpha1.ErrScopeNotAllowed, nsScope))
-				}
-			} else {
-				// specified by NamespaceName & NamespaceName and not allowed
-				if q.NamespaceName != "" {
-					return qo, errors.New(fmt.Sprintf(meteringv1alpha1.ErrScopeNotAllowed, nsScope))
-				}
+			// specified by WorkspaceName & NamespaceName and not allowed
+			if q.NamespaceName != "" {
+				return qo, errors.New(fmt.Sprintf(meteringv1alpha1.ErrScopeNotAllowed, nsScope))
 			}
 
 			if q.ResourceFilter == "" {