mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Switch ClientAccessFactory to use clientset.Interface rather than actual type
This commit is contained in:
parent
70a268528e
commit
27259358cb
@ -377,7 +377,7 @@ func (i *initFederation) Run(cmdOut io.Writer, config util.AdminConfig) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func createNamespace(clientset *client.Clientset, namespace string, dryRun bool) (*api.Namespace, error) {
|
func createNamespace(clientset client.Interface, namespace string, dryRun bool) (*api.Namespace, error) {
|
||||||
ns := &api.Namespace{
|
ns := &api.Namespace{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: namespace,
|
Name: namespace,
|
||||||
@ -391,7 +391,7 @@ func createNamespace(clientset *client.Clientset, namespace string, dryRun bool)
|
|||||||
return clientset.Core().Namespaces().Create(ns)
|
return clientset.Core().Namespaces().Create(ns)
|
||||||
}
|
}
|
||||||
|
|
||||||
func createService(clientset *client.Clientset, namespace, svcName, apiserverAdvertiseAddress string, apiserverServiceType v1.ServiceType, dryRun bool) (*api.Service, []string, []string, error) {
|
func createService(clientset client.Interface, namespace, svcName, apiserverAdvertiseAddress string, apiserverServiceType v1.ServiceType, dryRun bool) (*api.Service, []string, []string, error) {
|
||||||
svc := &api.Service{
|
svc := &api.Service{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: svcName,
|
Name: svcName,
|
||||||
@ -436,12 +436,12 @@ func createService(clientset *client.Clientset, namespace, svcName, apiserverAdv
|
|||||||
return svc, ips, hostnames, err
|
return svc, ips, hostnames, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func getClusterNodeIPs(clientset *client.Clientset) ([]string, error) {
|
func getClusterNodeIPs(clientset client.Interface) ([]string, error) {
|
||||||
preferredAddressTypes := []api.NodeAddressType{
|
preferredAddressTypes := []api.NodeAddressType{
|
||||||
api.NodeExternalIP,
|
api.NodeExternalIP,
|
||||||
api.NodeLegacyHostIP,
|
api.NodeLegacyHostIP,
|
||||||
}
|
}
|
||||||
nodeList, err := clientset.Nodes().List(metav1.ListOptions{})
|
nodeList, err := clientset.Core().Nodes().List(metav1.ListOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -461,7 +461,7 @@ func getClusterNodeIPs(clientset *client.Clientset) ([]string, error) {
|
|||||||
return nodeAddresses, nil
|
return nodeAddresses, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func waitForLoadBalancerAddress(clientset *client.Clientset, svc *api.Service, dryRun bool) ([]string, []string, error) {
|
func waitForLoadBalancerAddress(clientset client.Interface, svc *api.Service, dryRun bool) ([]string, []string, error) {
|
||||||
ips := []string{}
|
ips := []string{}
|
||||||
hostnames := []string{}
|
hostnames := []string{}
|
||||||
|
|
||||||
@ -521,7 +521,7 @@ func genCerts(svcNamespace, name, svcName, localDNSZoneName string, ips, hostnam
|
|||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func createAPIServerCredentialsSecret(clientset *client.Clientset, namespace, credentialsName string, entKeyPairs *entityKeyPairs, dryRun bool) (*api.Secret, error) {
|
func createAPIServerCredentialsSecret(clientset client.Interface, namespace, credentialsName string, entKeyPairs *entityKeyPairs, dryRun bool) (*api.Secret, error) {
|
||||||
// Build the secret object with API server credentials.
|
// Build the secret object with API server credentials.
|
||||||
secret := &api.Secret{
|
secret := &api.Secret{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
@ -542,7 +542,7 @@ func createAPIServerCredentialsSecret(clientset *client.Clientset, namespace, cr
|
|||||||
return clientset.Core().Secrets(namespace).Create(secret)
|
return clientset.Core().Secrets(namespace).Create(secret)
|
||||||
}
|
}
|
||||||
|
|
||||||
func createControllerManagerKubeconfigSecret(clientset *client.Clientset, namespace, name, svcName, kubeconfigName string, entKeyPairs *entityKeyPairs, dryRun bool) (*api.Secret, error) {
|
func createControllerManagerKubeconfigSecret(clientset client.Interface, namespace, name, svcName, kubeconfigName string, entKeyPairs *entityKeyPairs, dryRun bool) (*api.Secret, error) {
|
||||||
config := kubeconfigutil.CreateWithCerts(
|
config := kubeconfigutil.CreateWithCerts(
|
||||||
fmt.Sprintf("https://%s", svcName),
|
fmt.Sprintf("https://%s", svcName),
|
||||||
name,
|
name,
|
||||||
@ -555,7 +555,7 @@ func createControllerManagerKubeconfigSecret(clientset *client.Clientset, namesp
|
|||||||
return util.CreateKubeconfigSecret(clientset, config, namespace, kubeconfigName, dryRun)
|
return util.CreateKubeconfigSecret(clientset, config, namespace, kubeconfigName, dryRun)
|
||||||
}
|
}
|
||||||
|
|
||||||
func createPVC(clientset *client.Clientset, namespace, svcName, etcdPVCapacity string, dryRun bool) (*api.PersistentVolumeClaim, error) {
|
func createPVC(clientset client.Interface, namespace, svcName, etcdPVCapacity string, dryRun bool) (*api.PersistentVolumeClaim, error) {
|
||||||
capacity, err := resource.ParseQuantity(etcdPVCapacity)
|
capacity, err := resource.ParseQuantity(etcdPVCapacity)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -589,7 +589,7 @@ func createPVC(clientset *client.Clientset, namespace, svcName, etcdPVCapacity s
|
|||||||
return clientset.Core().PersistentVolumeClaims(namespace).Create(pvc)
|
return clientset.Core().PersistentVolumeClaims(namespace).Create(pvc)
|
||||||
}
|
}
|
||||||
|
|
||||||
func createAPIServer(clientset *client.Clientset, namespace, name, image, credentialsName, advertiseAddress, storageBackend string, argOverrides map[string]string, pvc *api.PersistentVolumeClaim, dryRun bool) (*extensions.Deployment, error) {
|
func createAPIServer(clientset client.Interface, namespace, name, image, credentialsName, advertiseAddress, storageBackend string, argOverrides map[string]string, pvc *api.PersistentVolumeClaim, dryRun bool) (*extensions.Deployment, error) {
|
||||||
command := []string{
|
command := []string{
|
||||||
"/hyperkube",
|
"/hyperkube",
|
||||||
"federation-apiserver",
|
"federation-apiserver",
|
||||||
@ -704,7 +704,7 @@ func createAPIServer(clientset *client.Clientset, namespace, name, image, creden
|
|||||||
return clientset.Extensions().Deployments(namespace).Create(dep)
|
return clientset.Extensions().Deployments(namespace).Create(dep)
|
||||||
}
|
}
|
||||||
|
|
||||||
func createControllerManagerSA(clientset *client.Clientset, namespace string, dryRun bool) (*api.ServiceAccount, error) {
|
func createControllerManagerSA(clientset client.Interface, namespace string, dryRun bool) (*api.ServiceAccount, error) {
|
||||||
sa := &api.ServiceAccount{
|
sa := &api.ServiceAccount{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
Name: ControllerManagerSA,
|
Name: ControllerManagerSA,
|
||||||
@ -718,7 +718,7 @@ func createControllerManagerSA(clientset *client.Clientset, namespace string, dr
|
|||||||
return clientset.Core().ServiceAccounts(namespace).Create(sa)
|
return clientset.Core().ServiceAccounts(namespace).Create(sa)
|
||||||
}
|
}
|
||||||
|
|
||||||
func createRoleBindings(clientset *client.Clientset, namespace, saName string, dryRun bool) (*rbac.Role, *rbac.RoleBinding, error) {
|
func createRoleBindings(clientset client.Interface, namespace, saName string, dryRun bool) (*rbac.Role, *rbac.RoleBinding, error) {
|
||||||
roleName := "federation-system:federation-controller-manager"
|
roleName := "federation-system:federation-controller-manager"
|
||||||
role := &rbac.Role{
|
role := &rbac.Role{
|
||||||
// a role to use for bootstrapping the federation-controller-manager so it can access
|
// a role to use for bootstrapping the federation-controller-manager so it can access
|
||||||
@ -752,7 +752,7 @@ func createRoleBindings(clientset *client.Clientset, namespace, saName string, d
|
|||||||
return newRole, newRolebinding, err
|
return newRole, newRolebinding, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func createControllerManager(clientset *client.Clientset, namespace, name, svcName, cmName, image, kubeconfigName, dnsZoneName, dnsProvider, saName string, dnsProviderSecret *api.Secret, argOverrides map[string]string, dryRun bool) (*extensions.Deployment, error) {
|
func createControllerManager(clientset client.Interface, namespace, name, svcName, cmName, image, kubeconfigName, dnsZoneName, dnsProvider, saName string, dnsProviderSecret *api.Secret, argOverrides map[string]string, dryRun bool) (*extensions.Deployment, error) {
|
||||||
command := []string{
|
command := []string{
|
||||||
"/hyperkube",
|
"/hyperkube",
|
||||||
"federation-controller-manager",
|
"federation-controller-manager",
|
||||||
@ -879,7 +879,7 @@ func argMapsToArgStrings(argsMap, overrides map[string]string) []string {
|
|||||||
return args
|
return args
|
||||||
}
|
}
|
||||||
|
|
||||||
func waitForPods(clientset *client.Clientset, fedPods []string, namespace string) error {
|
func waitForPods(clientset client.Interface, fedPods []string, namespace string) error {
|
||||||
err := wait.PollInfinite(podWaitInterval, func() (bool, error) {
|
err := wait.PollInfinite(podWaitInterval, func() (bool, error) {
|
||||||
podCheck := len(fedPods)
|
podCheck := len(fedPods)
|
||||||
podList, err := clientset.Core().Pods(namespace).List(metav1.ListOptions{})
|
podList, err := clientset.Core().Pods(namespace).List(metav1.ListOptions{})
|
||||||
@ -979,7 +979,7 @@ func updateKubeconfig(config util.AdminConfig, name, endpoint, kubeConfigPath st
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func createDNSProviderConfigSecret(clientset *client.Clientset, namespace, name string, dnsProviderConfigBytes []byte, dryRun bool) (*api.Secret, error) {
|
func createDNSProviderConfigSecret(clientset client.Interface, namespace, name string, dnsProviderConfigBytes []byte, dryRun bool) (*api.Secret, error) {
|
||||||
if dnsProviderConfigBytes == nil {
|
if dnsProviderConfigBytes == nil {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
@ -213,7 +213,7 @@ func minifyConfig(clientConfig *clientcmdapi.Config, context string) (*clientcmd
|
|||||||
|
|
||||||
// createSecret extracts the kubeconfig for a given cluster and populates
|
// createSecret extracts the kubeconfig for a given cluster and populates
|
||||||
// a secret with that kubeconfig.
|
// a secret with that kubeconfig.
|
||||||
func createSecret(clientset *internalclientset.Clientset, clientConfig *clientcmdapi.Config, namespace, contextName, secretName string, dryRun bool) (runtime.Object, error) {
|
func createSecret(clientset internalclientset.Interface, clientConfig *clientcmdapi.Config, namespace, contextName, secretName string, dryRun bool) (runtime.Object, error) {
|
||||||
// Minify the kubeconfig to ensure that there is only information
|
// Minify the kubeconfig to ensure that there is only information
|
||||||
// relevant to the cluster we are registering.
|
// relevant to the cluster we are registering.
|
||||||
newClientConfig, err := minifyConfig(clientConfig, contextName)
|
newClientConfig, err := minifyConfig(clientConfig, contextName)
|
||||||
@ -236,7 +236,7 @@ func createSecret(clientset *internalclientset.Clientset, clientConfig *clientcm
|
|||||||
// createConfigMap creates a configmap with name kube-dns in the joining cluster
|
// createConfigMap creates a configmap with name kube-dns in the joining cluster
|
||||||
// which stores the information about this federation zone name.
|
// which stores the information about this federation zone name.
|
||||||
// If the configmap with this name already exists, its updated with this information.
|
// If the configmap with this name already exists, its updated with this information.
|
||||||
func createConfigMap(hostClientSet *internalclientset.Clientset, config util.AdminConfig, fedSystemNamespace, targetClusterContext, kubeconfigPath string, dryRun bool) (*api.ConfigMap, error) {
|
func createConfigMap(hostClientSet internalclientset.Interface, config util.AdminConfig, fedSystemNamespace, targetClusterContext, kubeconfigPath string, dryRun bool) (*api.ConfigMap, error) {
|
||||||
cmDep, err := getCMDeployment(hostClientSet, fedSystemNamespace)
|
cmDep, err := getCMDeployment(hostClientSet, fedSystemNamespace)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -337,7 +337,7 @@ func extractScheme(url string) string {
|
|||||||
return scheme
|
return scheme
|
||||||
}
|
}
|
||||||
|
|
||||||
func getCMDeployment(hostClientSet *internalclientset.Clientset, fedNamespace string) (*extensions.Deployment, error) {
|
func getCMDeployment(hostClientSet internalclientset.Interface, fedNamespace string) (*extensions.Deployment, error) {
|
||||||
depList, err := hostClientSet.Extensions().Deployments(fedNamespace).List(metav1.ListOptions{})
|
depList, err := hostClientSet.Extensions().Deployments(fedNamespace).List(metav1.ListOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -162,7 +162,7 @@ func popCluster(f cmdutil.Factory, name string) (*federationapi.Cluster, error)
|
|||||||
return cluster, rh.Delete("", name)
|
return cluster, rh.Delete("", name)
|
||||||
}
|
}
|
||||||
|
|
||||||
func deleteConfigMapFromCluster(hostClientset *internalclientset.Clientset, secret *api.Secret, cluster *federationapi.Cluster, fedSystemNamespace string) error {
|
func deleteConfigMapFromCluster(hostClientset internalclientset.Interface, secret *api.Secret, cluster *federationapi.Cluster, fedSystemNamespace string) error {
|
||||||
clientset, err := getClientsetFromCluster(secret, cluster)
|
clientset, err := getClientsetFromCluster(secret, cluster)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -197,7 +197,7 @@ func deleteConfigMapFromCluster(hostClientset *internalclientset.Clientset, secr
|
|||||||
|
|
||||||
// deleteSecret deletes the secret with the given name from the host
|
// deleteSecret deletes the secret with the given name from the host
|
||||||
// cluster.
|
// cluster.
|
||||||
func deleteSecret(clientset *internalclientset.Clientset, name, namespace string) error {
|
func deleteSecret(clientset internalclientset.Interface, name, namespace string) error {
|
||||||
return clientset.Core().Secrets(namespace).Delete(name, &metav1.DeleteOptions{})
|
return clientset.Core().Secrets(namespace).Delete(name, &metav1.DeleteOptions{})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -136,7 +136,7 @@ func (o *SubcommandOptions) SetName(cmd *cobra.Command, args []string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreateKubeconfigSecret(clientset *client.Clientset, kubeconfig *clientcmdapi.Config, namespace, name string, dryRun bool) (*api.Secret, error) {
|
func CreateKubeconfigSecret(clientset client.Interface, kubeconfig *clientcmdapi.Config, namespace, name string, dryRun bool) (*api.Secret, error) {
|
||||||
configBytes, err := clientcmd.Write(*kubeconfig)
|
configBytes, err := clientcmd.Write(*kubeconfig)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -438,7 +438,7 @@ func getRESTMappings(mapper meta.RESTMapper, pruneResources *[]pruneResource) (n
|
|||||||
type pruner struct {
|
type pruner struct {
|
||||||
mapper meta.RESTMapper
|
mapper meta.RESTMapper
|
||||||
clientFunc resource.ClientMapperFunc
|
clientFunc resource.ClientMapperFunc
|
||||||
clientsetFunc func() (*internalclientset.Clientset, error)
|
clientsetFunc func() (internalclientset.Interface, error)
|
||||||
|
|
||||||
visitedUids sets.String
|
visitedUids sets.String
|
||||||
selector labels.Selector
|
selector labels.Selector
|
||||||
@ -500,7 +500,7 @@ func (p *pruner) delete(namespace, name string, mapping *meta.RESTMapping, c res
|
|||||||
return runDelete(namespace, name, mapping, c, nil, p.cascade, p.gracePeriod, p.clientsetFunc)
|
return runDelete(namespace, name, mapping, c, nil, p.cascade, p.gracePeriod, p.clientsetFunc)
|
||||||
}
|
}
|
||||||
|
|
||||||
func runDelete(namespace, name string, mapping *meta.RESTMapping, c resource.RESTClient, helper *resource.Helper, cascade bool, gracePeriod int, clientsetFunc func() (*internalclientset.Clientset, error)) error {
|
func runDelete(namespace, name string, mapping *meta.RESTMapping, c resource.RESTClient, helper *resource.Helper, cascade bool, gracePeriod int, clientsetFunc func() (internalclientset.Interface, error)) error {
|
||||||
if !cascade {
|
if !cascade {
|
||||||
if helper == nil {
|
if helper == nil {
|
||||||
helper = resource.NewHelper(c, mapping)
|
helper = resource.NewHelper(c, mapping)
|
||||||
@ -538,7 +538,7 @@ type patcher struct {
|
|||||||
|
|
||||||
mapping *meta.RESTMapping
|
mapping *meta.RESTMapping
|
||||||
helper *resource.Helper
|
helper *resource.Helper
|
||||||
clientsetFunc func() (*internalclientset.Clientset, error)
|
clientsetFunc func() (internalclientset.Interface, error)
|
||||||
|
|
||||||
overwrite bool
|
overwrite bool
|
||||||
backOff clockwork.Clock
|
backOff clockwork.Clock
|
||||||
|
@ -47,7 +47,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type DrainOptions struct {
|
type DrainOptions struct {
|
||||||
client *internalclientset.Clientset
|
client internalclientset.Interface
|
||||||
restClient *restclient.RESTClient
|
restClient *restclient.RESTClient
|
||||||
factory cmdutil.Factory
|
factory cmdutil.Factory
|
||||||
Force bool
|
Force bool
|
||||||
@ -583,7 +583,7 @@ func (o *DrainOptions) waitForDelete(pods []api.Pod, interval, timeout time.Dura
|
|||||||
|
|
||||||
// SupportEviction uses Discovery API to find out if the server support eviction subresource
|
// SupportEviction uses Discovery API to find out if the server support eviction subresource
|
||||||
// If support, it will return its groupVersion; Otherwise, it will return ""
|
// If support, it will return its groupVersion; Otherwise, it will return ""
|
||||||
func SupportEviction(clientset *internalclientset.Clientset) (string, error) {
|
func SupportEviction(clientset internalclientset.Interface) (string, error) {
|
||||||
discoveryClient := clientset.Discovery()
|
discoveryClient := clientset.Discovery()
|
||||||
groupList, err := discoveryClient.ServerGroups()
|
groupList, err := discoveryClient.ServerGroups()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -245,7 +245,7 @@ func RunRollingUpdate(f cmdutil.Factory, out io.Writer, cmd *cobra.Command, args
|
|||||||
// than the old rc. This selector is the hash of the rc, with a suffix to provide uniqueness for
|
// than the old rc. This selector is the hash of the rc, with a suffix to provide uniqueness for
|
||||||
// same-image updates.
|
// same-image updates.
|
||||||
if len(image) != 0 {
|
if len(image) != 0 {
|
||||||
codec := api.Codecs.LegacyCodec(clientset.CoreClient.RESTClient().APIVersion())
|
codec := api.Codecs.LegacyCodec(v1.SchemeGroupVersion)
|
||||||
keepOldName = len(args) == 1
|
keepOldName = len(args) == 1
|
||||||
newName := findNewName(args, oldRc)
|
newName := findNewName(args, oldRc)
|
||||||
if newRc, err = kubectl.LoadExistingNextReplicationController(coreClient, cmdNamespace, newName); err != nil {
|
if newRc, err = kubectl.LoadExistingNextReplicationController(coreClient, cmdNamespace, newName); err != nil {
|
||||||
|
@ -286,7 +286,7 @@ func (f *FakeFactory) RESTClient() (*restclient.RESTClient, error) {
|
|||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *FakeFactory) ClientSet() (*internalclientset.Clientset, error) {
|
func (f *FakeFactory) ClientSet() (internalclientset.Interface, error) {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -311,7 +311,7 @@ func (f *FakeFactory) FederationClientSetForVersion(version *schema.GroupVersion
|
|||||||
func (f *FakeFactory) FederationClientForVersion(version *schema.GroupVersion) (*restclient.RESTClient, error) {
|
func (f *FakeFactory) FederationClientForVersion(version *schema.GroupVersion) (*restclient.RESTClient, error) {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
func (f *FakeFactory) ClientSetForVersion(requiredVersion *schema.GroupVersion) (*internalclientset.Clientset, error) {
|
func (f *FakeFactory) ClientSetForVersion(requiredVersion *schema.GroupVersion) (internalclientset.Interface, error) {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
func (f *FakeFactory) ClientConfigForVersion(requiredVersion *schema.GroupVersion) (*restclient.Config, error) {
|
func (f *FakeFactory) ClientConfigForVersion(requiredVersion *schema.GroupVersion) (*restclient.Config, error) {
|
||||||
@ -536,7 +536,7 @@ func (f *fakeAPIFactory) JSONEncoder() runtime.Encoder {
|
|||||||
return testapi.Default.Codec()
|
return testapi.Default.Codec()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *fakeAPIFactory) ClientSet() (*internalclientset.Clientset, error) {
|
func (f *fakeAPIFactory) ClientSet() (internalclientset.Interface, error) {
|
||||||
// Swap the HTTP client out of the REST client with the fake
|
// Swap the HTTP client out of the REST client with the fake
|
||||||
// version.
|
// version.
|
||||||
fakeClient := f.tf.Client.(*fake.RESTClient)
|
fakeClient := f.tf.Client.(*fake.RESTClient)
|
||||||
|
@ -32,7 +32,7 @@ import (
|
|||||||
|
|
||||||
func NewClientCache(loader clientcmd.ClientConfig, discoveryClientFactory DiscoveryClientFactory) *ClientCache {
|
func NewClientCache(loader clientcmd.ClientConfig, discoveryClientFactory DiscoveryClientFactory) *ClientCache {
|
||||||
return &ClientCache{
|
return &ClientCache{
|
||||||
clientsets: make(map[schema.GroupVersion]*internalclientset.Clientset),
|
clientsets: make(map[schema.GroupVersion]internalclientset.Interface),
|
||||||
configs: make(map[schema.GroupVersion]*restclient.Config),
|
configs: make(map[schema.GroupVersion]*restclient.Config),
|
||||||
fedClientSets: make(map[schema.GroupVersion]fedclientset.Interface),
|
fedClientSets: make(map[schema.GroupVersion]fedclientset.Interface),
|
||||||
loader: loader,
|
loader: loader,
|
||||||
@ -44,7 +44,7 @@ func NewClientCache(loader clientcmd.ClientConfig, discoveryClientFactory Discov
|
|||||||
// is invoked only once
|
// is invoked only once
|
||||||
type ClientCache struct {
|
type ClientCache struct {
|
||||||
loader clientcmd.ClientConfig
|
loader clientcmd.ClientConfig
|
||||||
clientsets map[schema.GroupVersion]*internalclientset.Clientset
|
clientsets map[schema.GroupVersion]internalclientset.Interface
|
||||||
fedClientSets map[schema.GroupVersion]fedclientset.Interface
|
fedClientSets map[schema.GroupVersion]fedclientset.Interface
|
||||||
configs map[schema.GroupVersion]*restclient.Config
|
configs map[schema.GroupVersion]*restclient.Config
|
||||||
|
|
||||||
@ -144,7 +144,7 @@ func copyConfig(in *restclient.Config) *restclient.Config {
|
|||||||
|
|
||||||
// ClientSetForVersion initializes or reuses a clientset for the specified version, or returns an
|
// ClientSetForVersion initializes or reuses a clientset for the specified version, or returns an
|
||||||
// error if that is not possible
|
// error if that is not possible
|
||||||
func (c *ClientCache) ClientSetForVersion(requiredVersion *schema.GroupVersion) (*internalclientset.Clientset, error) {
|
func (c *ClientCache) ClientSetForVersion(requiredVersion *schema.GroupVersion) (internalclientset.Interface, error) {
|
||||||
if requiredVersion != nil {
|
if requiredVersion != nil {
|
||||||
if clientset, ok := c.clientsets[*requiredVersion]; ok {
|
if clientset, ok := c.clientsets[*requiredVersion]; ok {
|
||||||
return clientset, nil
|
return clientset, nil
|
||||||
|
@ -86,7 +86,7 @@ type ClientAccessFactory interface {
|
|||||||
DiscoveryClientFactory
|
DiscoveryClientFactory
|
||||||
|
|
||||||
// ClientSet gives you back an internal, generated clientset
|
// ClientSet gives you back an internal, generated clientset
|
||||||
ClientSet() (*internalclientset.Clientset, error)
|
ClientSet() (internalclientset.Interface, error)
|
||||||
// Returns a RESTClient for accessing Kubernetes resources or an error.
|
// Returns a RESTClient for accessing Kubernetes resources or an error.
|
||||||
RESTClient() (*restclient.RESTClient, error)
|
RESTClient() (*restclient.RESTClient, error)
|
||||||
// Returns a client.Config for accessing the Kubernetes server.
|
// Returns a client.Config for accessing the Kubernetes server.
|
||||||
@ -101,7 +101,7 @@ type ClientAccessFactory interface {
|
|||||||
// TODO remove this should be rolled into restclient with the right version
|
// TODO remove this should be rolled into restclient with the right version
|
||||||
FederationClientForVersion(version *schema.GroupVersion) (*restclient.RESTClient, error)
|
FederationClientForVersion(version *schema.GroupVersion) (*restclient.RESTClient, error)
|
||||||
// TODO remove. This should be rolled into `ClientSet`
|
// TODO remove. This should be rolled into `ClientSet`
|
||||||
ClientSetForVersion(requiredVersion *schema.GroupVersion) (*internalclientset.Clientset, error)
|
ClientSetForVersion(requiredVersion *schema.GroupVersion) (internalclientset.Interface, error)
|
||||||
// TODO remove. This should be rolled into `ClientConfig`
|
// TODO remove. This should be rolled into `ClientConfig`
|
||||||
ClientConfigForVersion(requiredVersion *schema.GroupVersion) (*restclient.Config, error)
|
ClientConfigForVersion(requiredVersion *schema.GroupVersion) (*restclient.Config, error)
|
||||||
|
|
||||||
|
@ -168,11 +168,11 @@ func (f *ring0Factory) DiscoveryClient() (discovery.CachedDiscoveryInterface, er
|
|||||||
return f.discoveryFactory.DiscoveryClient()
|
return f.discoveryFactory.DiscoveryClient()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *ring0Factory) ClientSet() (*internalclientset.Clientset, error) {
|
func (f *ring0Factory) ClientSet() (internalclientset.Interface, error) {
|
||||||
return f.clientCache.ClientSetForVersion(nil)
|
return f.clientCache.ClientSetForVersion(nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *ring0Factory) ClientSetForVersion(requiredVersion *schema.GroupVersion) (*internalclientset.Clientset, error) {
|
func (f *ring0Factory) ClientSetForVersion(requiredVersion *schema.GroupVersion) (internalclientset.Interface, error) {
|
||||||
return f.clientCache.ClientSetForVersion(requiredVersion)
|
return f.clientCache.ClientSetForVersion(requiredVersion)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user