Merge pull request #257 from omersch381/unbound_to_statefulset

Change Unbound deployment type to StatefulSet

Author: openshift-merge-bot[bot]

controllers/designate_controller.go

@@ -1070,7 +1070,7 @@ func (r *DesignateReconciler) reconcileNormal(ctx context.Context, instance *des
 	Log.Info("Deployment Backendbind9 task reconciled")
 
 	// deploy the unbound reconcilier if necessary
-	designateUnbound, op, err := r.unboundDeploymentCreateOrUpdate(ctx, instance)
+	designateUnbound, op, err := r.unboundStatefulSetCreateOrUpdate(ctx, instance)
 	if err != nil {
 		instance.Status.Conditions.Set(condition.FalseCondition(
 			designatev1beta1.DesignateUnboundReadyCondition,
@@ -1679,11 +1679,11 @@ func (r *DesignateReconciler) backendbind9StatefulSetCreateOrUpdate(ctx context.
 	return statefulSet, op, err
 }
 
-func (r *DesignateReconciler) unboundDeploymentCreateOrUpdate(
+func (r *DesignateReconciler) unboundStatefulSetCreateOrUpdate(
 	ctx context.Context,
 	instance *designatev1beta1.Designate,
 ) (*designatev1beta1.DesignateUnbound, controllerutil.OperationResult, error) {
-	deployment := &designatev1beta1.DesignateUnbound{
+	statefulSet := &designatev1beta1.DesignateUnbound{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      fmt.Sprintf("%s-unbound", instance.Name),
 			Namespace: instance.Namespace,
@@ -1694,22 +1694,22 @@ func (r *DesignateReconciler) unboundDeploymentCreateOrUpdate(
 		instance.Spec.DesignateUnbound.NodeSelector = instance.Spec.NodeSelector
 	}
 
-	op, err := controllerutil.CreateOrUpdate(ctx, r.Client, deployment, func() error {
-		deployment.Spec = instance.Spec.DesignateUnbound
+	op, err := controllerutil.CreateOrUpdate(ctx, r.Client, statefulSet, func() error {
+		statefulSet.Spec = instance.Spec.DesignateUnbound
 		// Add in transfers from umbrella Designate CR (this instance) spec
 		// TODO: Add logic to determine when to set/overwrite, etc
-		deployment.Spec.ServiceAccount = instance.RbacResourceName()
-		deployment.Spec.NodeSelector = instance.Spec.DesignateUnbound.NodeSelector
+		statefulSet.Spec.ServiceAccount = instance.RbacResourceName()
+		statefulSet.Spec.NodeSelector = instance.Spec.DesignateUnbound.NodeSelector
 
-		err := controllerutil.SetControllerReference(instance, deployment, r.Scheme)
+		err := controllerutil.SetControllerReference(instance, statefulSet, r.Scheme)
 		if err != nil {
 			return err
 		}
 
 		return nil
 	})
 
-	return deployment, op, err
+	return statefulSet, op, err
 }
 
 // checkDesignateAPIGeneration -

controllers/designateunbound_controller.go

@@ -36,13 +36,13 @@ import (
 
 	"github.com/openstack-k8s-operators/lib-common/modules/common"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/condition"
-	"github.com/openstack-k8s-operators/lib-common/modules/common/deployment"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/env"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/helper"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/labels"
 	nad "github.com/openstack-k8s-operators/lib-common/modules/common/networkattachment"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/secret"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
+	"github.com/openstack-k8s-operators/lib-common/modules/common/statefulset"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 )
 
@@ -154,7 +154,7 @@ func (r *UnboundReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&corev1.Service{}).
 		Owns(&corev1.Secret{}).
 		Owns(&corev1.ConfigMap{}).
-		Owns(&appsv1.Deployment{}).
+		Owns(&appsv1.StatefulSet{}).
 		Complete(r)
 }
 
@@ -317,14 +317,16 @@ func (r *UnboundReconciler) reconcileNormal(ctx context.Context, instance *desig
 		return ctrlResult, nil
 	}
 
-	depl := deployment.NewDeployment(
-		designateunbound.Deployment(instance, inputHash, serviceLabels, serviceAnnotations),
+	// Define a new Unbound StatefulSet object
+	statefulSetDef := designateunbound.StatefulSet(instance, inputHash, serviceLabels, serviceAnnotations)
+	statefulSet := statefulset.NewStatefulSet(
+		statefulSetDef,
 		time.Duration(5)*time.Second,
 	)
 
 	r.Log.Info("deploying the unbound pod")
 
-	ctrlResult, err = depl.CreateOrPatch(ctx, helper)
+	ctrlResult, err = statefulSet.CreateOrPatch(ctx, helper)
 	if err != nil {
 		instance.Status.Conditions.Set(condition.FalseCondition(
 			condition.DeploymentReadyCondition,
@@ -342,8 +344,8 @@ func (r *UnboundReconciler) reconcileNormal(ctx context.Context, instance *desig
 		return ctrlResult, nil
 	}
 
-	if depl.GetDeployment().Generation == depl.GetDeployment().Status.ObservedGeneration {
-		instance.Status.ReadyCount = depl.GetDeployment().Status.ReadyReplicas
+	if statefulSet.GetStatefulSet().Generation == statefulSet.GetStatefulSet().Status.ObservedGeneration {
+		instance.Status.ReadyCount = statefulSet.GetStatefulSet().Status.ReadyReplicas
 
 		r.Log.Info("verifying network attachments")
 		// verify if network attachment matches expectations
@@ -382,7 +384,7 @@ func (r *UnboundReconciler) reconcileNormal(ctx context.Context, instance *desig
 			instance.Status.Conditions.MarkTrue(condition.DeploymentReadyCondition, condition.DeploymentReadyMessage)
 		}
 	}
-	// create Deployment - end
+	// create StatefulSet - end
 
 	// We reached the end of the Reconcile, update the Ready condition based on
 	// the sub conditions

pkg/designateunbound/deployment.go renamed to pkg/designateunbound/statefulset.go

@@ -32,12 +32,12 @@ const (
 	configVolume = "designateunbound-config"
 )
 
-// Deployment func
-func Deployment(instance *designatev1beta1.DesignateUnbound,
+// StatefulSet func
+func StatefulSet(instance *designatev1beta1.DesignateUnbound,
 	configHash string,
 	labels map[string]string,
 	annotations map[string]string,
-) *appsv1.Deployment {
+) *appsv1.StatefulSet {
 	var configMode int32 = 0640
 
 	volumes := []corev1.Volume{
@@ -63,7 +63,7 @@ func Deployment(instance *designatev1beta1.DesignateUnbound,
 		// TODO might need tuning
 		TimeoutSeconds:      15,
 		PeriodSeconds:       13,
-		InitialDelaySeconds: 10,
+		InitialDelaySeconds: 15,
 	}
 	readinessProbe := &corev1.Probe{
 		// TODO might need tuning
@@ -92,12 +92,12 @@ func Deployment(instance *designatev1beta1.DesignateUnbound,
 	envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS")
 	envVars["CONFIG_HASH"] = env.SetValue(configHash)
 
-	deployment := &appsv1.Deployment{
+	statefulSet := &appsv1.StatefulSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      instance.Name,
 			Namespace: instance.Namespace,
 		},
-		Spec: appsv1.DeploymentSpec{
+		Spec: appsv1.StatefulSetSpec{
 			Replicas: instance.Spec.Replicas,
 			Selector: &metav1.LabelSelector{
 				MatchLabels: labels,
@@ -139,16 +139,16 @@ func Deployment(instance *designatev1beta1.DesignateUnbound,
 	// If possible two pods of the same service should not
 	// run on the same worker node. If this is not possible
 	// the get still created on the same worker node.
-	deployment.Spec.Template.Spec.Affinity = affinity.DistributePods(
+	statefulSet.Spec.Template.Spec.Affinity = affinity.DistributePods(
 		common.AppSelector,
 		[]string{
 			designate.ServiceName,
 		},
 		corev1.LabelHostname,
 	)
 	if instance.Spec.NodeSelector != nil {
-		deployment.Spec.Template.Spec.NodeSelector = *instance.Spec.NodeSelector
+		statefulSet.Spec.Template.Spec.NodeSelector = *instance.Spec.NodeSelector
 	}
 
-	return deployment
+	return statefulSet
 }