Merge pull request openstack-k8s-operators#353 from ASBishop/node-selector-hash

Restart services when their NodeSelector changes

Author: openshift-merge-bot[bot]

controllers/cinderapi_controller.go

@@ -706,6 +706,20 @@ func (r *CinderAPIReconciler) reconcileNormal(ctx context.Context, instance *cin
 	// all cert input checks out so report InputReady
 	instance.Status.Conditions.MarkTrue(condition.TLSInputReadyCondition, condition.InputReadyMessage)
 
+	//
+	// Hash the nodeSelector so the pod is recreated when it changes
+	//
+	err = cinder.AddNodeSelectorHash(instance.Spec.NodeSelector, &configVars)
+	if err != nil {
+		instance.Status.Conditions.Set(condition.FalseCondition(
+			condition.ServiceConfigReadyCondition,
+			condition.ErrorReason,
+			condition.SeverityWarning,
+			condition.ServiceConfigReadyErrorMessage,
+			err.Error()))
+		return ctrl.Result{}, err
+	}
+
 	//
 	// Create secrets required as input for the Service and calculate an overall hash of hashes
 	//

controllers/cinderbackup_controller.go

@@ -410,6 +410,20 @@ func (r *CinderBackupReconciler) reconcileNormal(ctx context.Context, instance *
 	// all cert input checks out so report InputReady
 	instance.Status.Conditions.MarkTrue(condition.TLSInputReadyCondition, condition.InputReadyMessage)
 
+	//
+	// Hash the nodeSelector so the pod is recreated when it changes
+	//
+	err = cinder.AddNodeSelectorHash(instance.Spec.NodeSelector, &configVars)
+	if err != nil {
+		instance.Status.Conditions.Set(condition.FalseCondition(
+			condition.ServiceConfigReadyCondition,
+			condition.ErrorReason,
+			condition.SeverityWarning,
+			condition.ServiceConfigReadyErrorMessage,
+			err.Error()))
+		return ctrl.Result{}, err
+	}
+
 	//
 	// Create secrets required as input for the Service and calculate an overall hash of hashes
 	//

controllers/cinderscheduler_controller.go

@@ -409,6 +409,20 @@ func (r *CinderSchedulerReconciler) reconcileNormal(ctx context.Context, instanc
 	// all cert input checks out so report InputReady
 	instance.Status.Conditions.MarkTrue(condition.TLSInputReadyCondition, condition.InputReadyMessage)
 
+	//
+	// Hash the nodeSelector so the pod is recreated when it changes
+	//
+	err = cinder.AddNodeSelectorHash(instance.Spec.NodeSelector, &configVars)
+	if err != nil {
+		instance.Status.Conditions.Set(condition.FalseCondition(
+			condition.ServiceConfigReadyCondition,
+			condition.ErrorReason,
+			condition.SeverityWarning,
+			condition.ServiceConfigReadyErrorMessage,
+			err.Error()))
+		return ctrl.Result{}, err
+	}
+
 	//
 	// Create ConfigMaps required as input for the Service and calculate an overall hash of hashes
 	//

controllers/cindervolume_controller.go

@@ -434,6 +434,20 @@ func (r *CinderVolumeReconciler) reconcileNormal(ctx context.Context, instance *
 		return ctrl.Result{}, err
 	}
 
+	//
+	// Hash the nodeSelector so the pod is recreated when it changes
+	//
+	err = cinder.AddNodeSelectorHash(instance.Spec.NodeSelector, &configVars)
+	if err != nil {
+		instance.Status.Conditions.Set(condition.FalseCondition(
+			condition.ServiceConfigReadyCondition,
+			condition.ErrorReason,
+			condition.SeverityWarning,
+			condition.ServiceConfigReadyErrorMessage,
+			err.Error()))
+		return ctrl.Result{}, err
+	}
+
 	//
 	// create hash over all the different input resources to identify if any those changed
 	// and a restart/recreate is required.

pkg/cinder/funcs.go

@@ -3,6 +3,8 @@ package cinder
 import (
 	common "github.com/openstack-k8s-operators/lib-common/modules/common"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/affinity"
+	"github.com/openstack-k8s-operators/lib-common/modules/common/env"
+	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -47,3 +49,12 @@ func GetPodAffinity(componentName string) *corev1.Affinity {
 		corev1.LabelHostname,
 	)
 }
+
+// AddNodeSelectorHash - Adds a hash of a nodeSelector map to the envVars.
+func AddNodeSelectorHash(nodeSelector map[string]string, envVars *map[string]env.Setter) error {
+	hash, err := util.ObjectHash(nodeSelector)
+	if err != nil {
+		(*envVars)["NodeSelectorHash"] = env.SetValue(hash)
+	}
+	return err
+}