Add support for deployment labels (temporalio#581)

* feat: add support for defining deployment labels --------- Co-authored-by: Rob Holland <[email protected]>
asproul · Dec 16, 2024 · d1a39d2 · d1a39d2
1 parent f7e3f68
commit d1a39d2
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 3 deletions.
diff --git a/charts/temporal/templates/_helpers.tpl b/charts/temporal/templates/_helpers.tpl
@@ -132,7 +132,7 @@ app.kubernetes.io/part-of: {{ $global.Chart.Name }}
 {{- end -}}
 {{- end -}}
 {{- range $label_name, $label_value := $global.Values.additionalLabels }}
-{{ $label_name }}: {{ $label_value | quote }}
+{{ $label_name }}: {{ $label_value }}
 {{- end -}}
 {{- end -}}
 

diff --git a/charts/temporal/templates/admintools-deployment.yaml b/charts/temporal/templates/admintools-deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     {{- include "temporal.resourceAnnotations" (list $ "admintools" "deployment") | nindent 4 }}
   labels:
-    {{- include "temporal.resourceLabels" (list $ "admintools" "") | nindent 4 }}
+    {{- include "temporal.resourceLabels" (list $ "admintools" "deployment") | nindent 4 }}
 spec:
   replicas: 1
   selector:

diff --git a/charts/temporal/templates/web-deployment.yaml b/charts/temporal/templates/web-deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     {{- include "temporal.resourceAnnotations" (list $ "web" "deployment") | nindent 4 }}
   labels:
-    {{- include "temporal.resourceLabels" (list $ "web" "") | nindent 4 }}
+    {{- include "temporal.resourceLabels" (list $ "web" "deployment") | nindent 4 }}
 spec:
   replicas: {{ .Values.web.replicaCount }}
   selector:

diff --git a/charts/temporal/tests/deployment_test.go b/charts/temporal/tests/deployment_test.go
@@ -138,3 +138,37 @@ func TestTemplateServerDeploymentAnnotations(t *testing.T) {
 	require.Equal(t, "zero", deployment.ObjectMeta.Annotations["zero"])
 	require.Equal(t, "zero", deployment.Spec.Template.ObjectMeta.Annotations["zero"])
 }
+
+func TestTemplateServerDeploymentLabels(t *testing.T) {
+	// t.Parallel()
+
+	helmChartPath, err := filepath.Abs("../")
+	releaseName := "temporal"
+	require.NoError(t, err)
+
+	namespaceName := "temporal-" + strings.ToLower(random.UniqueId())
+
+	var deployment appsv1.Deployment
+
+	options := &helm.Options{
+		SetValues: map[string]string{
+			"server.frontend.deploymentLabels.one":  "three",
+			"server.frontend.deploymentLabels.four": "four",
+			"server.deploymentLabels.one":           "one",
+			"server.deploymentLabels.two":           "two",
+			"additionalLabels.zero":                 "zero",
+		},
+		KubectlOptions:    k8s.NewKubectlOptions("", "", namespaceName),
+		BuildDependencies: true,
+	}
+
+	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/server-deployment.yaml"})
+
+	helm.UnmarshalK8SYaml(t, output, &deployment)
+
+	require.Equal(t, "three", deployment.ObjectMeta.Labels["one"])
+	require.Equal(t, "two", deployment.ObjectMeta.Labels["two"])
+	require.Equal(t, "four", deployment.ObjectMeta.Labels["four"])
+	require.Equal(t, "zero", deployment.ObjectMeta.Labels["zero"])
+	require.Equal(t, "zero", deployment.Spec.Template.ObjectMeta.Labels["zero"])
+}
diff --git a/charts/temporal/values.yaml b/charts/temporal/values.yaml
@@ -64,6 +64,7 @@ server:
       #   targetLabel: __name__
     prometheus:
       timerType: histogram
+  deploymentLabels: {}
   deploymentAnnotations: {}
   podAnnotations: {}
   podLabels: {}
@@ -232,6 +233,7 @@ server:
       # enabled: false
       prometheus: {}
       # timerType: histogram
+    deploymentLabels: {}
     deploymentAnnotations: {}
     podAnnotations: {}
     podLabels: {}
@@ -255,6 +257,7 @@ server:
       # enabled: false
       prometheus: {}
       # timerType: histogram
+    deploymentLabels: {}
     deploymentAnnotations: {}
     podAnnotations: {}
     podLabels: {}
@@ -279,6 +282,7 @@ server:
       # enabled: false
       prometheus: {}
       # timerType: histogram
+    deploymentLabels: {}
     deploymentAnnotations: {}
     podAnnotations: {}
     podLabels: {}
@@ -302,6 +306,7 @@ server:
       # enabled: false
       prometheus: {}
       # timerType: histogram
+    deploymentLabels: {}
     deploymentAnnotations: {}
     podAnnotations: {}
     podLabels: {}
@@ -323,6 +328,7 @@ admintools:
     type: ClusterIP
     port: 22
     annotations: {}
+  deploymentLabels: {}
   deploymentAnnotations: {}
   podLabels: {}
   podAnnotations: {}
@@ -367,6 +373,7 @@ web:
     #  - secretName: chart-example-tls
     #    hosts:
     #      - chart-example.local
+  deploymentLabels: {}
   deploymentAnnotations: {}
   podAnnotations: {}
   podLabels: {}