Added tolerations to the constellation and constellation messaging charts

charts/backingservices/charts/constellation-messaging/README.md

@@ -20,6 +20,7 @@ Complete information on the design of the service including architecture, scalab
 | `deployment.labels`                               | Provide custom labels for the deployment as metadata to be consumed by other tools and libraries.                                                                                                                                                                                                               |
 | `imagePullSecretNames`                            | Deprected, use `docker.imagePullSecretNames`. List pre-existing secrets to be used for pulling docker images.                                                                                                                                                                                                                                                                                                           |
 | `affinity`                            | Define pod affinity so that it is restricted to run on particular node(s), or to prefer to run on particular nodes.                                                                                                                                                                                                                                       |
+| `tolerations`                            | Define pod tolerations so that it is allowed to run on node(s) with particular taints.                                                                                                                                                                                                                                       |
 | `docker.imagePullSecretNames`                            | List pre-existing secrets to be used for pulling docker images.                                                                                                                                                                                                                                                                                                           |
 | `docker.registry.url`                        | Specify the image registry url.                                                                                                                                                                                                                                                                                          |
 | `docker.registry.username`                        | Specify the username for the docker registry.                                                                                                                                                                                                                                                                                          |

charts/backingservices/charts/constellation-messaging/templates/_supplemental.tpl

@@ -5,6 +5,7 @@ deploymentName
 tlssecretsnippet
 backingservices.gke.backendConfig
 podAffinity
+tolerations
 are copied from backingservices/templates/_supplemental.tpl because helm lint requires
 charts to render standalone. See: https://github.com/helm/helm/issues/11260 for more details.
 */}}
@@ -63,4 +64,11 @@ spec:
 affinity:
 {{- toYaml .affinity | nindent 2 }}
 {{- end }}
+{{ end }}
+
+{{- define "tolerations" }}
+{{- if .tolerations }}
+tolerations:
+{{- toYaml .tolerations | nindent 2 }}
+{{- end }}
 {{ end }}

charts/backingservices/charts/constellation-messaging/templates/messaging-deployment.yaml

@@ -71,4 +71,5 @@ spec:
         ports:
         - containerPort: {{ $srvTargetPort }}
 {{- include "podAffinity" .Values | indent 6 }}
+{{- include "tolerations" .Values | indent 6 }}
 {{ end }}

charts/backingservices/charts/constellation/README.md

@@ -67,6 +67,9 @@ The values.yaml file provides configuration options to define the values for the
 | `docker.messaging.imagePullPolicy`                        | Specify the image pull policy configurations for the image.                                                                                                                                                                                                                                                                                          |
 | `affinity`                        | Specify the pod affinity so that pods are restricted to run on particular node(s), or to prefer to run on particular nodes.    
                                                                                                                                                                                                                                                                                           |
+| `tolerations`                        | Specify pod tolerations so that it is allowed to run on node(s) with particular taints.    
+                                                                                                                                                                                                                                                                                          |
+
 
 Example:
 

charts/backingservices/charts/constellation/templates/_supplemental.tpl

@@ -5,6 +5,7 @@ deploymentName
 tlssecretsnippet
 backingservices.gke.backendConfig
 podAffinity
+tolerations
 are copied from backingservices/templates/_supplemental.tpl because helm lint requires
 charts to render standalone. See: https://github.com/helm/helm/issues/11260 for more details.
 */}}
@@ -63,4 +64,11 @@ spec:
 affinity:
 {{- toYaml .affinity | nindent 2 }}
 {{- end }}
+{{ end }}
+
+{{- define "tolerations" }}
+{{- if .tolerations }}
+tolerations:
+{{- toYaml .tolerations | nindent 2 }}
+{{- end }}
 {{ end }}

charts/backingservices/charts/constellation/templates/clln-deployment.yaml

@@ -82,4 +82,5 @@ spec:
         ports:
         - containerPort: {{ .Values.service.targetPort }}
 {{- include "podAffinity" .Values | indent 6 }}
+{{- include "tolerations" .Values | indent 6 }}
 {{ end }}

charts/backingservices/templates/_supplemental.tpl

@@ -5,6 +5,7 @@ deploymentName
 tlssecretsnippet
 backingservices.gke.backendConfig
 podAffinity
+tolerations
 are copied from backingservices/templates/_supplemental.tpl because helm lint requires
 charts to render standalone. See: https://github.com/helm/helm/issues/11260 for more details.
 */}}
@@ -63,4 +64,11 @@ spec:
 affinity:
 {{- toYaml .affinity | nindent 2 }}
 {{- end }}
+{{ end }}
+
+{{- define "tolerations" }}
+{{- if .tolerations }}
+tolerations:
+{{- toYaml .tolerations | nindent 2 }}
+{{- end }}
 {{ end }}

terratest/src/test/backingservices/constellation-messaging-deployment_test.go

@@ -32,4 +32,33 @@ func TestConstellationMessagingDeploymentWithAffinity(t *testing.T) {
 	require.Equal(t, "kubernetes.io/os", deploymentAffinity.NodeSelectorTerms[0].MatchExpressions[0].Key)
 	require.Equal(t, "In", string(deploymentAffinity.NodeSelectorTerms[0].MatchExpressions[0].Operator))
 	require.Equal(t, "linux", deploymentAffinity.NodeSelectorTerms[0].MatchExpressions[0].Values[0])
+	require.Empty(t, cllnMessagingDeploymentObj.Spec.Template.Spec.Tolerations)
+}
+
+func TestConstellationMessagingDeploymentWithTolerations(t *testing.T) {
+
+	helmChartParser := NewHelmConfigParser(
+		NewHelmTestFromTemplate(t, helmChartRelativePath, map[string]string{
+			"constellation-messaging.enabled":                 "true",
+			"constellation-messaging.name":                    "constellation-messaging",
+			"constellation-messaging.tolerations[0].key":      "key1",
+			"constellation-messaging.tolerations[0].value":    "value1",
+			"constellation-messaging.tolerations[0].operator": "Equal",
+			"constellation-messaging.tolerations[0].effect":   "NotSchedule",
+		},
+			[]string{"charts/constellation-messaging/templates/messaging-deployment.yaml"}),
+	)
+
+	var cllnMessagingDeploymentObj appsv1.Deployment
+	helmChartParser.getResourceYAML(SearchResourceOption{
+		Name: "constellation-messaging",
+		Kind: "Deployment",
+	}, &cllnMessagingDeploymentObj)
+
+	deploymentTolerations := cllnMessagingDeploymentObj.Spec.Template.Spec.Tolerations
+	require.Equal(t, "key1", deploymentTolerations[0].Key)
+	require.Equal(t, "value1", deploymentTolerations[0].Value)
+	require.Equal(t, "Equal", string(deploymentTolerations[0].Operator))
+	require.Equal(t, "NotSchedule", string(deploymentTolerations[0].Effect))
+	require.Empty(t, cllnMessagingDeploymentObj.Spec.Template.Spec.Affinity)
 }

terratest/src/test/backingservices/constellation-static-depoyment_test.go

@@ -31,4 +31,32 @@ func TestConstellationStaticDeploymentWithAffinity(t *testing.T) {
 	require.Equal(t, "kubernetes.io/os", deploymentAffinity.NodeSelectorTerms[0].MatchExpressions[0].Key)
 	require.Equal(t, "In", string(deploymentAffinity.NodeSelectorTerms[0].MatchExpressions[0].Operator))
 	require.Equal(t, "linux", deploymentAffinity.NodeSelectorTerms[0].MatchExpressions[0].Values[0])
+	require.Empty(t, cllnDeploymentObj.Spec.Template.Spec.Tolerations)
+}
+
+func TestConstellationStaticDeploymentWithTolerations(t *testing.T) {
+
+	helmChartParser := NewHelmConfigParser(
+		NewHelmTestFromTemplate(t, helmChartRelativePath, map[string]string{
+			"constellation.enabled":                 "true",
+			"constellation.tolerations[0].key":      "key1",
+			"constellation.tolerations[0].value":    "value1",
+			"constellation.tolerations[0].operator": "Equal",
+			"constellation.tolerations[0].effect":   "NotSchedule",
+		},
+			[]string{"charts/constellation/templates/clln-deployment.yaml"}),
+	)
+
+	var cllnDeploymentObj appsv1.Deployment
+	helmChartParser.getResourceYAML(SearchResourceOption{
+		Name: "constellation",
+		Kind: "Deployment",
+	}, &cllnDeploymentObj)
+
+	deploymentTolerations := cllnDeploymentObj.Spec.Template.Spec.Tolerations
+	require.Equal(t, "key1", deploymentTolerations[0].Key)
+	require.Equal(t, "value1", deploymentTolerations[0].Value)
+	require.Equal(t, "Equal", string(deploymentTolerations[0].Operator))
+	require.Equal(t, "NotSchedule", string(deploymentTolerations[0].Effect))
+	require.Empty(t, cllnDeploymentObj.Spec.Template.Spec.Affinity)
 }