-
Notifications
You must be signed in to change notification settings - Fork 150
Sync default-ingress-cert to the console namespace #361
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
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 hidden or 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 hidden or 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
138 changes: 138 additions & 0 deletions
138
pkg/console/controllers/resourcesyncdestination/controller.go
This file contains hidden or 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,138 @@ | ||
| package resourcesyncdestination | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "time" | ||
|
|
||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/util/runtime" | ||
| "k8s.io/apimachinery/pkg/util/wait" | ||
| coreinformersv1 "k8s.io/client-go/informers/core/v1" | ||
| coreclientv1 "k8s.io/client-go/kubernetes/typed/core/v1" | ||
| "k8s.io/client-go/tools/cache" | ||
| "k8s.io/client-go/util/workqueue" | ||
| "k8s.io/klog" | ||
|
|
||
| operatorsv1 "github.com/openshift/api/operator/v1" | ||
| operatorclientv1 "github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1" | ||
| operatorinformersv1 "github.com/openshift/client-go/operator/informers/externalversions/operator/v1" | ||
| "github.com/openshift/console-operator/pkg/api" | ||
| "github.com/openshift/library-go/pkg/operator/events" | ||
| ) | ||
|
|
||
| const ( | ||
| controllerWorkQueueKey = "resource-sync-destination-work-queue-key" | ||
| controllerName = "ConsoleResourceSyncDestinationController" | ||
| ) | ||
|
|
||
| type ResourceSyncDestinationController struct { | ||
| operatorConfigClient operatorclientv1.ConsoleInterface | ||
| configMapClient coreclientv1.ConfigMapsGetter | ||
| // events | ||
| cachesToSync []cache.InformerSynced | ||
| queue workqueue.RateLimitingInterface | ||
| recorder events.Recorder | ||
| } | ||
|
|
||
| func NewResourceSyncDestinationController( | ||
| // operatorconfig | ||
| operatorConfigClient operatorclientv1.ConsoleInterface, | ||
| operatorConfigInformer operatorinformersv1.ConsoleInformer, | ||
| // configmap | ||
| corev1Client coreclientv1.CoreV1Interface, | ||
| configMapInformer coreinformersv1.ConfigMapInformer, | ||
| // events | ||
| recorder events.Recorder, | ||
| ) *ResourceSyncDestinationController { | ||
| corev1Client.ConfigMaps(api.OpenShiftConsoleNamespace) | ||
|
|
||
| ctrl := &ResourceSyncDestinationController{ | ||
| operatorConfigClient: operatorConfigClient, | ||
| configMapClient: corev1Client, | ||
| // events | ||
| recorder: recorder, | ||
| cachesToSync: nil, | ||
| queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), controllerName), | ||
| } | ||
|
|
||
| configMapInformer.Informer().AddEventHandler(ctrl.newEventHandler()) | ||
| operatorConfigInformer.Informer().AddEventHandler(ctrl.newEventHandler()) | ||
| ctrl.cachesToSync = append(ctrl.cachesToSync, | ||
| operatorConfigInformer.Informer().HasSynced, | ||
| configMapInformer.Informer().HasSynced, | ||
| ) | ||
|
|
||
| return ctrl | ||
| } | ||
|
|
||
| func (c *ResourceSyncDestinationController) sync() error { | ||
| operatorConfig, err := c.operatorConfigClient.Get(api.ConfigResourceName, metav1.GetOptions{}) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| switch operatorConfig.Spec.ManagementState { | ||
| case operatorsv1.Managed: | ||
| klog.V(4).Infoln("console is in a managed state: syncing default-ingress-cert configmap") | ||
| case operatorsv1.Unmanaged: | ||
| klog.V(4).Infoln("console is in an unmanaged state: skipping default-ingress-cert configmap sync") | ||
| return nil | ||
| case operatorsv1.Removed: | ||
| klog.V(4).Infoln("console is in an removed state: removing synced default-ingress-cert configmap") | ||
| return c.removeDefaultIngressCertConfigMap() | ||
| default: | ||
| return fmt.Errorf("unknown state: %v", operatorConfig.Spec.ManagementState) | ||
| } | ||
|
|
||
| return err | ||
| } | ||
|
|
||
| func (c *ResourceSyncDestinationController) removeDefaultIngressCertConfigMap() error { | ||
| klog.V(2).Info("deleting default-ingress-cert configmap") | ||
| defer klog.V(2).Info("finished deleting default-ingress-cert configmap") | ||
| return c.configMapClient.ConfigMaps(api.OpenShiftConsoleNamespace).Delete(api.DefaultIngressCertConfigMapName, &metav1.DeleteOptions{}) | ||
| } | ||
|
|
||
| func (c *ResourceSyncDestinationController) Run(workers int, stopCh <-chan struct{}) { | ||
| defer runtime.HandleCrash() | ||
| defer c.queue.ShutDown() | ||
| klog.Infof("starting %v", controllerName) | ||
| defer klog.Infof("shutting down %v", controllerName) | ||
| if !cache.WaitForCacheSync(stopCh, c.cachesToSync...) { | ||
| klog.Infoln("caches did not sync") | ||
| runtime.HandleError(fmt.Errorf("caches did not sync")) | ||
| return | ||
| } | ||
| // only start one worker | ||
| go wait.Until(c.runWorker, time.Second, stopCh) | ||
| <-stopCh | ||
| } | ||
|
|
||
| func (c *ResourceSyncDestinationController) runWorker() { | ||
| for c.processNextWorkItem() { | ||
| } | ||
| } | ||
|
|
||
| func (c *ResourceSyncDestinationController) processNextWorkItem() bool { | ||
| processKey, quit := c.queue.Get() | ||
| if quit { | ||
| return false | ||
| } | ||
| defer c.queue.Done(processKey) | ||
| err := c.sync() | ||
| if err == nil { | ||
| c.queue.Forget(processKey) | ||
| return true | ||
| } | ||
| runtime.HandleError(fmt.Errorf("%v failed with : %v", processKey, err)) | ||
| c.queue.AddRateLimited(processKey) | ||
| return true | ||
| } | ||
|
|
||
| func (c *ResourceSyncDestinationController) newEventHandler() cache.ResourceEventHandler { | ||
| return cache.ResourceEventHandlerFuncs{ | ||
| AddFunc: func(obj interface{}) { c.queue.Add(controllerWorkQueueKey) }, | ||
| UpdateFunc: func(old, new interface{}) { c.queue.Add(controllerWorkQueueKey) }, | ||
| DeleteFunc: func(obj interface{}) { c.queue.Add(controllerWorkQueueKey) }, | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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
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.
This is a good one to bring back.
Tempting to separate it out into a separate PR, just in case backports of this PR come into play.
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.
Do you mean just to have the
config_builder_test.goandconfig_merger_test.godisabled? cause we will need to update theconfig_builder.gowith the necessary logic anyway