adding topology spread constraints to Grafana CR

grafana · Oct 22, 2022 · 3bf0868 · 3bf0868
1 parent 955daa6
commit 3bf0868
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 9 deletions.
diff --git a/api/integreatly/v1alpha1/grafana_types.go b/api/integreatly/v1alpha1/grafana_types.go
@@ -107,15 +107,16 @@ type GrafanaDeployment struct {
 	Annotations map[string]string `json:"annotations,omitempty"`
 	Labels      map[string]string `json:"labels,omitempty"`
 	// +nullable
-	Replicas                      *int32                 `json:"replicas,omitempty"`
-	NodeSelector                  map[string]string      `json:"nodeSelector,omitempty"`
-	Tolerations                   []v1.Toleration        `json:"tolerations,omitempty"`
-	Affinity                      *v1.Affinity           `json:"affinity,omitempty"`
-	SecurityContext               *v1.PodSecurityContext `json:"securityContext,omitempty"`
-	ContainerSecurityContext      *v1.SecurityContext    `json:"containerSecurityContext,omitempty"`
-	TerminationGracePeriodSeconds *int64                 `json:"terminationGracePeriodSeconds,omitempty"`
-	EnvFrom                       []v1.EnvFromSource     `json:"envFrom,omitempty"`
-	Env                           []v1.EnvVar            `json:"env,omitempty"`
+	Replicas                      *int32                        `json:"replicas,omitempty"`
+	NodeSelector                  map[string]string             `json:"nodeSelector,omitempty"`
+	Tolerations                   []v1.Toleration               `json:"tolerations,omitempty"`
+	Affinity                      *v1.Affinity                  `json:"affinity,omitempty"`
+	TopologySpreadConstraints     []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
+	SecurityContext               *v1.PodSecurityContext        `json:"securityContext,omitempty"`
+	ContainerSecurityContext      *v1.SecurityContext           `json:"containerSecurityContext,omitempty"`
+	TerminationGracePeriodSeconds *int64                        `json:"terminationGracePeriodSeconds,omitempty"`
+	EnvFrom                       []v1.EnvFromSource            `json:"envFrom,omitempty"`
+	Env                           []v1.EnvVar                   `json:"env,omitempty"`
 	// +nullable
 	SkipCreateAdminAccount *bool  `json:"skipCreateAdminAccount,omitempty"`
 	PriorityClassName      string `json:"priorityClassName,omitempty"`

diff --git a/controllers/model/grafanaDeployment.go b/controllers/model/grafanaDeployment.go
@@ -195,6 +195,13 @@ func getPodPriorityClassName(cr *v1alpha1.Grafana) string {
 	return ""
 }
 
+func getTopologySpreadConstraints(cr *v1alpha1.Grafana) []v13.TopologySpreadConstraint {
+	if cr.Spec.Deployment != nil && cr.Spec.Deployment.TopologySpreadConstraints != nil {
+		return cr.Spec.Deployment.TopologySpreadConstraints
+	}
+	return []v13.TopologySpreadConstraint{}
+}
+
 func getTolerations(cr *v1alpha1.Grafana) []v13.Toleration {
 	tolerations := []v13.Toleration{}
 
@@ -700,6 +707,7 @@ func getDeploymentSpec(cr *v1alpha1.Grafana, annotations map[string]string, conf
 				ServiceAccountName:            constants.GrafanaServiceAccountName,
 				TerminationGracePeriodSeconds: getTerminationGracePeriod(cr),
 				PriorityClassName:             getPodPriorityClassName(cr),
+				TopologySpreadConstraints:     getTopologySpreadConstraints(cr),
 			},
 		},
 		Strategy: getDeploymentStrategy(cr),

diff --git a/controllers/model/grafanaDeployment_test.go b/controllers/model/grafanaDeployment_test.go
@@ -202,3 +202,56 @@ func Test_getReadinessProbe(t *testing.T) {
 		assert.Equal(t, want, got)
 	})
 }
+
+func Test_getTopologySpreadConstraints(t *testing.T) {
+	t.Run("Default empty topology constraints", func(t *testing.T) {
+		cr := &v1alpha1.Grafana{
+			Spec: v1alpha1.GrafanaSpec{},
+		}
+
+		got := getTopologySpreadConstraints(cr)
+		want := []v1.TopologySpreadConstraint{}
+
+		assert.Equal(t, want, got)
+	})
+
+	t.Run("Specified empty constraints", func(t *testing.T) {
+		cr := &v1alpha1.Grafana{
+			Spec: v1alpha1.GrafanaSpec{
+				Deployment: &v1alpha1.GrafanaDeployment{
+					TopologySpreadConstraints: []v1.TopologySpreadConstraint{},
+				},
+			},
+		}
+
+		got := getTopologySpreadConstraints(cr)
+		want := []v1.TopologySpreadConstraint{}
+
+		assert.Equal(t, want, got)
+	})
+
+	t.Run("Specified non-empty constraints", func(t *testing.T) {
+		cr := &v1alpha1.Grafana{
+			Spec: v1alpha1.GrafanaSpec{
+				Deployment: &v1alpha1.GrafanaDeployment{
+					TopologySpreadConstraints: []v1.TopologySpreadConstraint{
+						{
+							MaxSkew:     1,
+							TopologyKey: "topology.kubernetes.io/zone",
+						},
+					},
+				},
+			},
+		}
+
+		got := getTopologySpreadConstraints(cr)
+		want := []v1.TopologySpreadConstraint{
+			{
+				MaxSkew:     1,
+				TopologyKey: "topology.kubernetes.io/zone",
+			},
+		}
+
+		assert.Equal(t, want, got)
+	})
+}