Merge pull request #1653 from dannyzaken/danny-fixes

Added TopologyKey to noobaa CRD for multizone support

Author: dannyzaken

deploy/crds/noobaa.io_noobaas.yaml

@@ -984,6 +984,11 @@ spec:
                         type: array
                         x-kubernetes-list-type: atomic
                     type: object
+                  topologyKey:
+                    description: |-
+                      TopologyKey (optional) the TopologyKey to pass as the domain for TopologySpreadConstraint and Affinity of noobaa components
+                      It is used by the endpoints and the DB pods to control pods distribution between topology domains (host/zone)
+                    type: string
                 type: object
               annotations:
                 additionalProperties:

pkg/apis/noobaa/v1alpha1/noobaa_types.go

@@ -157,7 +157,7 @@ type NooBaaSpec struct {
 
 	// Affinity (optional) passed through to noobaa's pods
 	// +optional
-	Affinity *corev1.Affinity `json:"affinity,omitempty"`
+	Affinity *AffinitySpec `json:"affinity,omitempty"`
 
 	// ImagePullSecret (optional) sets a pull secret for the system image
 	// +optional
@@ -242,6 +242,24 @@ type NooBaaSpec struct {
 	BucketNotifications BucketNotificationsSpec `json:"bucketNotifications,omitempty"`
 }
 
+// Affinity is a group of affinity scheduling rules.
+type AffinitySpec struct {
+	// Describes node affinity scheduling rules for the pod.
+	// +optional
+	NodeAffinity *corev1.NodeAffinity `json:"nodeAffinity,omitempty" protobuf:"bytes,1,opt,name=nodeAffinity"`
+	// Describes pod affinity scheduling rules (e.g. co-locate this pod in the same node, zone, etc. as some other pod(s)).
+	// +optional
+	PodAffinity *corev1.PodAffinity `json:"podAffinity,omitempty" protobuf:"bytes,2,opt,name=podAffinity"`
+	// Describes pod anti-affinity scheduling rules (e.g. avoid putting this pod in the same node, zone, etc. as some other pod(s)).
+	// +optional
+	PodAntiAffinity *corev1.PodAntiAffinity `json:"podAntiAffinity,omitempty" protobuf:"bytes,3,opt,name=podAntiAffinity"`
+
+	// TopologyKey (optional) the TopologyKey to pass as the domain for TopologySpreadConstraint and Affinity of noobaa components
+	// It is used by the endpoints and the DB pods to control pods distribution between topology domains (host/zone)
+	// +optional
+	TopologyKey string `json:"topologyKey,omitempty"`
+}
+
 // AutoscalerSpec defines different actoscaling spec such as autoscaler type and prometheus namespace
 type AutoscalerSpec struct {
 	// Type of autoscaling (optional) for noobaa-endpoint, hpav2(default) and keda - Prometheus metrics based
@@ -640,7 +658,7 @@ const (
 	// DeleteOBCConfirmation represents the validation to destry obc
 	DeleteOBCConfirmation CleanupConfirmationProperty = "yes-really-destroy-obc"
 
-	// SkipTopologyConstraints is Annotation name for disabling default topology Constraints
+	// SkipTopologyConstraints is Annotation name for skipping the reconciliation of the default topology Constraints
 	SkipTopologyConstraints = "noobaa.io/skip_topology_spread_constraints"
 
 	// DisableDBDefaultMonitoring is Annotation name for disabling default db monitoring

pkg/apis/noobaa/v1alpha1/zz_generated.deepcopy.go

@@ -1329,7 +1329,11 @@ func (r *Reconciler) updatePodTemplate() error {
 		r.PodAgentTemplate.Spec.Tolerations = r.NooBaa.Spec.Tolerations
 	}
 	if r.NooBaa.Spec.Affinity != nil {
-		r.PodAgentTemplate.Spec.Affinity = r.NooBaa.Spec.Affinity
+		r.PodAgentTemplate.Spec.Affinity = &corev1.Affinity{
+			NodeAffinity:    r.NooBaa.Spec.Affinity.NodeAffinity,
+			PodAffinity:     r.NooBaa.Spec.Affinity.PodAffinity,
+			PodAntiAffinity: r.NooBaa.Spec.Affinity.PodAntiAffinity,
+		}
 	}
 
 	if !util.HasNodeInclusionPolicyInPodTopologySpread() {

pkg/backingstore/reconciler.go

@@ -1423,7 +1423,7 @@ spec:
       status: {}
 `
 
-const Sha256_deploy_crds_noobaa_io_noobaas_yaml = "1637077ca2e0d584cd4203469f809b215af45ee4ba5358a283bbd7a5bf1b573e"
+const Sha256_deploy_crds_noobaa_io_noobaas_yaml = "9aed761f69a7c552dd6c2dfc558fd055d6c236765a0728b9a39abf289827668f"
 
 const File_deploy_crds_noobaa_io_noobaas_yaml = `---
 apiVersion: apiextensions.k8s.io/v1
@@ -2411,6 +2411,11 @@ spec:
                         type: array
                         x-kubernetes-list-type: atomic
                     type: object
+                  topologyKey:
+                    description: |-
+                      TopologyKey (optional) the TopologyKey to pass as the domain for TopologySpreadConstraint and Affinity of noobaa components
+                      It is used by the endpoints and the DB pods to control pods distribution between topology domains (host/zone)
+                    type: string
                 type: object
               annotations:
                 additionalProperties:

pkg/bundle/deploy.go

@@ -248,6 +248,12 @@ func (r *Reconciler) reconcileClusterSpec(dbSpec *nbv1.NooBaaDBSpec) error {
 	// set tolerations and node affinity to the cluster spec
 	if r.NooBaa.Spec.Affinity != nil {
 		r.CNPGCluster.Spec.Affinity.NodeAffinity = r.NooBaa.Spec.Affinity.NodeAffinity
+		if r.NooBaa.Spec.Affinity.TopologyKey != "" {
+			r.CNPGCluster.Spec.Affinity.TopologyKey = r.NooBaa.Spec.Affinity.TopologyKey
+		}
+	} else {
+		r.CNPGCluster.Spec.Affinity.NodeAffinity = nil
+		r.CNPGCluster.Spec.Affinity.TopologyKey = ""
 	}
 	if r.NooBaa.Spec.Tolerations != nil {
 		r.CNPGCluster.Spec.Affinity.Tolerations = r.NooBaa.Spec.Tolerations
@@ -517,6 +523,7 @@ func (r *Reconciler) wasClusterSpecChanged(existingClusterSpec *cnpgv1.ClusterSp
 	return !reflect.DeepEqual(existingClusterSpec.InheritedMetadata, r.CNPGCluster.Spec.InheritedMetadata) ||
 		!reflect.DeepEqual(existingClusterSpec.ImageCatalogRef, r.CNPGCluster.Spec.ImageCatalogRef) ||
 		existingClusterSpec.Instances != r.CNPGCluster.Spec.Instances ||
+		!reflect.DeepEqual(existingClusterSpec.Affinity, r.CNPGCluster.Spec.Affinity) ||
 		!reflect.DeepEqual(existingClusterSpec.Resources, r.CNPGCluster.Spec.Resources) ||
 		!reflect.DeepEqual(existingClusterSpec.StorageConfiguration.StorageClass, r.CNPGCluster.Spec.StorageConfiguration.StorageClass) ||
 		!reflect.DeepEqual(existingClusterSpec.StorageConfiguration.Size, r.CNPGCluster.Spec.StorageConfiguration.Size) ||

pkg/system/db_reconciler.go

@@ -333,7 +333,7 @@ func (r *Reconciler) SetDesiredNooBaaDB() error {
 			[]corev1.LocalObjectReference{*r.NooBaa.Spec.ImagePullSecret}
 	}
 	podSpec.Tolerations = r.NooBaa.Spec.Tolerations
-	podSpec.Affinity = r.NooBaa.Spec.Affinity
+	podSpec.Affinity = r.GetAffinity()
 
 	if NooBaaDB.UID == "" {
 		for i := range NooBaaDB.Spec.VolumeClaimTemplates {
@@ -704,7 +704,7 @@ func (r *Reconciler) SetDesiredCoreApp() error {
 			[]corev1.LocalObjectReference{*r.NooBaa.Spec.ImagePullSecret}
 	}
 	podSpec.Tolerations = r.NooBaa.Spec.Tolerations
-	podSpec.Affinity = r.NooBaa.Spec.Affinity
+	podSpec.Affinity = r.GetAffinity()
 
 	if r.CoreApp.UID == "" {
 		// generate info event for the first creation of noobaa