-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
[WIP]✨ Add remote cluster cache manager #2835
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,327 @@ | ||||||
/* | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would it make sense to move the bulk of the implementation here to a library so that it would be easier to consume outside of the core controller manager? I wouldn't expect any providers (especially out of tree) to import anything under There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is actually a library. I've (privately) questioned why the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i initially put it under there because it was code to be used within capi controllers, it expanded over time though |
||||||
Copyright 2020 The Kubernetes Authors. | ||||||
|
||||||
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 remote | ||||||
|
||||||
import ( | ||||||
"context" | ||||||
"fmt" | ||||||
"sync" | ||||||
|
||||||
"github.com/go-logr/logr" | ||||||
"github.com/pkg/errors" | ||||||
"k8s.io/apimachinery/pkg/runtime" | ||||||
"k8s.io/client-go/rest" | ||||||
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3" | ||||||
ctrl "sigs.k8s.io/controller-runtime" | ||||||
"sigs.k8s.io/controller-runtime/pkg/cache" | ||||||
"sigs.k8s.io/controller-runtime/pkg/client" | ||||||
"sigs.k8s.io/controller-runtime/pkg/controller" | ||||||
"sigs.k8s.io/controller-runtime/pkg/handler" | ||||||
"sigs.k8s.io/controller-runtime/pkg/predicate" | ||||||
"sigs.k8s.io/controller-runtime/pkg/reconcile" | ||||||
"sigs.k8s.io/controller-runtime/pkg/source" | ||||||
) | ||||||
|
||||||
// clusterCache embeds cache.Cache and combines it with a stop channel. | ||||||
type clusterCache struct { | ||||||
cache.Cache | ||||||
|
||||||
lock sync.Mutex | ||||||
stopped bool | ||||||
stop chan struct{} | ||||||
} | ||||||
|
||||||
func (cc *clusterCache) Stop() { | ||||||
cc.lock.Lock() | ||||||
defer cc.lock.Unlock() | ||||||
|
||||||
if cc.stopped { | ||||||
return | ||||||
} | ||||||
|
||||||
cc.stopped = true | ||||||
close(cc.stop) | ||||||
} | ||||||
|
||||||
// ClusterCacheTracker manages client caches for workload clusters. | ||||||
type ClusterCacheTracker struct { | ||||||
log logr.Logger | ||||||
client client.Client | ||||||
scheme *runtime.Scheme | ||||||
|
||||||
clusterCachesLock sync.RWMutex | ||||||
clusterCaches map[client.ObjectKey]*clusterCache | ||||||
|
||||||
watchesLock sync.RWMutex | ||||||
watches map[client.ObjectKey]map[watchInfo]struct{} | ||||||
|
||||||
// For testing | ||||||
newRESTConfig func(ctx context.Context, cluster client.ObjectKey) (*rest.Config, error) | ||||||
Comment on lines
+72
to
+73
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. non blocking: could we use the kubeconfig secret to create a client to envtest instead of mocking it? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do you mean build up a dummy secret in the unit test? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
This is what I did for the MHC tests and it seemed to work cluster-api/controllers/machinehealthcheck_controller_test.go Lines 72 to 73 in 09f87a2
I think it's preferential to do this, but could definitely be a follow up PR |
||||||
} | ||||||
|
||||||
// NewClusterCacheTracker creates a new ClusterCacheTracker. | ||||||
func NewClusterCacheTracker(log logr.Logger, manager ctrl.Manager) (*ClusterCacheTracker, error) { | ||||||
m := &ClusterCacheTracker{ | ||||||
log: log, | ||||||
client: manager.GetClient(), | ||||||
scheme: manager.GetScheme(), | ||||||
clusterCaches: make(map[client.ObjectKey]*clusterCache), | ||||||
watches: make(map[client.ObjectKey]map[watchInfo]struct{}), | ||||||
} | ||||||
|
||||||
// Make sure we're using the default new cluster cache function. | ||||||
m.newRESTConfig = m.defaultNewRESTConfig | ||||||
|
||||||
return m, nil | ||||||
} | ||||||
|
||||||
// Watcher is a scoped-down interface from Controller that only knows how to watch. | ||||||
type Watcher interface { | ||||||
// Watch watches src for changes, sending events to eventHandler if they pass predicates. | ||||||
Watch(src source.Source, eventHandler handler.EventHandler, predicates ...predicate.Predicate) error | ||||||
} | ||||||
|
||||||
// watchInfo is used as a map key to uniquely identify a watch. Because predicates is a slice, it cannot be included. | ||||||
type watchInfo struct { | ||||||
watcher Watcher | ||||||
kind runtime.Object | ||||||
eventHandler handler.EventHandler | ||||||
} | ||||||
|
||||||
// watchExists returns true if watch has already been established. This does NOT hold any lock. | ||||||
func (m *ClusterCacheTracker) watchExists(cluster client.ObjectKey, watch watchInfo) bool { | ||||||
watchesForCluster, clusterFound := m.watches[cluster] | ||||||
if !clusterFound { | ||||||
return false | ||||||
} | ||||||
|
||||||
_, watchFound := watchesForCluster[watch] | ||||||
return watchFound | ||||||
} | ||||||
|
||||||
// deleteWatchesForCluster removes the watches for cluster from the tracker. | ||||||
func (m *ClusterCacheTracker) deleteWatchesForCluster(cluster client.ObjectKey) { | ||||||
m.watchesLock.Lock() | ||||||
defer m.watchesLock.Unlock() | ||||||
|
||||||
delete(m.watches, cluster) | ||||||
} | ||||||
|
||||||
// WatchInput specifies the parameters used to establish a new watch for a remote cluster. | ||||||
type WatchInput struct { | ||||||
// Cluster is the key for the remote cluster. | ||||||
Cluster client.ObjectKey | ||||||
|
||||||
// Watcher is the watcher (controller) whose Reconcile() function will be called for events. | ||||||
Watcher Watcher | ||||||
|
||||||
// Kind is the type of resource to watch. | ||||||
Kind runtime.Object | ||||||
|
||||||
// CacheOptions are used to specify options for the remote cache, such as the Scheme to use. | ||||||
CacheOptions cache.Options | ||||||
|
||||||
// EventHandler contains the event handlers to invoke for resource events. | ||||||
EventHandler handler.EventHandler | ||||||
|
||||||
// Predicates is used to filter resource events. | ||||||
Predicates []predicate.Predicate | ||||||
} | ||||||
|
||||||
// Watch watches a remote cluster for resource events. If the watch already exists based on cluster, watcher, | ||||||
// kind, and eventHandler, then this is a no-op. | ||||||
func (m *ClusterCacheTracker) Watch(ctx context.Context, input WatchInput) error { | ||||||
wi := watchInfo{ | ||||||
watcher: input.Watcher, | ||||||
kind: input.Kind, | ||||||
eventHandler: input.EventHandler, | ||||||
} | ||||||
|
||||||
// First, check if the watch already exists | ||||||
var exists bool | ||||||
m.watchesLock.RLock() | ||||||
exists = m.watchExists(input.Cluster, wi) | ||||||
m.watchesLock.RUnlock() | ||||||
|
||||||
if exists { | ||||||
m.log.V(4).Info("Watch already exists", "namespace", input.Cluster.Namespace, "cluster", input.Cluster.Name, "kind", fmt.Sprintf("%T", input.Kind)) | ||||||
return nil | ||||||
} | ||||||
|
||||||
// Doesn't exist - grab the write lock | ||||||
m.watchesLock.Lock() | ||||||
defer m.watchesLock.Unlock() | ||||||
|
||||||
// Need to check if another goroutine created the watch while this one was waiting for the lock | ||||||
if m.watchExists(input.Cluster, wi) { | ||||||
m.log.V(4).Info("Watch already exists", "namespace", input.Cluster.Namespace, "cluster", input.Cluster.Name, "kind", fmt.Sprintf("%T", input.Kind)) | ||||||
return nil | ||||||
} | ||||||
|
||||||
// Need to create the watch | ||||||
watchesForCluster, found := m.watches[input.Cluster] | ||||||
if !found { | ||||||
watchesForCluster = make(map[watchInfo]struct{}) | ||||||
m.watches[input.Cluster] = watchesForCluster | ||||||
} | ||||||
|
||||||
cache, err := m.getOrCreateClusterCache(ctx, input.Cluster) | ||||||
if err != nil { | ||||||
return err | ||||||
} | ||||||
|
||||||
if err := input.Watcher.Watch(source.NewKindWithCache(input.Kind, cache), input.EventHandler, input.Predicates...); err != nil { | ||||||
return errors.Wrap(err, fmt.Sprintf("error creating watch")) | ||||||
} | ||||||
|
||||||
watchesForCluster[wi] = struct{}{} | ||||||
|
||||||
return nil | ||||||
} | ||||||
|
||||||
// getOrCreateClusterCache returns the clusterCache for cluster, creating a new ClusterCache if needed. | ||||||
func (m *ClusterCacheTracker) getOrCreateClusterCache(ctx context.Context, cluster client.ObjectKey) (*clusterCache, error) { | ||||||
cache := m.getClusterCache(cluster) | ||||||
if cache != nil { | ||||||
return cache, nil | ||||||
} | ||||||
|
||||||
return m.newClusterCache(ctx, cluster) | ||||||
} | ||||||
|
||||||
// getClusterCache returns the clusterCache for cluster, or nil if it does not exist. | ||||||
func (m *ClusterCacheTracker) getClusterCache(cluster client.ObjectKey) *clusterCache { | ||||||
m.clusterCachesLock.RLock() | ||||||
defer m.clusterCachesLock.RUnlock() | ||||||
|
||||||
return m.clusterCaches[cluster] | ||||||
} | ||||||
|
||||||
// newClusterCache creates and starts a new clusterCache for cluster. | ||||||
func (m *ClusterCacheTracker) newClusterCache(ctx context.Context, cluster client.ObjectKey) (*clusterCache, error) { | ||||||
m.clusterCachesLock.Lock() | ||||||
defer m.clusterCachesLock.Unlock() | ||||||
|
||||||
// If another goroutine created the cache while this one was waiting to acquire the write lock, return that | ||||||
// instead of overwriting it. | ||||||
if c, exists := m.clusterCaches[cluster]; exists { | ||||||
return c, nil | ||||||
} | ||||||
|
||||||
config, err := m.newRESTConfig(ctx, cluster) | ||||||
if err != nil { | ||||||
return nil, errors.Wrap(err, "error creating REST client config for remote cluster") | ||||||
} | ||||||
|
||||||
remoteCache, err := cache.New(config, cache.Options{Scheme: m.scheme}) | ||||||
if err != nil { | ||||||
return nil, errors.Wrap(err, "error creating cache for remote cluster") | ||||||
} | ||||||
stop := make(chan struct{}) | ||||||
|
||||||
cc := &clusterCache{ | ||||||
Cache: remoteCache, | ||||||
stop: stop, | ||||||
} | ||||||
m.clusterCaches[cluster] = cc | ||||||
|
||||||
// Start the cache!!! | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 😄 I love the enthusiasm |
||||||
go remoteCache.Start(cc.stop) | ||||||
|
||||||
return cc, nil | ||||||
} | ||||||
|
||||||
func (m *ClusterCacheTracker) defaultNewRESTConfig(ctx context.Context, cluster client.ObjectKey) (*rest.Config, error) { | ||||||
config, err := RESTConfig(ctx, m.client, cluster) | ||||||
if err != nil { | ||||||
return nil, errors.Wrap(err, "error fetching remote cluster config") | ||||||
} | ||||||
return config, nil | ||||||
} | ||||||
|
||||||
func (m *ClusterCacheTracker) deleteClusterCache(cluster client.ObjectKey) { | ||||||
m.clusterCachesLock.Lock() | ||||||
defer m.clusterCachesLock.Unlock() | ||||||
|
||||||
delete(m.clusterCaches, cluster) | ||||||
} | ||||||
|
||||||
type ClusterCacheReconciler struct { | ||||||
log logr.Logger | ||||||
client client.Client | ||||||
m *ClusterCacheTracker | ||||||
} | ||||||
|
||||||
func NewClusterCacheReconciler( | ||||||
log logr.Logger, | ||||||
mgr ctrl.Manager, | ||||||
controllerOptions controller.Options, | ||||||
ccm *ClusterCacheTracker, | ||||||
) (*ClusterCacheReconciler, error) { | ||||||
r := &ClusterCacheReconciler{ | ||||||
log: log, | ||||||
client: mgr.GetClient(), | ||||||
m: ccm, | ||||||
} | ||||||
|
||||||
// Watch Clusters so we can stop and remove caches when Clusters are deleted. | ||||||
_, err := ctrl.NewControllerManagedBy(mgr). | ||||||
For(&clusterv1.Cluster{}). | ||||||
WithOptions(controllerOptions). | ||||||
Build(r) | ||||||
|
||||||
if err != nil { | ||||||
return nil, errors.Wrap(err, "failed to create cluster cache manager controller") | ||||||
} | ||||||
|
||||||
return r, nil | ||||||
} | ||||||
|
||||||
// Reconcile reconciles Clusters and removes ClusterCaches for any Cluster that cannot be retrieved from the | ||||||
// management cluster. | ||||||
func (r *ClusterCacheReconciler) Reconcile(req reconcile.Request) (reconcile.Result, error) { | ||||||
ctx := context.Background() | ||||||
|
||||||
log := r.log.WithValues("namespace", req.Namespace, "name", req.Name) | ||||||
log.V(4).Info("Reconciling") | ||||||
|
||||||
var cluster clusterv1.Cluster | ||||||
|
||||||
err := r.client.Get(ctx, req.NamespacedName, &cluster) | ||||||
if err == nil { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this also attempt to guard against intermittent errors here as well and only continue on to the cache deletion if There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd have to do some (re)digging, but given that the client is doing cached reads, I think the only way you can get a non-404 error is if the client's cache hasn't been started yet. |
||||||
log.V(4).Info("Cluster still exists") | ||||||
return reconcile.Result{}, nil | ||||||
} | ||||||
Comment on lines
+305
to
+308
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Might it be worth checking if the cluster deletion timestamp is set and stop the cache earlier? My concern is that the manager may miss the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If the manager is running, it will not miss the deletion event. One of two situations will happen:
However, I can add code to check for deletion timestamps too, if you think it'll be beneficial. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I was unaware the the informer would send a simulated delete event, TIL! In that case, I'm content with it as is, thanks for the explanation |
||||||
|
||||||
log.V(4).Info("Error retrieving cluster", "error", err.Error()) | ||||||
|
||||||
c := r.m.getClusterCache(req.NamespacedName) | ||||||
if c == nil { | ||||||
log.V(4).Info("No current cluster cache exists - nothing to do") | ||||||
return reconcile.Result{}, nil | ||||||
} | ||||||
|
||||||
log.V(4).Info("Stopping cluster cache") | ||||||
c.Stop() | ||||||
|
||||||
r.m.deleteClusterCache(req.NamespacedName) | ||||||
|
||||||
log.V(4).Info("Deleting watches for cluster cache") | ||||||
r.m.deleteWatchesForCluster(req.NamespacedName) | ||||||
|
||||||
return reconcile.Result{}, nil | ||||||
} |
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.
Maybe we rename this to cluster_cache_controller?
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.
See my comment below about manager vs reconciler. I'd prefer to keep this as-is, or rename to cluster_cache_manager.go. But again, if you feel strongly, I can rename it.