-
Notifications
You must be signed in to change notification settings - Fork 114
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add controller for node-ca daemonset
- Loading branch information
Showing
7 changed files
with
174 additions
and
9 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| package operator | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| utilruntime "k8s.io/apimachinery/pkg/util/runtime" | ||
| "k8s.io/apimachinery/pkg/util/wait" | ||
| appsv1informers "k8s.io/client-go/informers/apps/v1" | ||
| corev1informers "k8s.io/client-go/informers/core/v1" | ||
| appsv1client "k8s.io/client-go/kubernetes/typed/apps/v1" | ||
| appsv1listers "k8s.io/client-go/listers/apps/v1" | ||
| corev1listers "k8s.io/client-go/listers/core/v1" | ||
| "k8s.io/client-go/tools/cache" | ||
| "k8s.io/client-go/util/workqueue" | ||
| "k8s.io/klog" | ||
|
|
||
| "github.com/openshift/cluster-image-registry-operator/defaults" | ||
| "github.com/openshift/cluster-image-registry-operator/pkg/resource" | ||
| ) | ||
|
|
||
| type NodeCADaemonController struct { | ||
| appsClient appsv1client.AppsV1Interface | ||
| daemonSetLister appsv1listers.DaemonSetNamespaceLister | ||
| serviceLister corev1listers.ServiceNamespaceLister | ||
|
|
||
| cachesToSync []cache.InformerSynced | ||
| queue workqueue.RateLimitingInterface | ||
| } | ||
|
|
||
| func NewNodeCADaemonController( | ||
| appsClient appsv1client.AppsV1Interface, | ||
| daemonSetInformer appsv1informers.DaemonSetInformer, | ||
| serviceInformer corev1informers.ServiceInformer, | ||
| ) *NodeCADaemonController { | ||
| c := &NodeCADaemonController{ | ||
| appsClient: appsClient, | ||
| daemonSetLister: daemonSetInformer.Lister().DaemonSets(defaults.ImageRegistryOperatorNamespace), | ||
| serviceLister: serviceInformer.Lister().Services(defaults.ImageRegistryOperatorNamespace), | ||
| queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "NodeCADaemonController"), | ||
| } | ||
|
|
||
| daemonSetInformer.Informer().AddEventHandler(c.eventHandler()) | ||
| serviceInformer.Informer().AddEventHandler(c.eventHandler()) | ||
|
|
||
| c.cachesToSync = append(c.cachesToSync, daemonSetInformer.Informer().HasSynced) | ||
| c.cachesToSync = append(c.cachesToSync, serviceInformer.Informer().HasSynced) | ||
|
|
||
| return c | ||
| } | ||
|
|
||
| func (c *NodeCADaemonController) eventHandler() cache.ResourceEventHandler { | ||
| const workQueueKey = "instance" | ||
| return cache.ResourceEventHandlerFuncs{ | ||
| AddFunc: func(obj interface{}) { c.queue.Add(workQueueKey) }, | ||
| UpdateFunc: func(old, new interface{}) { c.queue.Add(workQueueKey) }, | ||
| DeleteFunc: func(obj interface{}) { c.queue.Add(workQueueKey) }, | ||
| } | ||
| } | ||
|
|
||
| func (c *NodeCADaemonController) runWorker() { | ||
| for c.processNextWorkItem() { | ||
| } | ||
| } | ||
|
|
||
| func (c *NodeCADaemonController) processNextWorkItem() bool { | ||
| obj, shutdown := c.queue.Get() | ||
| if shutdown { | ||
| return false | ||
| } | ||
| defer c.queue.Done(obj) | ||
|
|
||
| klog.V(1).Infof("get event from workqueue") | ||
| if err := c.sync(); err != nil { | ||
| c.queue.AddRateLimited(workqueueKey) | ||
| klog.Errorf("NodeCADaemonController: unable to sync: %s, requeuing", err) | ||
| } else { | ||
| c.queue.Forget(obj) | ||
| klog.Infof("NodeCADaemonController: event from workqueue successfully processed") | ||
| } | ||
| return true | ||
| } | ||
|
|
||
| func (c *NodeCADaemonController) sync() error { | ||
| gen := resource.NewGeneratorNodeCADaemonSet(c.daemonSetLister, c.serviceLister, c.appsClient, Parameters(defaults.ImageRegistryOperatorNamespace)) | ||
| return resource.ApplyMutator(gen) | ||
| } | ||
|
|
||
| func (c *NodeCADaemonController) Run(stopCh <-chan struct{}) { | ||
| defer utilruntime.HandleCrash() | ||
| defer c.queue.ShutDown() | ||
|
|
||
| klog.Infof("Starting NodeCADaemonController") | ||
| if !cache.WaitForCacheSync(stopCh, c.cachesToSync...) { | ||
| return | ||
| } | ||
|
|
||
| go wait.Until(c.runWorker, time.Second, stopCh) | ||
|
|
||
| klog.Infof("Started NodeCADaemonController") | ||
| <-stopCh | ||
| klog.Infof("Shutting down NodeCADaemonController") | ||
| } |
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
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,49 @@ | ||
| package e2e | ||
|
|
||
| import ( | ||
| "testing" | ||
| "time" | ||
|
|
||
| "k8s.io/apimachinery/pkg/api/errors" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/util/wait" | ||
|
|
||
| imageregistryapiv1 "github.com/openshift/api/imageregistry/v1" | ||
| operatorapiv1 "github.com/openshift/api/operator/v1" | ||
|
|
||
| "github.com/openshift/cluster-image-registry-operator/defaults" | ||
| "github.com/openshift/cluster-image-registry-operator/test/framework" | ||
| ) | ||
|
|
||
| func TestNodeCADaemonAlwaysDeployed(t *testing.T) { | ||
| client := framework.MustNewClientset(t, nil) | ||
|
|
||
| defer framework.MustRemoveImageRegistry(t, client) | ||
|
|
||
| cr := &imageregistryapiv1.Config{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: defaults.ImageRegistryResourceName, | ||
| }, | ||
| Spec: imageregistryapiv1.ImageRegistrySpec{ | ||
| ManagementState: operatorapiv1.Removed, | ||
| Replicas: 1, | ||
| }, | ||
| } | ||
| framework.MustDeployImageRegistry(t, client, cr) | ||
| framework.MustEnsureImageRegistryIsAvailable(t, client) | ||
|
|
||
| t.Log("waiting until the node-ca daemon is deployed") | ||
| err := wait.Poll(time.Second, framework.AsyncOperationTimeout, func() (stop bool, err error) { | ||
| _, err = client.DaemonSets(defaults.ImageRegistryOperatorNamespace).Get("node-ca", metav1.GetOptions{}) | ||
| if errors.IsNotFound(err) { | ||
| t.Logf("ds/node-ca has not been created yet: %s", err) | ||
| return false, nil | ||
| } else if err != nil { | ||
| return false, err | ||
| } | ||
| return true, nil | ||
| }) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| } |