-
Notifications
You must be signed in to change notification settings - Fork 40k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Federation service controller #26034
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
207 changes: 207 additions & 0 deletions
207
federation/pkg/federation-controller/service/cluster_helper.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,207 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package service | ||
|
|
||
| import ( | ||
| "sync" | ||
|
|
||
| "k8s.io/kubernetes/federation/apis/federation" | ||
| "k8s.io/kubernetes/pkg/api" | ||
| cache "k8s.io/kubernetes/pkg/client/cache" | ||
| clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" | ||
| "k8s.io/kubernetes/pkg/client/restclient" | ||
| "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" | ||
| "k8s.io/kubernetes/pkg/controller/framework" | ||
| pkg_runtime "k8s.io/kubernetes/pkg/runtime" | ||
| "k8s.io/kubernetes/pkg/util/wait" | ||
| "k8s.io/kubernetes/pkg/util/workqueue" | ||
| "k8s.io/kubernetes/pkg/watch" | ||
|
|
||
| "github.com/golang/glog" | ||
| "reflect" | ||
| ) | ||
|
|
||
| type clusterCache struct { | ||
| clientset *clientset.Clientset | ||
| cluster *federation.Cluster | ||
| // A store of services, populated by the serviceController | ||
| serviceStore cache.StoreToServiceLister | ||
| // Watches changes to all services | ||
| serviceController *framework.Controller | ||
| // A store of endpoint, populated by the serviceController | ||
| endpointStore cache.StoreToEndpointsLister | ||
| // Watches changes to all endpoints | ||
| endpointController *framework.Controller | ||
| // services that need to be synced | ||
| serviceQueue *workqueue.Type | ||
| // endpoints that need to be synced | ||
| endpointQueue *workqueue.Type | ||
| } | ||
|
|
||
| type clusterClientCache struct { | ||
| rwlock sync.Mutex // protects serviceMap | ||
| clientMap map[string]*clusterCache | ||
| } | ||
|
|
||
| func (cc *clusterClientCache) startClusterLW(cluster *federation.Cluster, clusterName string) { | ||
| cachedClusterClient, ok := cc.clientMap[clusterName] | ||
| // only create when no existing cachedClusterClient | ||
| if ok { | ||
| if !reflect.DeepEqual(cachedClusterClient.cluster.Spec, cluster.Spec) { | ||
| //rebuild clientset when cluster spec is changed | ||
| clientset, err := newClusterClientset(cluster) | ||
| if err != nil || clientset == nil { | ||
| glog.Errorf("Failed to create corresponding restclient of kubernetes cluster: %v", err) | ||
| } | ||
| glog.V(4).Infof("Cluster spec changed, rebuild clientset for cluster %s", clusterName) | ||
| cachedClusterClient.clientset = clientset | ||
| go cachedClusterClient.serviceController.Run(wait.NeverStop) | ||
| go cachedClusterClient.endpointController.Run(wait.NeverStop) | ||
| glog.V(2).Infof("Start watching services and endpoints on cluster %s", clusterName) | ||
| } else { | ||
| // do nothing when there is no spec change | ||
| glog.V(4).Infof("Keep clientset for cluster %s", clusterName) | ||
| return | ||
| } | ||
| } else { | ||
| glog.V(4).Infof("No client cache for cluster %s, building new", clusterName) | ||
| clientset, err := newClusterClientset(cluster) | ||
| if err != nil || clientset == nil { | ||
| glog.Errorf("Failed to create corresponding restclient of kubernetes cluster: %v", err) | ||
| } | ||
| cachedClusterClient = &clusterCache{ | ||
| cluster: cluster, | ||
| clientset: clientset, | ||
| serviceQueue: workqueue.New(), | ||
| endpointQueue: workqueue.New(), | ||
| } | ||
| cachedClusterClient.endpointStore.Store, cachedClusterClient.endpointController = framework.NewInformer( | ||
| &cache.ListWatch{ | ||
| ListFunc: func(options api.ListOptions) (pkg_runtime.Object, error) { | ||
| return clientset.Core().Endpoints(api.NamespaceAll).List(options) | ||
| }, | ||
| WatchFunc: func(options api.ListOptions) (watch.Interface, error) { | ||
| return clientset.Core().Endpoints(api.NamespaceAll).Watch(options) | ||
| }, | ||
| }, | ||
| &api.Endpoints{}, | ||
| serviceSyncPeriod, | ||
| framework.ResourceEventHandlerFuncs{ | ||
| AddFunc: func(obj interface{}) { | ||
| cc.enqueueEndpoint(obj, clusterName) | ||
| }, | ||
| UpdateFunc: func(old, cur interface{}) { | ||
| cc.enqueueEndpoint(cur, clusterName) | ||
| }, | ||
| DeleteFunc: func(obj interface{}) { | ||
| cc.enqueueEndpoint(obj, clusterName) | ||
| }, | ||
| }, | ||
| ) | ||
|
|
||
| cachedClusterClient.serviceStore.Store, cachedClusterClient.serviceController = framework.NewInformer( | ||
| &cache.ListWatch{ | ||
| ListFunc: func(options api.ListOptions) (pkg_runtime.Object, error) { | ||
| return clientset.Core().Services(api.NamespaceAll).List(options) | ||
| }, | ||
| WatchFunc: func(options api.ListOptions) (watch.Interface, error) { | ||
| return clientset.Core().Services(api.NamespaceAll).Watch(options) | ||
| }, | ||
| }, | ||
| &api.Service{}, | ||
| serviceSyncPeriod, | ||
| framework.ResourceEventHandlerFuncs{ | ||
| AddFunc: func(obj interface{}) { | ||
| cc.enqueueService(obj, clusterName) | ||
| }, | ||
| UpdateFunc: func(old, cur interface{}) { | ||
| oldService, ok := old.(*api.Service) | ||
|
|
||
| if !ok { | ||
| return | ||
| } | ||
| curService, ok := cur.(*api.Service) | ||
| if !ok { | ||
| return | ||
| } | ||
| if !reflect.DeepEqual(oldService.Status.LoadBalancer, curService.Status.LoadBalancer) { | ||
| cc.enqueueService(cur, clusterName) | ||
| } | ||
| }, | ||
| DeleteFunc: func(obj interface{}) { | ||
| service, _ := obj.(*api.Service) | ||
| cc.enqueueService(obj, clusterName) | ||
| glog.V(2).Infof("Service %s/%s deletion found and enque to service store %s", service.Namespace, service.Name, clusterName) | ||
| }, | ||
| }, | ||
| ) | ||
| cc.clientMap[clusterName] = cachedClusterClient | ||
| go cachedClusterClient.serviceController.Run(wait.NeverStop) | ||
| go cachedClusterClient.endpointController.Run(wait.NeverStop) | ||
| glog.V(2).Infof("Start watching services and endpoints on cluster %s", clusterName) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| //TODO: copied from cluster controller, to make this as common function in pass 2 | ||
| // delFromClusterSet delete a cluster from clusterSet and | ||
| // delete the corresponding restclient from the map clusterKubeClientMap | ||
| func (cc *clusterClientCache) delFromClusterSet(obj interface{}) { | ||
| cluster, ok := obj.(*federation.Cluster) | ||
| cc.rwlock.Lock() | ||
| defer cc.rwlock.Unlock() | ||
| if ok { | ||
| delete(cc.clientMap, cluster.Name) | ||
| } else { | ||
| tombstone, ok := obj.(cache.DeletedFinalStateUnknown) | ||
| if !ok { | ||
| glog.Infof("Object contained wasn't a cluster or a deleted key: %+v", obj) | ||
| return | ||
| } | ||
| glog.Infof("Found tombstone for %v", obj) | ||
| delete(cc.clientMap, tombstone.Key) | ||
| } | ||
| } | ||
|
|
||
| // addToClusterSet inserts the new cluster to clusterSet and creates a corresponding | ||
| // restclient to map clusterKubeClientMap | ||
| func (cc *clusterClientCache) addToClientMap(obj interface{}) { | ||
| cluster := obj.(*federation.Cluster) | ||
| cc.rwlock.Lock() | ||
| defer cc.rwlock.Unlock() | ||
| cluster, ok := obj.(*federation.Cluster) | ||
| if !ok { | ||
| return | ||
| } | ||
| pred := getClusterConditionPredicate() | ||
| // check status | ||
| // skip if not ready | ||
| if pred(*cluster) { | ||
| cc.startClusterLW(cluster, cluster.Name) | ||
| } | ||
| } | ||
|
|
||
| func newClusterClientset(c *federation.Cluster) (*clientset.Clientset, error) { | ||
| clusterConfig, err := clientcmd.BuildConfigFromFlags(c.Spec.ServerAddressByClientCIDRs[0].ServerAddress, "") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| clusterConfig.QPS = KubeAPIQPS | ||
| clusterConfig.Burst = KubeAPIBurst | ||
| clientset := clientset.NewForConfigOrDie(restclient.AddUserAgent(clusterConfig, UserAgentName)) | ||
| return clientset, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| Copyright 2016 The Kubernetes Authors All rights reserved. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package service | ||
|
|
||
| // getClusterZoneName returns the name of the zone where the specified cluster exists (e.g. "us-east1-c" on GCE, or "us-east-1b" on AWS) | ||
| func getClusterZoneName(clusterName string) string { | ||
| // TODO: quinton: Get this from the cluster API object - from the annotation on a node in the cluster - it doesn't contain this yet. | ||
| return "zone-of-cluster-" + clusterName | ||
| } | ||
|
|
||
| // getClusterRegionName returns the name of the region where the specified cluster exists (e.g. us-east1 on GCE, or "us-east-1" on AWS) | ||
| func getClusterRegionName(clusterName string) string { | ||
| // TODO: quinton: Get this from the cluster API object - from the annotation on a node in the cluster - it doesn't contain this yet. | ||
| return "region-of-cluster-" + clusterName | ||
| } | ||
|
|
||
| // getFederationDNSZoneName returns the name of the managed DNS Zone configured for this federation | ||
| func getFederationDNSZoneName() string { | ||
| return "mydomain.com" // TODO: quinton: Get this from the federation configuration. | ||
| } | ||
|
|
||
| func ensureDNSRecords(clusterName string, cachedService *cachedService) error { | ||
| // Quinton: Pseudocode.... | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@quinton-hoole @mfanjie
ndsConfigFileprobably should bednsConfigFile(still exists on master)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are right.
Being fixed in #27158
Though the json field name is not useful yet.