scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 02:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moving federation/v1alpha1 to federation/v1beta1

Browse Source
This commit is contained in:
nikhiljindal
2016-06-28 14:17:40 -07:00
parent 88b10b1dc0
commit 7fcf8daf6b
42 changed files with 482 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
federation/pkg/federation-controller/util/cluster_util.go
View File

@@ -23,7 +23,7 @@ import (
"time"
"github.com/golang/glog"
federation_v1alpha1 "k8s.io/kubernetes/federation/apis/federation/v1alpha1"
federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/restclient"
client "k8s.io/kubernetes/pkg/client/unversioned"
@@ -40,7 +40,7 @@ const (
getSecretTimeout = 1 * time.Minute
)
func BuildClusterConfig(c *federation_v1alpha1.Cluster) (*restclient.Config, error) {
func BuildClusterConfig(c *federation_v1beta1.Cluster) (*restclient.Config, error) {
var serverAddress string
var clusterConfig *restclient.Config
hostIP, err := utilnet.ChooseHostInterface()
@@ -78,7 +78,7 @@ func BuildClusterConfig(c *federation_v1alpha1.Cluster) (*restclient.Config, err
// This is to inject a different kubeconfigGetter in tests.
// We dont use the standard one which calls NewInCluster in tests to avoid having to setup service accounts and mount files with secret tokens.
var KubeconfigGetterForCluster = func(c *federation_v1alpha1.Cluster) clientcmd.KubeconfigGetter {
var KubeconfigGetterForCluster = func(c *federation_v1beta1.Cluster) clientcmd.KubeconfigGetter {
return func() (*clientcmdapi.Config, error) {
secretRefName := ""
if c.Spec.SecretRef != nil {