admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade k8s package verison (#5358)

Browse Source 
* upgrade k8s package version

Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>

* Script upgrade and code formatting.

Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>

Signed-off-by: hongzhouzi <hongzhouzi@kubesphere.io>
This commit is contained in:
hongzhouzi
2022-11-15 14:56:38 +08:00
committed by GitHub
parent 5f91c1663a
commit 44167aa47a
3106 changed files with 321340 additions and 172080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/simple/client/cache/cache.go vendored
View File

@@ -21,7 +21,7 @@ import (
"fmt"
"time"
"k8s.io/klog"
"k8s.io/klog/v2"
)
var (

2
pkg/simple/client/cache/redis.go vendored
View File

@@ -23,7 +23,7 @@ import (
"github.com/go-redis/redis"
"github.com/mitchellh/mapstructure"
"k8s.io/klog"
"k8s.io/klog/v2"
)
const typeRedis = "redis"

2
pkg/simple/client/devops/jenkins/credential.go
View File

@@ -21,7 +21,7 @@ import (
"github.com/emicklei/go-restful"
v1 "k8s.io/api/core/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3"

2
pkg/simple/client/devops/jenkins/internal/bitbucket.go
View File

@@ -5,7 +5,7 @@ import (
"strings"
"github.com/beevik/etree"
"k8s.io/klog"
"k8s.io/klog/v2"
devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3"
)

2
pkg/simple/client/devops/jenkins/internal/git.go
View File

@@ -4,7 +4,7 @@ import (
"strconv"
"github.com/beevik/etree"
"k8s.io/klog"
"k8s.io/klog/v2"
devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3"
)

2
pkg/simple/client/devops/jenkins/internal/github.go
View File

@@ -5,7 +5,7 @@ import (
"strings"
"github.com/beevik/etree"
"k8s.io/klog"
"k8s.io/klog/v2"
devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3"
)

2
pkg/simple/client/devops/jenkins/internal/gitlab.go
View File

@@ -5,7 +5,7 @@ import (
"strings"
"github.com/beevik/etree"
"k8s.io/klog"
"k8s.io/klog/v2"
devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3"
)

2
pkg/simple/client/devops/jenkins/internal/svn.go
View File

@@ -2,7 +2,7 @@ package internal
import (
"github.com/beevik/etree"
"k8s.io/klog"
"k8s.io/klog/v2"
devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3"
)

2
pkg/simple/client/devops/jenkins/jenkins.go
View File

@@ -28,7 +28,7 @@ import (
"strconv"
"strings"
"k8s.io/klog"
"k8s.io/klog/v2"
"kubesphere.io/kubesphere/pkg/simple/client/devops"
)

2
pkg/simple/client/devops/jenkins/pipeline.go
View File

@@ -27,7 +27,7 @@ import (
"time"
"github.com/PuerkitoBio/goquery"
"k8s.io/klog"
"k8s.io/klog/v2"
"kubesphere.io/kubesphere/pkg/simple/client/devops"
)

2
pkg/simple/client/devops/jenkins/project.go
View File

@@ -18,7 +18,7 @@ package jenkins
import (
"github.com/emicklei/go-restful"
"k8s.io/klog"
"k8s.io/klog/v2"
"kubesphere.io/kubesphere/pkg/simple/client/devops"
)

2
pkg/simple/client/devops/jenkins/project_pipeline.go
View File

@@ -21,7 +21,7 @@ import (
"net/http"
"github.com/emicklei/go-restful"
"k8s.io/klog"
"k8s.io/klog/v2"
devopsv1alpha3 "kubesphere.io/api/devops/v1alpha3"

2
pkg/simple/client/devops/jenkins/pure_request.go
View File

@@ -21,7 +21,7 @@ import (
"net/url"
"time"
"k8s.io/klog"
"k8s.io/klog/v2"
"kubesphere.io/kubesphere/pkg/simple/client/devops"
)

2
pkg/simple/client/devops/jenkins/utils.go
View File

@@ -24,7 +24,7 @@ import (
"time"
"unicode/utf8"
"k8s.io/klog"
"k8s.io/klog/v2"
)
func makeJson(data interface{}) string {

2
pkg/simple/client/es/response.go
View File

@@ -2,7 +2,7 @@ package es
import (
jsoniter "github.com/json-iterator/go"
"k8s.io/klog"
"k8s.io/klog/v2"
)
type Response struct {

2
pkg/simple/client/ldap/ldap.go
View File

@@ -25,7 +25,7 @@ import (
"github.com/go-ldap/ldap"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
iamv1alpha2 "kubesphere.io/api/iam/v1alpha2"

2
pkg/simple/client/monitoring/metricsserver/metricsserver.go
View File

@@ -28,7 +28,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/klog"
"k8s.io/klog/v2"
promlabels "github.com/prometheus/prometheus/pkg/labels"
metricsapi "k8s.io/metrics/pkg/apis/metrics"

2
pkg/simple/client/monitoring/prometheus/prometheus.go
View File

@@ -26,7 +26,7 @@ import (
"github.com/prometheus/client_golang/api"
apiv1 "github.com/prometheus/client_golang/api/prometheus/v1"
"github.com/prometheus/common/model"
"k8s.io/klog"
"k8s.io/klog/v2"
"kubesphere.io/kubesphere/pkg/simple/client/monitoring"
)

2
pkg/simple/client/monitoring/prometheus/promql_meter.go
View File

@@ -18,7 +18,7 @@ import (
"strconv"
"strings"
"k8s.io/klog"
"k8s.io/klog/v2"
"kubesphere.io/kubesphere/pkg/simple/client/monitoring"
)

2
pkg/simple/client/network/ippool/calico/provider.go
View File

@@ -41,7 +41,7 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/util/workqueue"
"k8s.io/klog"
"k8s.io/klog/v2"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"kubesphere.io/api/network/calicov3"

2
pkg/simple/client/network/ippool/calico/provider_test.go
View File

@@ -25,7 +25,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
"kubesphere.io/api/network/v1alpha1"

2
pkg/simple/client/network/ippool/ipam/ipam.go
View File

@@ -32,7 +32,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/klog"
"k8s.io/klog/v2"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"kubesphere.io/api/network/v1alpha1"

2
pkg/simple/client/network/ippool/ipam/ipam_test.go
View File

@@ -25,7 +25,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog"
"k8s.io/klog/v2"
"kubesphere.io/api/network/v1alpha1"

2
pkg/simple/client/openpitrix/helmrepoindex/load_package.go
View File

@@ -26,7 +26,7 @@ import (
"kubesphere.io/api/application/v1alpha1"
"helm.sh/helm/v3/pkg/repo"
"k8s.io/klog"
"k8s.io/klog/v2"
"helm.sh/helm/v3/pkg/chart/loader"
)

4
pkg/simple/client/openpitrix/helmwrapper/helm_wrapper.go
View File

@@ -31,7 +31,7 @@ import (
"helm.sh/helm/v3/pkg/chartutil"
helmrelease "helm.sh/helm/v3/pkg/release"
"k8s.io/klog"
"k8s.io/klog/v2"
kpath "k8s.io/utils/path"
"kubesphere.io/kubesphere/pkg/server/errors"
@@ -363,7 +363,7 @@ func (c *helmWrapper) helmInstall(chart *chart.Chart, values map[string]interfac
}
func (c *helmWrapper) writeAction(chartName, chartData, values string, upgrade bool) error {
if klog.V(2) {
if klog.V(2).Enabled() {
start := time.Now()
defer func() {
klog.V(2).Infof("run command end, namespace: %s, name: %s, upgrade: %t, elapsed: %v", c.Namespace, c.ReleaseName, upgrade, time.Since(start))

2
pkg/simple/client/openpitrix/helmwrapper/post_renderer_kustomize.go
View File

@@ -19,11 +19,11 @@ import (
"encoding/json"
"sync"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/krusty"
"sigs.k8s.io/kustomize/api/resmap"
"sigs.k8s.io/kustomize/api/types"
kustypes "sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kyaml/filesys"
)
type postRendererKustomize struct {

2
pkg/simple/client/s3/s3.go
View File

@@ -28,7 +28,7 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
"k8s.io/klog"
"k8s.io/klog/v2"
)
type Client struct {

2
pkg/simple/client/sonarqube/interface.go
View File

@@ -18,7 +18,7 @@ package sonarqube
import (
sonargo "github.com/kubesphere/sonargo/sonar"
"k8s.io/klog"
"k8s.io/klog/v2"
"kubesphere.io/kubesphere/pkg/simple/client/devops"
)

2
pkg/simple/client/sonarqube/sonarqube.go
View File

@@ -21,7 +21,7 @@ import (
"strings"
sonargo "github.com/kubesphere/sonargo/sonar"
"k8s.io/klog"
"k8s.io/klog/v2"
)
type Client struct {