Merge pull request #4011 from ks-ci-bot/cherry-pick-3965-to-release-3.1

[release-3.1] Improve the s3 uploader for better performance.

pkg/api/alerting/v2alpha1/types.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"github.com/pkg/errors"
 	prommodel "github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/pkg/timestamp"

pkg/api/auditing/v1alpha1/types.go

@@ -20,7 +20,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 
 	"kubesphere.io/kubesphere/pkg/simple/client/auditing"
 )

pkg/api/events/v1alpha1/types.go

@@ -20,7 +20,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 
 	"kubesphere.io/kubesphere/pkg/simple/client/events"
 )

pkg/api/logging/v1alpha2/types.go

@@ -20,7 +20,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 
 	"kubesphere.io/kubesphere/pkg/simple/client/logging"
 )

pkg/api/metering/v1alpha1/types.go

@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"time"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 
 	"kubesphere.io/kubesphere/pkg/apiserver/query"
 	model "kubesphere.io/kubesphere/pkg/models/monitoring"

pkg/api/utils.go

@@ -21,7 +21,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/klog"
 )

pkg/apis/auditing/v1alpha1/zz_generated.deepcopy.go

@@ -23,7 +23,7 @@ package v1alpha1
 import (
 	auditregistrationv1alpha1 "k8s.io/api/auditregistration/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 

pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go

@@ -21,7 +21,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 

pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go

@@ -21,7 +21,7 @@ limitations under the License.
 package v1alpha2
 
 import (
-	"k8s.io/api/rbac/v1"
+	v1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 

pkg/apis/network/v1alpha1/zz_generated.deepcopy.go

@@ -21,7 +21,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"k8s.io/api/networking/v1"
+	v1 "k8s.io/api/networking/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 

pkg/apis/notification/v2beta1/zz_generated.deepcopy.go

@@ -21,7 +21,7 @@ limitations under the License.
 package v2beta1
 
 import (
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )

pkg/apis/servicemesh/v1alpha2/zz_generated.deepcopy.go

@@ -21,7 +21,7 @@ limitations under the License.
 package v1alpha2
 
 import (
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 

pkg/apis/types/v1beta1/zz_generated.deepcopy.go

@@ -21,7 +21,7 @@ limitations under the License.
 package v1beta1
 
 import (
-	"k8s.io/api/rbac/v1"
+	v1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )

pkg/apiserver/apiserver.go

@@ -30,7 +30,7 @@ import (
 
 	"strconv"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	urlruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"

pkg/apiserver/authentication/identityprovider/aliyunidaas/idaas_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"golang.org/x/oauth2"
-	"gopkg.in/yaml.v3"
+	yaml "gopkg.in/yaml.v3"
 
 	"kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider"
 	"kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth"

pkg/apiserver/authentication/identityprovider/github/github_test.go

@@ -30,7 +30,7 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 	"golang.org/x/oauth2"
-	"gopkg.in/yaml.v3"
+	yaml "gopkg.in/yaml.v3"
 
 	"kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider"
 	"kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth"

pkg/apiserver/authentication/identityprovider/ldap/ldap_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"gopkg.in/yaml.v3"
+	yaml "gopkg.in/yaml.v3"
 
 	"kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth"
 )

pkg/apiserver/authentication/identityprovider/oidc/oidc.go

@@ -27,8 +27,8 @@ import (
 
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 
-	"github.com/coreos/go-oidc"
-	"github.com/form3tech-oss/jwt-go"
+	oidc "github.com/coreos/go-oidc"
+	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/mitchellh/mapstructure"
 	"golang.org/x/oauth2"
 

pkg/apiserver/authentication/identityprovider/oidc/oidc_test.go

@@ -32,11 +32,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/form3tech-oss/jwt-go"
+	jwt "github.com/dgrijalva/jwt-go"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
-	"gopkg.in/square/go-jose.v2"
+	jose "gopkg.in/square/go-jose.v2"
 
 	"kubesphere.io/kubesphere/pkg/apiserver/authentication/identityprovider"
 	"kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth"

pkg/apiserver/authentication/oauth/oauth_options_test.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"gopkg.in/yaml.v3"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestDefaultAuthOptions(t *testing.T) {

pkg/apiserver/authentication/token/jwt.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/form3tech-oss/jwt-go"
+	jwt "github.com/dgrijalva/jwt-go"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/klog"
 )

pkg/apiserver/config/config_test.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 
 	networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
 	"kubesphere.io/kubesphere/pkg/apiserver/authentication/oauth"

pkg/apiserver/query/types.go

@@ -19,7 +19,7 @@ package query
 import (
 	"strconv"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/labels"
 
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"

pkg/apiserver/query/types_test.go

@@ -21,7 +21,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"github.com/google/go-cmp/cmp"
 )
 

pkg/apiserver/runtime/runtime.go

@@ -17,7 +17,7 @@ limitations under the License.
 package runtime
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 

pkg/controller/devopscredential/devopscredential_controller.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/controller/devopsproject/devopsproject_controller.go

@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/controller/pipeline/pipeline_controller.go

@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/kapis/alerting/v1/register.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"kubesphere.io/kubesphere/pkg/kapis/generic"

pkg/kapis/alerting/v2alpha1/handler.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v2alpha1
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
 	"k8s.io/klog"
 

pkg/kapis/alerting/v2alpha1/register.go

@@ -19,7 +19,7 @@ package v2alpha1
 import (
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 	promresourcesclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
 	"k8s.io/apimachinery/pkg/runtime/schema"

pkg/kapis/cluster/v1alpha1/handler.go

@@ -28,8 +28,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/emicklei/go-restful"
-	"gopkg.in/yaml.v2"
+	restful "github.com/emicklei/go-restful"
+	yaml "gopkg.in/yaml.v2"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"

pkg/kapis/cluster/v1alpha1/register.go

@@ -19,7 +19,7 @@ package v1alpha1
 import (
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	k8sinformers "k8s.io/client-go/informers"

pkg/kapis/config/v1alpha2/register.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha2
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	kubesphereconfig "kubesphere.io/kubesphere/pkg/apiserver/config"

pkg/kapis/devops/v1alpha2/devops.go

@@ -23,7 +23,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apiserver/pkg/authentication/user"
 	log "k8s.io/klog"
 	"k8s.io/klog/v2"

pkg/kapis/devops/v1alpha2/pipeline_sonar.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha2
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/klog"
 
 	"kubesphere.io/kubesphere/pkg/api"

pkg/kapis/devops/v1alpha2/register.go

@@ -22,7 +22,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/proxy"

pkg/kapis/devops/v1alpha2/s2ibinary.go

@@ -21,7 +21,7 @@ import (
 	"net/http"
 
 	"code.cloudfoundry.org/bytefmt"
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/klog"
 
 	"kubesphere.io/kubesphere/pkg/api"

pkg/kapis/devops/v1alpha3/handler.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha3
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/informers"

pkg/kapis/devops/v1alpha3/register.go

@@ -21,7 +21,7 @@ package v1alpha3
 import (
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"

pkg/kapis/generic/generic.go

@@ -22,7 +22,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/proxy"
 	"k8s.io/klog"

pkg/kapis/generic/generic_test.go

@@ -21,7 +21,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"github.com/google/go-cmp/cmp"
 )
 

pkg/kapis/iam/v1alpha2/handler.go

@@ -25,7 +25,7 @@ import (
 	"kubesphere.io/kubesphere/pkg/apiserver/request"
 	"kubesphere.io/kubesphere/pkg/models/auth"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/klog"

pkg/kapis/iam/v1alpha2/register.go

@@ -21,7 +21,7 @@ import (
 
 	"kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 	rbacv1 "k8s.io/api/rbac/v1"
 	v1 "k8s.io/api/rbac/v1"

pkg/kapis/kubeedge/v1alpha1/register.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"kubesphere.io/kubesphere/pkg/kapis/generic"

pkg/kapis/metering/v1alpha1/handler.go

@@ -19,7 +19,7 @@
 package v1alpha1
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/client-go/kubernetes"
 
 	openpitrixoptions "kubesphere.io/kubesphere/pkg/simple/client/openpitrix"

pkg/kapis/metering/v1alpha1/register.go

@@ -24,7 +24,7 @@ import (
 
 	"kubesphere.io/kubesphere/pkg/client/clientset/versioned"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/kubernetes"

pkg/kapis/monitoring/v1alpha3/handler.go

@@ -23,6 +23,7 @@ import (
 	"regexp"
 	"strings"
 
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/klog"
 
 	openpitrixoptions "kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
@@ -31,7 +32,6 @@ import (
 	"kubesphere.io/kubesphere/pkg/client/clientset/versioned"
 	"kubesphere.io/kubesphere/pkg/models/openpitrix"
 
-	"github.com/emicklei/go-restful"
 	"k8s.io/client-go/kubernetes"
 
 	"kubesphere.io/kubesphere/pkg/api"

pkg/kapis/monitoring/v1alpha3/helper.go

@@ -29,7 +29,7 @@ import (
 
 	"github.com/jszwec/csvutil"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 

pkg/kapis/monitoring/v1alpha3/meter.go

@@ -7,7 +7,7 @@ import (
 	"kubesphere.io/kubesphere/pkg/models/openpitrix"
 	"kubesphere.io/kubesphere/pkg/server/params"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/klog"
 

pkg/kapis/monitoring/v1alpha3/register.go

@@ -24,7 +24,7 @@ import (
 
 	"kubesphere.io/kubesphere/pkg/client/clientset/versioned"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/kubernetes"

pkg/kapis/network/v1alpha2/handler.go

@@ -22,7 +22,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/klog"
 
 	"kubesphere.io/kubesphere/pkg/api"

pkg/kapis/notification/v1/register.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"kubesphere.io/kubesphere/pkg/kapis/generic"

pkg/kapis/notification/v2beta1/handler.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v2beta1
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/klog"

pkg/kapis/notification/v2beta1/register.go

@@ -21,7 +21,7 @@ package v2beta1
 import (
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	openapi "github.com/emicklei/go-restful-openapi"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/kubernetes"

pkg/kapis/oauth/handler.go

@@ -23,7 +23,7 @@ import (
 
 	"kubesphere.io/kubesphere/pkg/server/errors"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apiserver/pkg/authentication/user"

pkg/kapis/oauth/register.go

@@ -19,7 +19,7 @@ package oauth
 import (
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 
 	"kubesphere.io/kubesphere/pkg/api"

pkg/kapis/operations/v1alpha2/handler.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	k8serr "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/kubernetes"
 

pkg/kapis/operations/v1alpha2/register.go

@@ -19,7 +19,7 @@ package v1alpha2
 import (
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/kubernetes"
 

pkg/kapis/resources/v1alpha2/handler.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	v1 "k8s.io/api/core/v1"
 	k8serr "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/kubernetes"

pkg/kapis/resources/v1alpha2/register.go

@@ -19,7 +19,7 @@ package v1alpha2
 import (
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"

pkg/kapis/resources/v1alpha3/handler.go

@@ -19,7 +19,7 @@ package v1alpha3
 import (
 	"strings"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/klog"
 
 	"kubesphere.io/kubesphere/pkg/api"

pkg/kapis/resources/v1alpha3/register.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha3
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/cache"

pkg/kapis/servicemesh/metrics/install/install.go

@@ -17,7 +17,7 @@ limitations under the License.
 package install
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	urlruntime "k8s.io/apimachinery/pkg/util/runtime"
 
 	"kubesphere.io/kubesphere/pkg/apiserver/runtime"

pkg/kapis/servicemesh/metrics/v1alpha2/handler.go

@@ -21,7 +21,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/klog"
 
 	"kubesphere.io/kubesphere/pkg/api"

pkg/kapis/servicemesh/metrics/v1alpha2/register.go

@@ -19,7 +19,7 @@ package v1alpha2
 import (
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 

pkg/kapis/tenant/v1alpha2/handler.go

@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/kapis/tenant/v1alpha2/metering.go

@@ -3,7 +3,7 @@ package v1alpha2
 import (
 	"fmt"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/klog"
 
 	"strconv"

pkg/kapis/tenant/v1alpha2/register.go

@@ -23,7 +23,7 @@ import (
 
 	"kubesphere.io/kubesphere/pkg/models/metering"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"

pkg/kapis/terminal/v1alpha2/handler.go

@@ -24,7 +24,7 @@ import (
 	"kubesphere.io/kubesphere/pkg/apiserver/authorization/authorizer"
 	requestctx "kubesphere.io/kubesphere/pkg/apiserver/request"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"github.com/gorilla/websocket"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"

pkg/kapis/terminal/v1alpha2/register.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1alpha2
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	restfulspec "github.com/emicklei/go-restful-openapi"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/kubernetes"

pkg/kapis/version/register.go

@@ -17,7 +17,7 @@ limitations under the License.
 package version
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/discovery"
 	"k8s.io/klog"

pkg/models/devops/project_pipeline_sonar_handler.go

@@ -19,7 +19,7 @@ package devops
 import (
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/klog"
 
 	"kubesphere.io/kubesphere/pkg/server/errors"

pkg/models/devops/s2ibinary_handler.go

@@ -26,7 +26,7 @@ import (
 	"code.cloudfoundry.org/bytefmt"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	awsS3 "github.com/aws/aws-sdk-go/service/s3"
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/util/retry"
 	"k8s.io/klog"
@@ -103,7 +103,7 @@ func (s *s2iBinaryUploader) UploadS2iBinary(namespace, name, md5 string, fileHea
 	copy.Spec.FileName = fileHeader.Filename
 	copy.Spec.DownloadURL = fmt.Sprintf(GetS2iBinaryURL, namespace, name, copy.Spec.FileName)
 
-	err = s.s3Client.Upload(fmt.Sprintf("%s-%s", namespace, name), copy.Spec.FileName, binFile)
+	err = s.s3Client.Upload(fmt.Sprintf("%s-%s", namespace, name), copy.Spec.FileName, binFile, int(fileHeader.Size))
 	if err != nil {
 		if aerr, ok := err.(awserr.Error); ok {
 			switch aerr.Code() {

pkg/models/git/git.go

@@ -19,7 +19,7 @@ package git
 import (
 	"fmt"
 
-	"gopkg.in/src-d/go-git.v4"
+	git "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/config"
 	"gopkg.in/src-d/go-git.v4/plumbing/transport/http"
 	"gopkg.in/src-d/go-git.v4/storage/memory"

pkg/models/openpitrix/applications.go

@@ -115,7 +115,7 @@ func (c *applicationOperator) createApp(app *v1alpha1.HelmApplication, iconData
 	if len(iconData) != 0 {
 		// save icon attachment
 		iconId := idutils.GetUuid(v1alpha1.HelmAttachmentPrefix)
-		err = c.backingStoreClient.Upload(iconId, iconId, bytes.NewBuffer(iconData))
+		err = c.backingStoreClient.Upload(iconId, iconId, bytes.NewBuffer(iconData), len(iconData))
 		if err != nil {
 			klog.Errorf("save icon attachment failed, error: %s", err)
 			return nil, err
@@ -498,7 +498,7 @@ func (c *applicationOperator) modifyAppAttachment(app *v1alpha1.HelmApplication,
 				// add attachment to app
 				add := idutils.GetUuid("att-")
 				*attachments = append(*attachments, add)
-				err = c.backingStoreClient.Upload(add, add, bytes.NewBuffer(request.AttachmentContent))
+				err = c.backingStoreClient.Upload(add, add, bytes.NewBuffer(request.AttachmentContent), len(request.AttachmentContent))
 				if err != nil {
 					return "", err
 				} else {
@@ -517,7 +517,7 @@ func (c *applicationOperator) modifyAppAttachment(app *v1alpha1.HelmApplication,
 	}
 	if len(request.AttachmentContent) != 0 {
 		add := idutils.GetUuid("att-")
-		err = c.backingStoreClient.Upload(add, add, bytes.NewBuffer(request.AttachmentContent))
+		err = c.backingStoreClient.Upload(add, add, bytes.NewBuffer(request.AttachmentContent), len(request.AttachmentContent))
 		if err != nil {
 			return "", err
 		} else {

pkg/models/openpitrix/applicationversions.go

@@ -202,7 +202,7 @@ func (c *applicationOperator) ModifyAppVersion(id string, request *ModifyAppVers
 		spec.Created = &now
 
 		// 3. save chart data to s3 storage, just overwrite the legacy data
-		err = c.backingStoreClient.Upload(dataKeyInStorage(versionCopy.GetWorkspace(), versionCopy.Name), versionCopy.Name, bytes.NewReader(request.Package))
+		err = c.backingStoreClient.Upload(dataKeyInStorage(versionCopy.GetWorkspace(), versionCopy.Name), versionCopy.Name, bytes.NewBuffer(request.Package), len(request.Package))
 		if err != nil {
 			klog.Errorf("upload chart for app version: %s/%s failed, error: %s", versionCopy.GetWorkspace(),
 				versionCopy.GetTrueName(), err)
@@ -490,7 +490,7 @@ func (c *applicationOperator) createApplicationVersion(ver *v1alpha1.HelmApplica
 		klog.Errorf("decode error: %s", err)
 		return nil, err
 	} else {
-		err = c.backingStoreClient.Upload(dataKeyInStorage(ver.GetWorkspace(), ver.Name), ver.Name, bytes.NewReader(ver.Spec.Data))
+		err = c.backingStoreClient.Upload(dataKeyInStorage(ver.GetWorkspace(), ver.Name), ver.Name, bytes.NewBuffer(ver.Spec.Data), len(ver.Spec.Data))
 		if err != nil {
 			klog.Errorf("upload chart for app version: %s/%s failed, error: %s", ver.GetWorkspace(),
 				ver.GetTrueName(), err)

pkg/models/openpitrix/attachments.go

@@ -65,7 +65,7 @@ func (c *attachmentOperator) CreateAttachment(data []byte) (*Attachment, error)
 	}
 	id := idutils.GetUuid36(v1alpha1.HelmAttachmentPrefix)
 
-	err := c.backingStoreClient.Upload(id, id, bytes.NewBuffer(data))
+	err := c.backingStoreClient.Upload(id, id, bytes.NewBuffer(data), len(data))
 	if err != nil {
 		klog.Errorf("upload attachment failed, err: %s", err)
 		return nil, err

pkg/models/registries/image.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 
 	"github.com/docker/distribution/reference"
-	"github.com/opencontainers/go-digest"
+	digest "github.com/opencontainers/go-digest"
 	log "k8s.io/klog"
 )
 

pkg/models/registries/image_type.go

@@ -19,7 +19,7 @@ package registries
 import (
 	"time"
 
-	"github.com/opencontainers/go-digest"
+	digest "github.com/opencontainers/go-digest"
 )
 
 // ImageBlobInfo describes the info of an image.

pkg/models/registries/manifest.go

@@ -22,7 +22,7 @@ import (
 	"net/http"
 
 	"github.com/docker/distribution/manifest/schema2"
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	log "k8s.io/klog"
 )
 

pkg/models/registries/registries.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/informers"
 	"k8s.io/klog"

pkg/server/errors/errors.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 )
 
 type Error struct {

pkg/server/params/params.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 )
 
 const (

pkg/server/params/params_test.go

@@ -22,9 +22,8 @@ import (
 	"reflect"
 	"testing"
 
+	restful "github.com/emicklei/go-restful"
 	"gotest.tools/assert"
-
-	"github.com/emicklei/go-restful"
 )
 
 func TestParseConditions(t *testing.T) {

pkg/simple/client/devops/fake/fakedevops.go

@@ -23,7 +23,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	v1 "k8s.io/api/core/v1"
 
 	devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3"

pkg/simple/client/devops/jenkins/build.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 
 	"kubesphere.io/kubesphere/pkg/simple/client/devops"
 )

pkg/simple/client/devops/jenkins/credential.go

@@ -19,7 +19,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/klog"
 

pkg/simple/client/devops/jenkins/project.go

@@ -17,7 +17,7 @@ limitations under the License.
 package jenkins
 
 import (
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/klog"
 
 	"kubesphere.io/kubesphere/pkg/simple/client/devops"

pkg/simple/client/devops/jenkins/project_pipeline.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/emicklei/go-restful"
+	restful "github.com/emicklei/go-restful"
 	"k8s.io/klog"
 
 	devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3"

pkg/simple/client/devops/jenkins/request.go

@@ -29,7 +29,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/form3tech-oss/jwt-go"
+	jwt "github.com/dgrijalva/jwt-go"
 
 	authtoken "kubesphere.io/kubesphere/pkg/apiserver/authentication/token"
 	"kubesphere.io/kubesphere/pkg/simple/client/devops"

pkg/simple/client/es/versions/v5/v5.go

@@ -24,7 +24,7 @@ import (
 	"io/ioutil"
 	"time"
 
-	"github.com/elastic/go-elasticsearch/v5"
+	elasticsearch "github.com/elastic/go-elasticsearch/v5"
 	"github.com/elastic/go-elasticsearch/v5/esapi"
 )
 

pkg/simple/client/es/versions/v6/v6.go

@@ -24,7 +24,7 @@ import (
 	"io/ioutil"
 	"time"
 
-	"github.com/elastic/go-elasticsearch/v6"
+	elasticsearch "github.com/elastic/go-elasticsearch/v6"
 	"github.com/elastic/go-elasticsearch/v6/esapi"
 )
 

pkg/simple/client/es/versions/v7/v7.go

@@ -24,7 +24,7 @@ import (
 	"io/ioutil"
 	"time"
 
-	"github.com/elastic/go-elasticsearch/v7"
+	elasticsearch "github.com/elastic/go-elasticsearch/v7"
 	"github.com/elastic/go-elasticsearch/v7/esapi"
 )
 

pkg/simple/client/s3/fake/fakes3.go

@@ -43,7 +43,7 @@ type Object struct {
 	Body     io.Reader
 }
 
-func (s *FakeS3) Upload(key, fileName string, body io.Reader) error {
+func (s *FakeS3) Upload(key, fileName string, body io.Reader, size int) error {
 	s.Storage[key] = &Object{
 		Key:      key,
 		FileName: fileName,

pkg/simple/client/s3/fake/fakes3_test.go

@@ -25,7 +25,7 @@ func TestFakeS3(t *testing.T) {
 	s3 := NewFakeS3()
 	key := "hello"
 	fileName := "world"
-	err := s3.Upload(key, fileName, nil)
+	err := s3.Upload(key, fileName, nil, 0)
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/simple/client/s3/interface.go

@@ -16,16 +16,14 @@ limitations under the License.
 
 package s3
 
-import (
-	"io"
-)
+import "io"
 
 type Interface interface {
 	//read the content, caller should close the io.ReadCloser.
 	Read(key string) ([]byte, error)
 
 	// Upload uploads a object to storage and returns object location if succeeded
-	Upload(key, fileName string, body io.Reader) error
+	Upload(key, fileName string, body io.Reader, size int) error
 
 	GetDownloadURL(key string, fileName string) (string, error)
 

pkg/simple/client/s3/s3.go

@@ -19,6 +19,7 @@ package s3
 import (
 	"fmt"
 	"io"
+	"math"
 	"time"
 
 	"code.cloudfoundry.org/bytefmt"
@@ -36,10 +37,40 @@ type Client struct {
 	bucket    string
 }
 
-func (s *Client) Upload(key, fileName string, body io.Reader) error {
+const (
+	DefaultPartSize = 5 * bytefmt.MEGABYTE
+	// MinConcurrency is the minimum concurrency when uploading a part to Amazon S3,
+	// it's also the default value of Concurrency in aws-sdk-go.
+	MinConcurrency = 5
+	// MaxConcurrency is the maximum concurrency to limit the goroutines.
+	MaxConcurrency = 128
+)
+
+// calculateConcurrency calculates the concurrency for better performance,
+// make the concurrency in range [5, 128].
+func calculateConcurrency(size int) int {
+	if size <= 0 {
+		return MinConcurrency
+	}
+	c := int(math.Ceil(float64(size) / float64(DefaultPartSize)))
+	if c < MinConcurrency {
+		return MinConcurrency
+	} else if c > MaxConcurrency {
+		return MaxConcurrency
+	}
+	return c
+}
+
+// Upload use Multipart upload to upload a single object as a set of parts.
+// If the data length is known to be large, it is recommended to pass in the data length,
+// it will helps to calculate concurrency. Otherwise, `size` can be 0,
+// use 5 as default upload concurrency, same as aws-sdk-go.
+// See https://docs.aws.amazon.com/AmazonS3/latest/userguide/mpuoverview.html for more details.
+func (s *Client) Upload(key, fileName string, body io.Reader, size int) error {
 	uploader := s3manager.NewUploader(s.s3Session, func(uploader *s3manager.Uploader) {
-		uploader.PartSize = 5 * bytefmt.MEGABYTE
+		uploader.PartSize = DefaultPartSize
 		uploader.LeavePartsOnError = true
+		uploader.Concurrency = calculateConcurrency(size)
 	})
 	_, err := uploader.Upload(&s3manager.UploadInput{
 		Bucket:             aws.String(s.bucket),

pkg/simple/client/s3/s3_test.go

@@ -0,0 +1,14 @@
+package s3
+
+import (
+	"testing"
+
+	"gotest.tools/assert"
+)
+
+func TestCalculateConcurrency(t *testing.T) {
+	assert.Equal(t, 5, calculateConcurrency(1*1024*1024))
+	assert.Equal(t, 5, calculateConcurrency(5*1024*1024))
+	assert.Equal(t, 20, calculateConcurrency(99*1024*1024))
+	assert.Equal(t, 128, calculateConcurrency(129*5*1024*1024))
+}

pkg/utils/idutils/id_utils.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/golang/example/stringutil"
 	"github.com/sony/sonyflake"
-	"github.com/speps/go-hashids"
+	hashids "github.com/speps/go-hashids"
 
 	"kubesphere.io/kubesphere/pkg/utils/stringutils"
 )