-
Notifications
You must be signed in to change notification settings - Fork 153
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[release-1.12] Don't rely on InfraStructureTopology for infra HA (#3196…
…) (#3202) * [release-1.12] Don't rely on InfraStructureTopology for infra HA (#3196) This is a manual backport of #3186 Signed-off-by: Oren Cohen <[email protected]> * [release-1.12] Fixes for HA, based on #3209 Signed-off-by: Oren Cohen <[email protected]> --------- Signed-off-by: Oren Cohen <[email protected]> Co-authored-by: kubevirt-bot <[email protected]>
- Loading branch information
1 parent
d767e65
commit 271a689
Showing
30 changed files
with
591 additions
and
149 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,137 @@ | ||
| package nodes | ||
|
|
||
| import ( | ||
| "context" | ||
| "maps" | ||
|
|
||
| "k8s.io/apimachinery/pkg/api/errors" | ||
| "k8s.io/utils/ptr" | ||
|
|
||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| "sigs.k8s.io/controller-runtime/pkg/event" | ||
|
|
||
| hcov1beta1 "github.com/kubevirt/hyperconverged-cluster-operator/api/v1beta1" | ||
|
|
||
| operatorhandler "github.com/operator-framework/operator-lib/handler" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/controller" | ||
| logf "sigs.k8s.io/controller-runtime/pkg/log" | ||
| "sigs.k8s.io/controller-runtime/pkg/manager" | ||
| "sigs.k8s.io/controller-runtime/pkg/predicate" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
| "sigs.k8s.io/controller-runtime/pkg/source" | ||
|
|
||
| hcoutil "github.com/kubevirt/hyperconverged-cluster-operator/pkg/util" | ||
| ) | ||
|
|
||
| var ( | ||
| log = logf.Log.WithName("controller_nodes") | ||
| ) | ||
|
|
||
| // RegisterReconciler creates a new Nodes Reconciler and registers it into manager. | ||
| func RegisterReconciler(mgr manager.Manager) error { | ||
| return add(mgr, newReconciler(mgr)) | ||
| } | ||
|
|
||
| // newReconciler returns a new reconcile.Reconciler | ||
| func newReconciler(mgr manager.Manager) reconcile.Reconciler { | ||
| r := &ReconcileNodeCounter{ | ||
| client: mgr.GetClient(), | ||
| } | ||
|
|
||
| return r | ||
| } | ||
|
|
||
| // add adds a new Controller to mgr with r as the reconcile.Reconciler | ||
| func add(mgr manager.Manager, r reconcile.Reconciler) error { | ||
| // Create a new controller | ||
| c, err := controller.New("nodes-controller", mgr, controller.Options{Reconciler: r}) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Watch for changes to the cluster's nodes | ||
| err = c.Watch( | ||
| source.Kind( | ||
| mgr.GetCache(), &corev1.Node{}), | ||
| &operatorhandler.InstrumentedEnqueueRequestForObject{}, | ||
| nodeCountChangePredicate{}, | ||
| ) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // Custom predicate to detect changes in node count | ||
| type nodeCountChangePredicate struct { | ||
| predicate.Funcs | ||
| } | ||
|
|
||
| func (nodeCountChangePredicate) Update(e event.UpdateEvent) bool { | ||
| return !maps.Equal(e.ObjectOld.GetLabels(), e.ObjectNew.GetLabels()) | ||
| } | ||
|
|
||
| func (nodeCountChangePredicate) Create(_ event.CreateEvent) bool { | ||
| // node is added | ||
| return true | ||
| } | ||
|
|
||
| func (nodeCountChangePredicate) Delete(_ event.DeleteEvent) bool { | ||
| // node is removed | ||
| return true | ||
| } | ||
|
|
||
| func (nodeCountChangePredicate) Generic(_ event.GenericEvent) bool { | ||
| return false | ||
| } | ||
|
|
||
| // ReconcileNodeCounter reconciles the nodes count | ||
| type ReconcileNodeCounter struct { | ||
| // This client, initialized using mgr.Client() above, is a split client | ||
| // that reads objects from the cache and writes to the apiserver | ||
| client client.Client | ||
| } | ||
|
|
||
| // Reconcile updates the nodes count on ClusterInfo singleton | ||
| func (r *ReconcileNodeCounter) Reconcile(ctx context.Context, _ reconcile.Request) (reconcile.Result, error) { | ||
| log.Info("Triggered by a node count change") | ||
| clusterInfo := hcoutil.GetClusterInfo() | ||
| err := clusterInfo.SetHighAvailabilityMode(ctx, r.client) | ||
| if err != nil { | ||
| return reconcile.Result{}, err | ||
| } | ||
|
|
||
| hco := &hcov1beta1.HyperConverged{} | ||
| namespace, err := hcoutil.GetOperatorNamespaceFromEnv() | ||
| if err != nil { | ||
| return reconcile.Result{}, err | ||
| } | ||
| hcoKey := types.NamespacedName{ | ||
| Name: hcoutil.HyperConvergedName, | ||
| Namespace: namespace, | ||
| } | ||
| err = r.client.Get(ctx, hcoKey, hco) | ||
| if err != nil { | ||
| if errors.IsNotFound(err) { | ||
| return reconcile.Result{}, nil | ||
| } | ||
| return reconcile.Result{}, err | ||
| } | ||
|
|
||
| if !hco.ObjectMeta.DeletionTimestamp.IsZero() { | ||
| return reconcile.Result{}, nil | ||
| } | ||
| if hco.Status.InfrastructureHighlyAvailable == nil || | ||
| *hco.Status.InfrastructureHighlyAvailable != clusterInfo.IsInfrastructureHighlyAvailable() { | ||
|
|
||
| hco.Status.InfrastructureHighlyAvailable = ptr.To(clusterInfo.IsInfrastructureHighlyAvailable()) | ||
| err = r.client.Status().Update(ctx, hco) | ||
| if err != nil { | ||
| return reconcile.Result{}, err | ||
| } | ||
| } | ||
| return reconcile.Result{}, nil | ||
| } |
Oops, something went wrong.