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

add cluster and crd to resources api group (#2053)

Browse Source
This commit is contained in:
zryfish
2020-05-08 17:30:15 +08:00
committed by GitHub
parent 256b178927
commit 18ab887640
79 changed files with 1755 additions and 10518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/simple/client/k8s/kubernetes.go
View File

@@ -4,6 +4,7 @@ import (
snapshotclient "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned"
applicationclientset "github.com/kubernetes-sigs/application/pkg/client/clientset/versioned"
istioclient "istio.io/client-go/pkg/clientset/versioned"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
"k8s.io/client-go/discovery"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
@@ -18,6 +19,7 @@ type Client interface {
Istio() istioclient.Interface
Application() applicationclientset.Interface
Snapshot() snapshotclient.Interface
ApiExtensions() apiextensionsclient.Interface
Discovery() discovery.DiscoveryInterface
Master() string
Config() *rest.Config
@@ -39,6 +41,8 @@ type kubernetesClient struct {
snapshot snapshotclient.Interface
apiextensions apiextensionsclient.Interface
master string
config *rest.Config
@@ -61,6 +65,7 @@ func NewKubernetesClientOrDie(options *KubernetesOptions) Client {
istio: istioclient.NewForConfigOrDie(config),
application: applicationclientset.NewForConfigOrDie(config),
snapshot: snapshotclient.NewForConfigOrDie(config),
apiextensions: apiextensionsclient.NewForConfigOrDie(config),
master: config.Host,
config: config,
}
@@ -114,6 +119,11 @@ func NewKubernetesClient(options *KubernetesOptions) (Client, error) {
return nil, err
}
k.apiextensions, err = apiextensionsclient.NewForConfig(config)
if err != nil {
return nil, err
}
k.master = options.Master
k.config = config
@@ -144,6 +154,10 @@ func (k *kubernetesClient) Snapshot() snapshotclient.Interface {
return k.snapshot
}
func (k *kubernetesClient) ApiExtensions() apiextensionsclient.Interface {
return k.apiextensions
}
// master address used to generate kubeconfig for downloading
func (k *kubernetesClient) Master() string {
return k.master

5
pkg/simple/client/k8s/null_client.go
View File

@@ -4,6 +4,7 @@ import (
snapshotclient "github.com/kubernetes-csi/external-snapshotter/v2/pkg/client/clientset/versioned"
application "github.com/kubernetes-sigs/application/pkg/client/clientset/versioned"
istio "istio.io/client-go/pkg/clientset/versioned"
apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
"k8s.io/client-go/discovery"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
@@ -37,6 +38,10 @@ func (n nullClient) Snapshot() snapshotclient.Interface {
return nil
}
func (n nullClient) ApiExtensions() apiextensionsclient.Interface {
return nil
}
func (n nullClient) Discovery() discovery.DiscoveryInterface {
return nil
}