Make additional pvc labels consistent to additional labels of other resources, adds test (#423)

Author: bashofmann

charts/qdrant/templates/statefulset.yaml

@@ -260,7 +260,7 @@ spec:
         name: {{ .Values.persistence.storageVolumeName | default "qdrant-storage" }}
         labels:
           app: {{ template "qdrant.name" . }}
-          {{- with .Values.persistence.labels }}
+          {{- with .Values.persistence.additionalLabels }}
           {{- toYaml . | nindent 10 }}
           {{- end }}
         {{- with .Values.persistence.annotations }}
@@ -284,7 +284,7 @@ spec:
         name: {{ .Values.snapshotPersistence.snapshotsVolumeName | default "qdrant-snapshots" }}
         labels:
           app: {{ template "qdrant.name" . }}
-          {{- with .Values.snapshotPersistence.labels }}
+          {{- with .Values.snapshotPersistence.additionalLabels }}
           {{- toYaml . | nindent 10 }}
           {{- end }}
         {{- with .Values.snapshotPersistence.annotations }}

charts/qdrant/values.yaml

@@ -145,7 +145,7 @@ persistence:
   accessModes: ["ReadWriteOnce"]
   size: 10Gi
   annotations: {}
-  labels: {}
+  additionalLabels: {}
   # storageVolumeName: qdrant-storage
   # storageSubPath: ""
   # storageClassName: local-path
@@ -159,7 +159,7 @@ snapshotPersistence:
   accessModes: ["ReadWriteOnce"]
   size: 10Gi
   annotations: {}
-  labels: {}
+  additionalLabels: {}
   # snapshotsVolumeName: qdrant-snapshots
   # snapshotsSubPath: ""
   # You can change the storageClassName to ensure snapshots are saved to cold storage.

test/qdrant_additional_labels_test.go

@@ -152,3 +152,33 @@ func TestAdditionalLabelsAreSetOnIngress(t *testing.T) {
 	require.Contains(t, ingress.Labels, "test")
 	require.Equal(t, "ingressAdditionalLabels", ingress.Labels["test"])
 }
+
+func TestAdditionalLabelsAreSetOnPvcs(t *testing.T) {
+	t.Parallel()
+
+	helmChartPath, err := filepath.Abs("../charts/qdrant")
+	releaseName := "qdrant"
+	require.NoError(t, err)
+
+	namespaceName := "qdrant-" + strings.ToLower(random.UniqueId())
+	logger.Log(t, "Namespace: %s\n", namespaceName)
+
+	options := &helm.Options{
+		SetJsonValues: map[string]string{
+			"persistence.additionalLabels":         `{"test": "additionalPersistenceLabel"}`,
+			"snapshotPersistence.enabled":          `true`,
+			"snapshotPersistence.additionalLabels": `{"test": "additionalSnapshotPersistenceLabel"}`,
+		},
+		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
+	}
+
+	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/statefulset.yaml"})
+
+	var sts appsv1.StatefulSet
+	helm.UnmarshalK8SYaml(t, output, &sts)
+
+	require.Contains(t, sts.Spec.VolumeClaimTemplates[0].Labels, "test")
+	require.Equal(t, "additionalPersistenceLabel", sts.Spec.VolumeClaimTemplates[0].Labels["test"])
+	require.Contains(t, sts.Spec.VolumeClaimTemplates[1].Labels, "test")
+	require.Equal(t, "additionalSnapshotPersistenceLabel", sts.Spec.VolumeClaimTemplates[1].Labels["test"])
+}