Skip to content

K
k3s
Commit 11ba8943 authored by nikhiljindal's avatar nikhiljindal
Browse files
Options

Updating federation controllers to use release_1_4 clientset instead of release_1_3 clientset

parent ecebdb57
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 19 deletions
federation/cmd/federation-controller-manager/app/controllermanager.go
View file @ 11ba8943
...@@ -26,7 +26,7 @@ import ( ...@@ -26,7 +26,7 @@ import (
"net/http/pprof" "net/http/pprof"
"strconv" "strconv"
federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4"
"k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options" "k8s.io/kubernetes/federation/cmd/federation-controller-manager/app/options"
"k8s.io/kubernetes/federation/pkg/dnsprovider" "k8s.io/kubernetes/federation/pkg/dnsprovider"
clustercontroller "k8s.io/kubernetes/federation/pkg/federation-controller/cluster" clustercontroller "k8s.io/kubernetes/federation/pkg/federation-controller/cluster"
......
federation/pkg/federation-controller/cluster/clustercontroller.go
View file @ 11ba8943
...@@ -23,7 +23,7 @@ import ( ...@@ -23,7 +23,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
cluster_cache "k8s.io/kubernetes/federation/client/cache" cluster_cache "k8s.io/kubernetes/federation/client/cache"
federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller"
......
federation/pkg/federation-controller/cluster/clustercontroller_test.go
View file @ 11ba8943
...@@ -24,7 +24,7 @@ import ( ...@@ -24,7 +24,7 @@ import (
"testing" "testing"
federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" federation_v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4"
controller_util "k8s.io/kubernetes/federation/pkg/federation-controller/util" controller_util "k8s.io/kubernetes/federation/pkg/federation-controller/util"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
......
federation/pkg/federation-controller/service/cluster_helper.go
View file @ 11ba8943
...@@ -23,7 +23,7 @@ import ( ...@@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
v1 "k8s.io/kubernetes/pkg/api/v1" v1 "k8s.io/kubernetes/pkg/api/v1"
cache "k8s.io/kubernetes/pkg/client/cache" cache "k8s.io/kubernetes/pkg/client/cache"
release_1_3 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3" release_1_4 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4"
"k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient"
"k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/controller/framework"
pkg_runtime "k8s.io/kubernetes/pkg/runtime" pkg_runtime "k8s.io/kubernetes/pkg/runtime"
...@@ -37,7 +37,7 @@ import ( ...@@ -37,7 +37,7 @@ import (
) )
type clusterCache struct { type clusterCache struct {
clientset *release_1_3.Clientset clientset *release_1_4.Clientset
cluster *v1beta1.Cluster cluster *v1beta1.Cluster
// A store of services, populated by the serviceController // A store of services, populated by the serviceController
serviceStore cache.StoreToServiceLister serviceStore cache.StoreToServiceLister
...@@ -196,10 +196,10 @@ func (cc *clusterClientCache) addToClientMap(obj interface{}) { ...@@ -196,10 +196,10 @@ func (cc *clusterClientCache) addToClientMap(obj interface{}) {
} }
} }
func newClusterClientset(c *v1beta1.Cluster) (*release_1_3.Clientset, error) { func newClusterClientset(c *v1beta1.Cluster) (*release_1_4.Clientset, error) {
clusterConfig, err := util.BuildClusterConfig(c) clusterConfig, err := util.BuildClusterConfig(c)
if clusterConfig != nil { if clusterConfig != nil {
clientset := release_1_3.NewForConfigOrDie(restclient.AddUserAgent(clusterConfig, UserAgentName)) clientset := release_1_4.NewForConfigOrDie(restclient.AddUserAgent(clusterConfig, UserAgentName))
return clientset, nil return clientset, nil
} }
return nil, err return nil, err
......
federation/pkg/federation-controller/service/endpoint_helper.go
View file @ 11ba8943
...@@ -20,7 +20,7 @@ import ( ...@@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"time" "time"
federation_release_1_3 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" federation_release_1_4 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4"
v1 "k8s.io/kubernetes/pkg/api/v1" v1 "k8s.io/kubernetes/pkg/api/v1"
cache "k8s.io/kubernetes/pkg/client/cache" cache "k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller"
...@@ -54,7 +54,7 @@ func (sc *ServiceController) clusterEndpointWorker() { ...@@ -54,7 +54,7 @@ func (sc *ServiceController) clusterEndpointWorker() {
// Whenever there is change on endpoint, the federation service should be updated // Whenever there is change on endpoint, the federation service should be updated
// key is the namespaced name of endpoint // key is the namespaced name of endpoint
func (cc *clusterClientCache) syncEndpoint(key, clusterName string, clusterCache *clusterCache, serviceCache *serviceCache, fedClient federation_release_1_3.Interface, serviceController *ServiceController) error { func (cc *clusterClientCache) syncEndpoint(key, clusterName string, clusterCache *clusterCache, serviceCache *serviceCache, fedClient federation_release_1_4.Interface, serviceController *ServiceController) error {
cachedService, ok := serviceCache.get(key) cachedService, ok := serviceCache.get(key)
if !ok { if !ok {
// here we filtered all non-federation services // here we filtered all non-federation services
......
federation/pkg/federation-controller/service/service_helper.go
View file @ 11ba8943
...@@ -20,7 +20,7 @@ import ( ...@@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"time" "time"
federation_release_1_3 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" federation_release_1_4 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4"
"k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/errors"
v1 "k8s.io/kubernetes/pkg/api/v1" v1 "k8s.io/kubernetes/pkg/api/v1"
cache "k8s.io/kubernetes/pkg/client/cache" cache "k8s.io/kubernetes/pkg/client/cache"
...@@ -56,7 +56,7 @@ func (sc *ServiceController) clusterServiceWorker() { ...@@ -56,7 +56,7 @@ func (sc *ServiceController) clusterServiceWorker() {
} }
// Whenever there is change on service, the federation service should be updated // Whenever there is change on service, the federation service should be updated
func (cc *clusterClientCache) syncService(key, clusterName string, clusterCache *clusterCache, serviceCache *serviceCache, fedClient federation_release_1_3.Interface, sc *ServiceController) error { func (cc *clusterClientCache) syncService(key, clusterName string, clusterCache *clusterCache, serviceCache *serviceCache, fedClient federation_release_1_4.Interface, sc *ServiceController) error {
// obj holds the latest service info from apiserver, return if there is no federation cache for the service // obj holds the latest service info from apiserver, return if there is no federation cache for the service
cachedService, ok := serviceCache.get(key) cachedService, ok := serviceCache.get(key)
if !ok { if !ok {
...@@ -236,7 +236,7 @@ func (cc *clusterClientCache) processServiceUpdate(cachedService *cachedService, ...@@ -236,7 +236,7 @@ func (cc *clusterClientCache) processServiceUpdate(cachedService *cachedService,
return needUpdate return needUpdate
} }
func (cc *clusterClientCache) persistFedServiceUpdate(cachedService *cachedService, fedClient federation_release_1_3.Interface) error { func (cc *clusterClientCache) persistFedServiceUpdate(cachedService *cachedService, fedClient federation_release_1_4.Interface) error {
service := cachedService.lastState service := cachedService.lastState
glog.V(5).Infof("Persist federation service status %s/%s", service.Namespace, service.Name) glog.V(5).Infof("Persist federation service status %s/%s", service.Namespace, service.Name)
var err error var err error
......
federation/pkg/federation-controller/service/servicecontroller.go
View file @ 11ba8943
...@@ -26,13 +26,13 @@ import ( ...@@ -26,13 +26,13 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" v1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
federationcache "k8s.io/kubernetes/federation/client/cache" federationcache "k8s.io/kubernetes/federation/client/cache"
federation_release_1_3 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_3" federation_release_1_4 "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4"
"k8s.io/kubernetes/federation/pkg/dnsprovider" "k8s.io/kubernetes/federation/pkg/dnsprovider"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/errors"
v1 "k8s.io/kubernetes/pkg/api/v1" v1 "k8s.io/kubernetes/pkg/api/v1"
cache "k8s.io/kubernetes/pkg/client/cache" cache "k8s.io/kubernetes/pkg/client/cache"
release_1_3 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3" release_1_4 "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_4"
"k8s.io/kubernetes/pkg/client/record" "k8s.io/kubernetes/pkg/client/record"
"k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/controller/framework"
...@@ -99,7 +99,7 @@ type serviceCache struct { ...@@ -99,7 +99,7 @@ type serviceCache struct {
type ServiceController struct { type ServiceController struct {
dns dnsprovider.Interface dns dnsprovider.Interface
federationClient federation_release_1_3.Interface federationClient federation_release_1_4.Interface
federationName string federationName string
zoneName string zoneName string
// each federation should be configured with a single zone (e.g. "mycompany.com") // each federation should be configured with a single zone (e.g. "mycompany.com")
...@@ -124,7 +124,7 @@ type ServiceController struct { ...@@ -124,7 +124,7 @@ type ServiceController struct {
// New returns a new service controller to keep DNS provider service resources // New returns a new service controller to keep DNS provider service resources
// (like Kubernetes Services and DNS server records for service discovery) in sync with the registry. // (like Kubernetes Services and DNS server records for service discovery) in sync with the registry.
func New(federationClient federation_release_1_3.Interface, dns dnsprovider.Interface, federationName, zoneName string) *ServiceController { func New(federationClient federation_release_1_4.Interface, dns dnsprovider.Interface, federationName, zoneName string) *ServiceController {
broadcaster := record.NewBroadcaster() broadcaster := record.NewBroadcaster()
// federationClient event is not supported yet // federationClient event is not supported yet
// broadcaster.StartRecordingToSink(&unversioned_core.EventSinkImpl{Interface: kubeClient.Core().Events("")}) // broadcaster.StartRecordingToSink(&unversioned_core.EventSinkImpl{Interface: kubeClient.Core().Events("")})
...@@ -305,7 +305,7 @@ func wantsDNSRecords(service *v1.Service) bool { ...@@ -305,7 +305,7 @@ func wantsDNSRecords(service *v1.Service) bool {
// processServiceForCluster creates or updates service to all registered running clusters, // processServiceForCluster creates or updates service to all registered running clusters,
// update DNS records and update the service info with DNS entries to federation apiserver. // update DNS records and update the service info with DNS entries to federation apiserver.
// the function returns any error caught // the function returns any error caught
func (s *ServiceController) processServiceForCluster(cachedService *cachedService, clusterName string, service *v1.Service, client *release_1_3.Clientset) error { func (s *ServiceController) processServiceForCluster(cachedService *cachedService, clusterName string, service *v1.Service, client *release_1_4.Clientset) error {
glog.V(4).Infof("Process service %s/%s for cluster %s", service.Namespace, service.Name, clusterName) glog.V(4).Infof("Process service %s/%s for cluster %s", service.Namespace, service.Name, clusterName)
// Create or Update k8s Service // Create or Update k8s Service
err := s.ensureClusterService(cachedService, clusterName, service, client) err := s.ensureClusterService(cachedService, clusterName, service, client)
...@@ -365,7 +365,7 @@ func (s *ServiceController) deleteFederationService(cachedService *cachedService ...@@ -365,7 +365,7 @@ func (s *ServiceController) deleteFederationService(cachedService *cachedService
return nil, !retryable return nil, !retryable
} }
func (s *ServiceController) deleteClusterService(clusterName string, cachedService *cachedService, clientset *release_1_3.Clientset) error { func (s *ServiceController) deleteClusterService(clusterName string, cachedService *cachedService, clientset *release_1_4.Clientset) error {
service := cachedService.lastState service := cachedService.lastState
glog.V(4).Infof("Deleting service %s/%s from cluster %s", service.Namespace, service.Name, clusterName) glog.V(4).Infof("Deleting service %s/%s from cluster %s", service.Namespace, service.Name, clusterName)
var err error var err error
...@@ -382,7 +382,7 @@ func (s *ServiceController) deleteClusterService(clusterName string, cachedServi ...@@ -382,7 +382,7 @@ func (s *ServiceController) deleteClusterService(clusterName string, cachedServi
return err return err
} }
func (s *ServiceController) ensureClusterService(cachedService *cachedService, clusterName string, service *v1.Service, client *release_1_3.Clientset) error { func (s *ServiceController) ensureClusterService(cachedService *cachedService, clusterName string, service *v1.Service, client *release_1_4.Clientset) error {
var err error var err error
var needUpdate bool var needUpdate bool
for i := 0; i < clientRetryCount; i++ { for i := 0; i < clientRetryCount; i++ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment