operator: Add EnabledFlag field to AROController

Azure · Nov 9, 2023 · f1b40b0 · f1b40b0
1 parent 03642e4
commit f1b40b0
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 47 deletions.
diff --git a/pkg/operator/controllers/base/aro_controller.go b/pkg/operator/controllers/base/aro_controller.go
@@ -23,9 +23,10 @@ type AROReconciler interface {
 }
 
 type AROController struct {
-	Log    *logrus.Entry
-	Client client.Client
-	Name   string
+	Log         *logrus.Entry
+	Client      client.Client
+	Name        string
+	EnabledFlag string
 }
 
 func (c *AROController) GetName() string {

diff --git a/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller.go b/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller.go
@@ -135,9 +135,10 @@ type CloudProviderConfigReconciler struct {
 func NewReconciler(log *logrus.Entry, client client.Client) *CloudProviderConfigReconciler {
 	return &CloudProviderConfigReconciler{
 		AROController: base.AROController{
-			Log:    log.WithField("controller", controllerName),
-			Client: client,
-			Name:   controllerName,
+			Log:         log.WithField("controller", controllerName),
+			Client:      client,
+			Name:        controllerName,
+			EnabledFlag: controllerEnabled,
 		},
 	}
 }
@@ -151,7 +152,7 @@ func (r *CloudProviderConfigReconciler) Reconcile(ctx context.Context, request c
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.OperatorFlags.GetSimpleBoolean(controllerEnabled) {
+	if !instance.Spec.OperatorFlags.GetSimpleBoolean(r.EnabledFlag) {
 		r.Log.Debug("controller is disabled")
 		return reconcile.Result{}, nil
 	}

diff --git a/pkg/operator/controllers/dnsmasq/cluster_controller.go b/pkg/operator/controllers/dnsmasq/cluster_controller.go
@@ -35,9 +35,10 @@ type ClusterReconciler struct {
 func NewClusterReconciler(log *logrus.Entry, client client.Client, dh dynamichelper.Interface) *ClusterReconciler {
 	return &ClusterReconciler{
 		AROController: base.AROController{
-			Log:    log.WithField("controller", clusterControllerName),
-			Client: client,
-			Name:   clusterControllerName,
+			Log:         log.WithField("controller", clusterControllerName),
+			Client:      client,
+			Name:        clusterControllerName,
+			EnabledFlag: controllerEnabled,
 		},
 		dh: dh,
 	}
@@ -51,7 +52,7 @@ func (r *ClusterReconciler) Reconcile(ctx context.Context, request ctrl.Request)
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.OperatorFlags.GetSimpleBoolean(controllerEnabled) {
+	if !instance.Spec.OperatorFlags.GetSimpleBoolean(r.EnabledFlag) {
 		r.Log.Debug("controller is disabled")
 		return reconcile.Result{}, nil
 	}

diff --git a/pkg/operator/controllers/dnsmasq/machineconfig_controller.go b/pkg/operator/controllers/dnsmasq/machineconfig_controller.go
@@ -34,9 +34,10 @@ var rxARODNS = regexp.MustCompile("^99-(.*)-aro-dns$")
 func NewMachineConfigReconciler(log *logrus.Entry, client client.Client, dh dynamichelper.Interface) *MachineConfigReconciler {
 	return &MachineConfigReconciler{
 		AROController: base.AROController{
-			Log:    log.WithField("controller", machineConfigControllerName),
-			Client: client,
-			Name:   machineConfigControllerName,
+			Log:         log.WithField("controller", machineConfigControllerName),
+			Client:      client,
+			Name:        machineConfigControllerName,
+			EnabledFlag: controllerEnabled,
 		},
 		dh: dh,
 	}
@@ -50,7 +51,7 @@ func (r *MachineConfigReconciler) Reconcile(ctx context.Context, request ctrl.Re
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.OperatorFlags.GetSimpleBoolean(controllerEnabled) {
+	if !instance.Spec.OperatorFlags.GetSimpleBoolean(r.EnabledFlag) {
 		r.Log.Debug("controller is disabled")
 		return reconcile.Result{}, nil
 	}

diff --git a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller.go b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller.go
@@ -31,9 +31,10 @@ type MachineConfigPoolReconciler struct {
 func NewMachineConfigPoolReconciler(log *logrus.Entry, client client.Client, dh dynamichelper.Interface) *MachineConfigPoolReconciler {
 	return &MachineConfigPoolReconciler{
 		AROController: base.AROController{
-			Log:    log.WithField("controller", machineConfigPoolControllerName),
-			Client: client,
-			Name:   machineConfigPoolControllerName,
+			Log:         log.WithField("controller", machineConfigPoolControllerName),
+			Client:      client,
+			Name:        machineConfigPoolControllerName,
+			EnabledFlag: controllerEnabled,
 		},
 		dh: dh,
 	}
@@ -47,7 +48,7 @@ func (r *MachineConfigPoolReconciler) Reconcile(ctx context.Context, request ctr
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.OperatorFlags.GetSimpleBoolean(controllerEnabled) {
+	if !instance.Spec.OperatorFlags.GetSimpleBoolean(r.EnabledFlag) {
 		r.Log.Debug("controller is disabled")
 		return reconcile.Result{}, nil
 	}

diff --git a/pkg/operator/controllers/genevalogging/genevalogging_controller.go b/pkg/operator/controllers/genevalogging/genevalogging_controller.go
@@ -42,9 +42,10 @@ type Reconciler struct {
 func NewReconciler(log *logrus.Entry, client client.Client, dh dynamichelper.Interface) *Reconciler {
 	return &Reconciler{
 		AROController: base.AROController{
-			Log:    log.WithField("controller", controllerName),
-			Client: client,
-			Name:   controllerName,
+			Log:         log.WithField("controller", controllerName),
+			Client:      client,
+			Name:        controllerName,
+			EnabledFlag: controllerEnabled,
 		},
 		dh: dh,
 	}
@@ -92,7 +93,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.OperatorFlags.GetSimpleBoolean(controllerEnabled) {
+	if !instance.Spec.OperatorFlags.GetSimpleBoolean(r.EnabledFlag) {
 		r.Log.Debug("controller is disabled")
 		return reconcile.Result{}, nil
 	}

diff --git a/pkg/operator/controllers/imageconfig/image_controller.go b/pkg/operator/controllers/imageconfig/image_controller.go
@@ -39,9 +39,10 @@ type Reconciler struct {
 func NewReconciler(log *logrus.Entry, client client.Client) *Reconciler {
 	return &Reconciler{
 		AROController: base.AROController{
-			Log:    log.WithField("controller", controllerName),
-			Client: client,
-			Name:   controllerName,
+			Log:         log.WithField("controller", controllerName),
+			Client:      client,
+			Name:        controllerName,
+			EnabledFlag: controllerEnabled,
 		},
 	}
 }
@@ -56,7 +57,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.OperatorFlags.GetSimpleBoolean(controllerEnabled) {
+	if !instance.Spec.OperatorFlags.GetSimpleBoolean(r.EnabledFlag) {
 		r.Log.Debug("controller is disabled")
 		return reconcile.Result{}, nil
 	}

diff --git a/pkg/operator/controllers/ingress/ingress_controller.go b/pkg/operator/controllers/ingress/ingress_controller.go
@@ -37,9 +37,10 @@ type Reconciler struct {
 func NewReconciler(log *logrus.Entry, client client.Client) *Reconciler {
 	return &Reconciler{
 		AROController: base.AROController{
-			Log:    log.WithField("controller", controllerName),
-			Client: client,
-			Name:   controllerName,
+			Log:         log.WithField("controller", controllerName),
+			Client:      client,
+			Name:        controllerName,
+			EnabledFlag: controllerEnabled,
 		},
 	}
 }
@@ -50,7 +51,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.OperatorFlags.GetSimpleBoolean(controllerEnabled) {
+	if !instance.Spec.OperatorFlags.GetSimpleBoolean(r.EnabledFlag) {
 		r.Log.Debug("controller is disabled")
 		return reconcile.Result{}, nil
 	}

diff --git a/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller.go b/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller.go
@@ -51,9 +51,10 @@ type Reconciler struct {
 func NewReconciler(log *logrus.Entry, client client.Client, dh dynamichelper.Interface) *Reconciler {
 	return &Reconciler{
 		AROController: base.AROController{
-			Log:    log.WithField("controller", controllerName),
-			Client: client,
-			Name:   controllerName,
+			Log:         log.WithField("controller", controllerName),
+			Client:      client,
+			Name:        controllerName,
+			EnabledFlag: controllerEnabled,
 		},
 		dh: dh,
 	}
@@ -68,7 +69,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.OperatorFlags.GetSimpleBoolean(controllerEnabled) {
+	if !instance.Spec.OperatorFlags.GetSimpleBoolean(r.EnabledFlag) {
 		r.Log.Debug("controller is disabled")
 		return reconcile.Result{}, nil
 	}

diff --git a/pkg/operator/controllers/machineset/machineset_controller.go b/pkg/operator/controllers/machineset/machineset_controller.go
@@ -34,9 +34,10 @@ type Reconciler struct {
 func NewReconciler(log *logrus.Entry, client client.Client) *Reconciler {
 	return &Reconciler{
 		AROController: base.AROController{
-			Log:    log.WithField("controller", controllerName),
-			Client: client,
-			Name:   controllerName,
+			Log:         log.WithField("controller", controllerName),
+			Client:      client,
+			Name:        controllerName,
+			EnabledFlag: controllerEnabled,
 		},
 	}
 }
@@ -47,7 +48,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.OperatorFlags.GetSimpleBoolean(controllerEnabled) {
+	if !instance.Spec.OperatorFlags.GetSimpleBoolean(r.EnabledFlag) {
 		r.Log.Debug("controller is disabled")
 		return reconcile.Result{}, nil
 	}

diff --git a/pkg/operator/controllers/monitoring/monitoring_controller.go b/pkg/operator/controllers/monitoring/monitoring_controller.go
@@ -63,9 +63,10 @@ type MonitoringReconciler struct {
 func NewReconciler(log *logrus.Entry, client client.Client) *MonitoringReconciler {
 	return &MonitoringReconciler{
 		AROController: base.AROController{
-			Log:    log.WithField("controller", controllerName),
-			Client: client,
-			Name:   controllerName,
+			Log:         log.WithField("controller", controllerName),
+			Client:      client,
+			Name:        controllerName,
+			EnabledFlag: controllerEnabled,
 		},
 		jsonHandle: new(codec.JsonHandle),
 	}
@@ -77,7 +78,7 @@ func (r *MonitoringReconciler) Reconcile(ctx context.Context, request ctrl.Reque
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.OperatorFlags.GetSimpleBoolean(controllerEnabled) {
+	if !instance.Spec.OperatorFlags.GetSimpleBoolean(r.EnabledFlag) {
 		r.Log.Debug("controller is disabled")
 		return reconcile.Result{}, nil
 	}

diff --git a/pkg/operator/controllers/node/node_controller.go b/pkg/operator/controllers/node/node_controller.go
@@ -39,9 +39,10 @@ type Reconciler struct {
 func NewReconciler(log *logrus.Entry, client client.Client, kubernetescli kubernetes.Interface) *Reconciler {
 	return &Reconciler{
 		AROController: base.AROController{
-			Log:    log.WithField("controller", controllerName),
-			Client: client,
-			Name:   controllerName,
+			Log:         log.WithField("controller", controllerName),
+			Client:      client,
+			Name:        controllerName,
+			EnabledFlag: controllerEnabled,
 		},
 
 		kubernetescli: kubernetescli,
@@ -54,7 +55,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.OperatorFlags.GetSimpleBoolean(controllerEnabled) {
+	if !instance.Spec.OperatorFlags.GetSimpleBoolean(r.EnabledFlag) {
 		r.Log.Debug("controller is disabled")
 		return reconcile.Result{}, nil
 	}