consoleplugin reconciler #884
+976
−38
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
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,128 @@ | ||
| package controllers | ||
|
|
||
| import ( | ||
| "context" | ||
| "sync" | ||
|
|
||
| "github.com/go-logr/logr" | ||
| consolev1 "github.com/openshift/api/console/v1" | ||
| appsv1 "k8s.io/api/apps/v1" | ||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/utils/env" | ||
| "k8s.io/utils/ptr" | ||
| ctrlruntime "sigs.k8s.io/controller-runtime" | ||
|
|
||
| "github.com/kuadrant/policy-machinery/controller" | ||
| "github.com/kuadrant/policy-machinery/machinery" | ||
|
|
||
| "github.com/kuadrant/kuadrant-operator/pkg/library/reconcilers" | ||
| "github.com/kuadrant/kuadrant-operator/pkg/library/utils" | ||
| "github.com/kuadrant/kuadrant-operator/pkg/log" | ||
| "github.com/kuadrant/kuadrant-operator/pkg/openshift" | ||
| "github.com/kuadrant/kuadrant-operator/pkg/openshift/consoleplugin" | ||
| ) | ||
|
|
||
| //+kubebuilder:rbac:groups=console.openshift.io,resources=consoleplugins,verbs=get;list;watch;create;update;patch;delete | ||
|
|
||
| var ( | ||
| ConsolePluginImageURL = env.GetString("RELATED_IMAGE_CONSOLEPLUGIN", "quay.io/kuadrant/console-plugin:latest") | ||
| ) | ||
|
|
||
| type ConsolePluginReconciler struct { | ||
| *reconcilers.BaseReconciler | ||
|
|
||
| namespace string | ||
| } | ||
|
|
||
| func NewConsolePluginReconciler(mgr ctrlruntime.Manager, namespace string) *ConsolePluginReconciler { | ||
| return &ConsolePluginReconciler{ | ||
| BaseReconciler: reconcilers.NewBaseReconciler( | ||
| mgr.GetClient(), mgr.GetScheme(), mgr.GetAPIReader(), | ||
| log.Log.WithName("consoleplugin"), | ||
| mgr.GetEventRecorderFor("ConsolePlugin"), | ||
| ), | ||
| namespace: namespace, | ||
| } | ||
| } | ||
|
|
||
| func (r *ConsolePluginReconciler) Subscription() *controller.Subscription { | ||
| return &controller.Subscription{ | ||
| ReconcileFunc: r.Run, | ||
| Events: []controller.ResourceEventMatcher{ | ||
| {Kind: ptr.To(openshift.ConsolePluginGVK.GroupKind())}, | ||
| { | ||
| Kind: ptr.To(ConfigMapGroupKind), | ||
| ObjectNamespace: r.namespace, | ||
| ObjectName: TopologyConfigMapName, | ||
| EventType: ptr.To(controller.CreateEvent), | ||
| }, | ||
| { | ||
| Kind: ptr.To(ConfigMapGroupKind), | ||
| ObjectNamespace: r.namespace, | ||
| ObjectName: TopologyConfigMapName, | ||
| EventType: ptr.To(controller.DeleteEvent), | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func (r *ConsolePluginReconciler) Run(eventCtx context.Context, _ []controller.ResourceEvent, topology *machinery.Topology, _ error, _ *sync.Map) error { | ||
| logger := r.Logger() | ||
| logger.V(1).Info("task started") | ||
| ctx := logr.NewContext(eventCtx, logger) | ||
|
|
||
| existingTopologyConfigMaps := topology.Objects().Items(func(object machinery.Object) bool { | ||
| return object.GetName() == TopologyConfigMapName && object.GetNamespace() == r.namespace && object.GroupVersionKind().Kind == ConfigMapGroupKind.Kind | ||
| }) | ||
|
|
||
| topologyExists := len(existingTopologyConfigMaps) > 0 | ||
|
|
||
| // Service | ||
| service := consoleplugin.Service(r.namespace) | ||
| if !topologyExists { | ||
| utils.TagObjectToDelete(service) | ||
| } | ||
| err := r.ReconcileResource(ctx, &corev1.Service{}, service, reconcilers.CreateOnlyMutator) | ||
|
There was a problem hiding this comment. I guess if we want to align with the conventions agreed, we do not want to use this There was a problem hiding this comment.
BTW, I realize that the old issue of endless reconciliation loop for authconfig #354 we fixed with the dry run https://github.com/Kuadrant/kuadrant-operator/blob/main/pkg/library/reconcilers/base_reconciler.go#L156 desired.SetResourceVersion(obj.GetResourceVersion())
if err := b.Client().Update(ctx, desired, client.DryRunAll); err != nil {
return err
}can now become an issue again with the topology being the source of truth. There was a problem hiding this comment. Yeah, I'm fine with leaving it to be addressed later 👍 |
||
| if err != nil { | ||
| logger.Error(err, "reconciling service") | ||
| return err | ||
| } | ||
|
|
||
| // Deployment | ||
| deployment := consoleplugin.Deployment(r.namespace, ConsolePluginImageURL) | ||
| deploymentMutators := make([]reconcilers.DeploymentMutateFn, 0) | ||
| deploymentMutators = append(deploymentMutators, reconcilers.DeploymentImageMutator) | ||
| if !topologyExists { | ||
| utils.TagObjectToDelete(deployment) | ||
| } | ||
| err = r.ReconcileResource(ctx, &appsv1.Deployment{}, deployment, reconcilers.DeploymentMutator(deploymentMutators...)) | ||
| if err != nil { | ||
| logger.Error(err, "reconciling deployment") | ||
| return err | ||
| } | ||
|
|
||
| // Nginx ConfigMap | ||
| nginxConfigMap := consoleplugin.NginxConfigMap(r.namespace) | ||
| if !topologyExists { | ||
| utils.TagObjectToDelete(nginxConfigMap) | ||
| } | ||
| err = r.ReconcileResource(ctx, &corev1.ConfigMap{}, nginxConfigMap, reconcilers.CreateOnlyMutator) | ||
| if err != nil { | ||
| logger.Error(err, "reconciling nginx configmap") | ||
| return err | ||
| } | ||
|
|
||
| // ConsolePlugin | ||
| consolePlugin := consoleplugin.ConsolePlugin(r.namespace) | ||
| if !topologyExists { | ||
| utils.TagObjectToDelete(consolePlugin) | ||
| } | ||
| err = r.ReconcileResource(ctx, &consolev1.ConsolePlugin{}, consolePlugin, reconcilers.CreateOnlyMutator) | ||
| if err != nil { | ||
| logger.Error(err, "reconciling consoleplugin") | ||
| return err | ||
| } | ||
|
|
||
| logger.V(1).Info("task ended") | ||
| return nil | ||
| } | ||
Oops, something went wrong.
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.
@didierofrivia @maleck13 trying here complete URL instead of some "version". What are your thoughts about this?
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.
sorry guys, accepted by (answer) omission.
We can always change that later