Skip to content

Commit

Permalink
upgrade k8s, etcd, grpc, opentelemetry pkg and etc
Browse files Browse the repository at this point in the history
  • Loading branch information
@chengjoey
chengjoey committed Jun 13, 2024
1 parent 5c1f922 commit a59cbc3
Show file tree
Hide file tree
Showing 92 changed files with 2,117 additions and 935 deletions.
356 changes: 175 additions & 181 deletions go.mod
View file

Large diffs are not rendered by default.

2,275 changes: 1,676 additions & 599 deletions go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/apps/cmp/cluster_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"time"

"github.com/rancher/apiserver/pkg/types"
"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/api/resource"

Expand Down
2 changes: 1 addition & 1 deletion internal/apps/cmp/component-protocol/components/cmp-cluster-list/list/render.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"time"

"github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"github.com/sirupsen/logrus"
"google.golang.org/grpc/metadata"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/cmp/component-protocol/components/cmp-dashboard-nodes/charts/render.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"

"github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"k8s.io/apimachinery/pkg/api/resource"

"github.com/erda-project/erda-infra/base/servicehub"
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/cmp/component-protocol/components/cmp-dashboard-nodes/common/table/table.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"strings"
"sync"

"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"github.com/sirupsen/logrus"
"github.com/spf13/cast"
v1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/cmp/component-protocol/components/cmp-dashboard-nodes/cpuTable/render.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package cpuTable
import (
"strings"

"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"k8s.io/apimachinery/pkg/api/resource"

"github.com/erda-project/erda-infra/providers/component-protocol/cptype"
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/cmp/component-protocol/components/cmp-dashboard-nodes/memTable/render.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package memTable
import (
"strings"

"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"k8s.io/apimachinery/pkg/api/resource"

"github.com/erda-project/erda-infra/providers/component-protocol/cptype"
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/cmp/component-protocol/components/cmp-dashboard-nodes/nodeFilter/render.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strings"

"github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"gopkg.in/square/go-jose.v2/json"

"github.com/erda-project/erda-infra/base/servicehub"
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/cmp/component-protocol/components/cmp-dashboard-nodes/podTable/render.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package podTable
import (
"strings"

"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"k8s.io/apimachinery/pkg/api/resource"

"github.com/erda-project/erda-infra/providers/component-protocol/cptype"
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/cmp/component-protocol/components/cmp-dashboard-podDetail/podInfo/render.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strings"

"github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"github.com/sirupsen/logrus"

"github.com/erda-project/erda-infra/base/servicehub"
Expand Down
2 changes: 1 addition & 1 deletion .../apps/cmp/component-protocol/components/cmp-dashboard-workload-detail/podsTable/render.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/go-openapi/strfmt"
"github.com/pkg/errors"
types2 "github.com/rancher/apiserver/pkg/types"
"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"github.com/sirupsen/logrus"
"k8s.io/apimachinery/pkg/api/resource"

Expand Down
2 changes: 1 addition & 1 deletion ...ps/cmp/component-protocol/components/cmp-dashboard-workloads-list/workloadTable/render.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/go-openapi/strfmt"
"github.com/pkg/errors"
"github.com/rancher/apiserver/pkg/types"
"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"github.com/recallsong/go-utils/container/slice"
"github.com/sirupsen/logrus"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/cmp/component-protocol/cputil/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"time"

"github.com/pkg/errors"
"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"github.com/sirupsen/logrus"
appsv1 "k8s.io/api/apps/v1"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
26 changes: 13 additions & 13 deletions internal/apps/cmp/steve/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ package steve
import (
"context"

"github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io"
apiextensionsv1 "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1"
"github.com/rancher/wrangler/pkg/generated/controllers/apiregistration.k8s.io"
apiregistrationv1 "github.com/rancher/wrangler/pkg/generated/controllers/apiregistration.k8s.io/v1"
"github.com/rancher/wrangler/pkg/generated/controllers/core"
corev1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
"github.com/rancher/wrangler/pkg/generated/controllers/rbac"
rbacv1 "github.com/rancher/wrangler/pkg/generated/controllers/rbac/v1"
"github.com/rancher/wrangler/pkg/generic"
"github.com/rancher/wrangler/pkg/start"
"github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io"
apiextensionsv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io/v1"
"github.com/rancher/wrangler/v2/pkg/generated/controllers/apiregistration.k8s.io"
apiregistrationv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiregistration.k8s.io/v1"
"github.com/rancher/wrangler/v2/pkg/generated/controllers/core"
corev1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/core/v1"
"github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac"
rbacv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/rbac/v1"
"github.com/rancher/wrangler/v2/pkg/generic"
"github.com/rancher/wrangler/v2/pkg/start"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
)
Expand Down Expand Up @@ -54,11 +54,11 @@ func NewController(cfg *rest.Config, opts *generic.FactoryOptions) (*Controllers
}
c.starters = append(c.starters, core)

rbac, err := rbac.NewFactoryFromConfigWithOptions(cfg, opts)
rbacCtr, err := rbac.NewFactoryFromConfigWithOptions(cfg, opts)
if err != nil {
return nil, err
}
c.starters = append(c.starters, rbac)
c.starters = append(c.starters, rbacCtr)

api, err := apiregistration.NewFactoryFromConfigWithOptions(cfg, opts)
if err != nil {
Expand All @@ -77,7 +77,7 @@ func NewController(cfg *rest.Config, opts *generic.FactoryOptions) (*Controllers
return nil, err
}
c.Core = core.Core().V1()
c.RBAC = rbac.Rbac().V1()
c.RBAC = rbacCtr.Rbac().V1()
c.API = api.Apiregistration().V1()
c.CRD = crd.Apiextensions().V1()
c.RESTConfig = cfg
Expand Down
26 changes: 13 additions & 13 deletions internal/apps/cmp/steve/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,52 +125,52 @@ func (p *Factory) AdminK8sInterface() (kubernetes.Interface, error) {
return kubernetes.NewForConfig(p.clientCfg)
}

func (p *Factory) DynamicClient(ctx *types.APIRequest) (dynamic.Interface, error) {
func (p *Factory) DynamicClient(ctx *types.APIRequest, warningHandler rest.WarningHandler) (dynamic.Interface, error) {
return newDynamicClient(ctx, p.clientCfg, p.impersonate)
}

func (p *Factory) Client(ctx *types.APIRequest, s *types.APISchema, namespace string) (dynamic.ResourceInterface, error) {
func (p *Factory) Client(ctx *types.APIRequest, s *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) {
return newClient(ctx, p.clientCfg, s, namespace, p.impersonate)
}

func (p *Factory) AdminClient(ctx *types.APIRequest, s *types.APISchema, namespace string) (dynamic.ResourceInterface, error) {
func (p *Factory) AdminClient(ctx *types.APIRequest, s *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) {
return newClient(ctx, p.clientCfg, s, namespace, false)
}

func (p *Factory) ClientForWatch(ctx *types.APIRequest, s *types.APISchema, namespace string) (dynamic.ResourceInterface, error) {
func (p *Factory) ClientForWatch(ctx *types.APIRequest, s *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) {
return newClient(ctx, p.watchClientCfg, s, namespace, p.impersonate)
}

func (p *Factory) AdminClientForWatch(ctx *types.APIRequest, s *types.APISchema, namespace string) (dynamic.ResourceInterface, error) {
func (p *Factory) AdminClientForWatch(ctx *types.APIRequest, s *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) {
return newClient(ctx, p.watchClientCfg, s, namespace, false)
}

func (p *Factory) TableClient(ctx *types.APIRequest, s *types.APISchema, namespace string) (dynamic.ResourceInterface, error) {
func (p *Factory) TableClient(ctx *types.APIRequest, s *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) {
if attributes.Table(s) {
return newClient(ctx, p.tableClientCfg, s, namespace, p.impersonate)
}
return p.Client(ctx, s, namespace)
return p.Client(ctx, s, namespace, nil)
}

func (p *Factory) TableAdminClient(ctx *types.APIRequest, s *types.APISchema, namespace string) (dynamic.ResourceInterface, error) {
func (p *Factory) TableAdminClient(ctx *types.APIRequest, s *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) {
if attributes.Table(s) {
return newClient(ctx, p.tableClientCfg, s, namespace, false)
}
return p.AdminClient(ctx, s, namespace)
return p.AdminClient(ctx, s, namespace, nil)
}

func (p *Factory) TableClientForWatch(ctx *types.APIRequest, s *types.APISchema, namespace string) (dynamic.ResourceInterface, error) {
func (p *Factory) TableClientForWatch(ctx *types.APIRequest, s *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) {
if attributes.Table(s) {
return newClient(ctx, p.tableWatchClientCfg, s, namespace, p.impersonate)
}
return p.ClientForWatch(ctx, s, namespace)
return p.ClientForWatch(ctx, s, namespace, warningHandler)
}

func (p *Factory) TableAdminClientForWatch(ctx *types.APIRequest, s *types.APISchema, namespace string) (dynamic.ResourceInterface, error) {
func (p *Factory) TableAdminClientForWatch(ctx *types.APIRequest, s *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) {
if attributes.Table(s) {
return newClient(ctx, p.tableWatchClientCfg, s, namespace, false)
}
return p.AdminClientForWatch(ctx, s, namespace)
return p.AdminClientForWatch(ctx, s, namespace, warningHandler)
}

func setupConfig(ctx *types.APIRequest, cfg *rest.Config, impersonate bool) (*rest.Config, error) {
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/cmp/steve/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,6 @@ func DefaultAPIServer() *server.Server {
URLParser: parse.MuxURLParser,
}

subscribe.Register(s.Schemas)
subscribe.Register(s.Schemas, subscribe.DefaultGetter, "v1")
return s
}
2 changes: 1 addition & 1 deletion internal/apps/cmp/steve/proxy/error_wrapper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package proxy
import (
"github.com/rancher/apiserver/pkg/apierror"
"github.com/rancher/apiserver/pkg/types"
"github.com/rancher/wrangler/pkg/schemas/validation"
"github.com/rancher/wrangler/v2/pkg/schemas/validation"
"k8s.io/apimachinery/pkg/api/errors"
)

Expand Down
18 changes: 9 additions & 9 deletions internal/apps/cmp/steve/proxy/proxy_store.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"github.com/rancher/steve/pkg/accesscontrol"
"github.com/rancher/steve/pkg/attributes"
"github.com/rancher/steve/pkg/stores/proxy"
"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/pkg/schemas/validation"
"github.com/rancher/wrangler/v2/pkg/data"
"github.com/sirupsen/logrus"
"golang.org/x/sync/errgroup"
"k8s.io/apimachinery/pkg/api/meta"
Expand Down Expand Up @@ -101,7 +101,7 @@ func toAPI(schema *types.APISchema, obj runtime.Object) types.APIObject {
}

func (s *Store) byID(apiOp *types.APIRequest, schema *types.APISchema, id string) (*unstructured.Unstructured, error) {
k8sClient, err := s.clientGetter.TableClient(apiOp, schema, apiOp.Namespace)
k8sClient, err := s.clientGetter.TableClient(apiOp, schema, apiOp.Namespace, nil)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -198,7 +198,7 @@ func tableToObjects(obj map[string]interface{}) []unstructured.Unstructured {
}

func (s *Store) ByNames(apiOp *types.APIRequest, schema *types.APISchema, names sets.String) (types.APIObjectList, error) {
adminClient, err := s.clientGetter.TableAdminClient(apiOp, schema, apiOp.Namespace)
adminClient, err := s.clientGetter.TableAdminClient(apiOp, schema, apiOp.Namespace, nil)
if err != nil {
return types.APIObjectList{}, err
}
Expand All @@ -220,7 +220,7 @@ func (s *Store) ByNames(apiOp *types.APIRequest, schema *types.APISchema, names
}

func (s *Store) List(apiOp *types.APIRequest, schema *types.APISchema) (types.APIObjectList, error) {
client, err := s.clientGetter.TableClient(apiOp, schema, apiOp.Namespace)
client, err := s.clientGetter.TableClient(apiOp, schema, apiOp.Namespace, nil)
if err != nil {
return types.APIObjectList{}, err
}
Expand Down Expand Up @@ -314,7 +314,7 @@ func (s *Store) listAndWatch(apiOp *types.APIRequest, k8sClient dynamic.Resource
}

func (s *Store) WatchNames(apiOp *types.APIRequest, schema *types.APISchema, w types.WatchRequest, names sets.String) (chan types.APIEvent, error) {
adminClient, err := s.clientGetter.TableAdminClientForWatch(apiOp, schema, apiOp.Namespace)
adminClient, err := s.clientGetter.TableAdminClientForWatch(apiOp, schema, apiOp.Namespace, nil)
if err != nil {
return nil, err
}
Expand All @@ -337,7 +337,7 @@ func (s *Store) WatchNames(apiOp *types.APIRequest, schema *types.APISchema, w t
}

func (s *Store) Watch(apiOp *types.APIRequest, schema *types.APISchema, w types.WatchRequest) (chan types.APIEvent, error) {
client, err := s.clientGetter.TableClientForWatch(apiOp, schema, apiOp.Namespace)
client, err := s.clientGetter.TableClientForWatch(apiOp, schema, apiOp.Namespace, nil)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -405,7 +405,7 @@ func (s *Store) Create(apiOp *types.APIRequest, schema *types.APISchema, params
gvk := attributes.GVK(schema)
input["apiVersion"], input["kind"] = gvk.ToAPIVersionAndKind()

k8sClient, err := s.clientGetter.TableClient(apiOp, schema, ns)
k8sClient, err := s.clientGetter.TableClient(apiOp, schema, ns, nil)
if err != nil {
return types.APIObject{}, err
}
Expand All @@ -427,7 +427,7 @@ func (s *Store) Update(apiOp *types.APIRequest, schema *types.APISchema, params
)

ns := types.Namespace(input)
k8sClient, err := s.clientGetter.TableClient(apiOp, schema, ns)
k8sClient, err := s.clientGetter.TableClient(apiOp, schema, ns, nil)
if err != nil {
return types.APIObject{}, err
}
Expand Down Expand Up @@ -493,7 +493,7 @@ func (s *Store) Delete(apiOp *types.APIRequest, schema *types.APISchema, id stri
return types.APIObject{}, nil
}

k8sClient, err := s.clientGetter.TableClient(apiOp, schema, apiOp.Namespace)
k8sClient, err := s.clientGetter.TableClient(apiOp, schema, apiOp.Namespace, nil)
if err != nil {
return types.APIObject{}, err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/cmp/steve/request.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (

"github.com/pkg/errors"
"github.com/rancher/apiserver/pkg/types"
"github.com/rancher/wrangler/pkg/data"
"github.com/rancher/wrangler/v2/pkg/data"
"github.com/sirupsen/logrus"
"google.golang.org/grpc/metadata"
"k8s.io/api/policy/v1beta1"
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/cmp/steve/schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
)

func DefaultSchemas(baseSchema *types.APISchemas) {
subscribe.Register(baseSchema)
subscribe.Register(baseSchema, subscribe.DefaultGetter, "v1")
apiroot.Register(baseSchema, []string{"v1"}, "proxy:/apis")
}

Expand Down
4 changes: 2 additions & 2 deletions internal/apps/cmp/steve/schemas.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/rancher/steve/pkg/attributes"
schema2 "github.com/rancher/steve/pkg/schema"
"github.com/rancher/steve/pkg/schema/converter"
apiextcontrollerv1 "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io/v1"
v1 "github.com/rancher/wrangler/pkg/generated/controllers/apiregistration.k8s.io/v1"
apiextcontrollerv1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiextensions.k8s.io/v1"
v1 "github.com/rancher/wrangler/v2/pkg/generated/controllers/apiregistration.k8s.io/v1"
"github.com/sirupsen/logrus"
"golang.org/x/sync/errgroup"
"golang.org/x/sync/semaphore"
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/dop/dicehub/release/cron.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"context"
"time"

v3 "github.com/coreos/etcd/clientv3"
"github.com/sirupsen/logrus"
v3 "go.etcd.io/etcd/client/v3"
)

// ImageGCCron Execute once every day at 00:00:00, Release recycles the entrance
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/dop/dicehub/release/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"reflect"
"strings"

"github.com/coreos/etcd/clientv3"
"github.com/jinzhu/gorm"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
clientv3 "go.etcd.io/etcd/client/v3"
gormV2 "gorm.io/gorm"

"github.com/erda-project/erda-infra/base/logs"
Expand Down
2 changes: 1 addition & 1 deletion internal/apps/dop/dicehub/release/release.service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"sync"
"time"

"github.com/coreos/etcd/clientv3"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
clientv3 "go.etcd.io/etcd/client/v3"
"google.golang.org/protobuf/types/known/timestamppb"
"gopkg.in/yaml.v2"

Expand Down
2 changes: 1 addition & 1 deletion internal/apps/dop/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"os"
"time"

"github.com/coreos/etcd/clientv3"
"github.com/jinzhu/gorm"
"github.com/sirupsen/logrus"
clientv3 "go.etcd.io/etcd/client/v3"

"github.com/erda-project/erda-infra/base/logs"
"github.com/erda-project/erda-infra/base/servicehub"
Expand Down
Loading

0 comments on commit a59cbc3

Please sign in to comment.