feat: add standard labels to chart resources to facilitate log querying

k8s/charts/deluge/templates/_helpers.tpl

@@ -1,3 +1,7 @@
+{{/*
+Expand the name of the chart.
+*/}}
+
 {{- define "filesize.bytes" }}
 {{- $sizeNum := regexFind "\\d+" .Values.experiment.fileSize | int -}}
 {{- $sizeUnit := regexFind "\\D+" .Values.experiment.fileSize -}}
@@ -16,4 +20,29 @@
 
 {{- define "tracker.service.name" }}
 {{- printf "bittorrent-tracker-%s" .Release.Name -}}
-{{- end -}}
+{{- end -}}
+
+{{/*
+Common and selector labels.
+*/}}
+{{- define "deluge-benchmarks.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{- define "app.name" -}}
+{{- default "codex-benchmarks" .Values.deployment.appName | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{- define "deluge-benchmarks.labels" -}}
+helm.sh/chart: {{ include "deluge-benchmarks.chart" . }}
+{{ include "deluge-benchmarks.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{- define "deluge-benchmarks.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "app.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}

k8s/charts/deluge/templates/deluge-pvc.yaml

@@ -3,6 +3,8 @@ kind: PersistentVolumeClaim
 metadata:
   name: {{ include "deluge.pvc" . }}
   namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "deluge-benchmarks.labels" . | nindent 4 }}
 
 spec:
   accessModes:

k8s/charts/deluge/templates/deluge-service.yaml

@@ -5,6 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: deluge-nodes-{{ .Release.Name }}
+    {{- include "deluge-benchmarks.labels" . | nindent 4 }}
 spec:
   clusterIP: None
   selector:

k8s/charts/deluge/templates/deluge-statefulset.yaml

@@ -11,11 +11,13 @@ spec:
   selector:
     matchLabels:
       app: deluge-nodes-{{ .Release.Name }}
+      {{- include "deluge-benchmarks.selectorLabels" . | nindent 6 }}
 
   template:
     metadata:
       labels:
         app: deluge-nodes-{{ .Release.Name }}
+        {{- include "deluge-benchmarks.labels" . | nindent 8 }}
 
     spec:
       containers:

k8s/charts/deluge/templates/testrunner-job.yaml

@@ -5,12 +5,14 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: deluge-{{ .Release.Name }}-testrunner
+    {{- include "deluge-benchmarks.labels" . | nindent 4 }}
 
 spec:
   template:
     metadata:
       labels:
         app: deluge-{{ .Release.Name }}-testrunner
+        {{- include "deluge-benchmarks.labels" . | nindent 8 }}
 
     spec:
       containers:

k8s/charts/deluge/templates/tracker-deployment.yaml

@@ -5,17 +5,20 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: bittorrent-tracker-{{ .Release.Name }}
+    {{- include "deluge-benchmarks.labels" . | nindent 4 }}
 
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: bittorrent-tracker-{{ .Release.Name }}
+      {{- include "deluge-benchmarks.selectorLabels" . | nindent 6 }}
 
   template:
     metadata:
       labels:
         app: bittorrent-tracker-{{ .Release.Name }}
+        {{- include "deluge-benchmarks.labels" . | nindent 8 }}
 
     spec:
       containers:

k8s/charts/deluge/templates/tracker-service.yaml

@@ -5,6 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: tracker-{{ .Release.Name }}
+    {{- include "deluge-benchmarks.labels" . | nindent 4 }}
 
 spec:
   type: ClusterIP
@@ -13,4 +14,5 @@ spec:
       targetPort: 8000
       protocol: TCP
   selector:
-    app: bittorrent-tracker-{{ .Release.Name }}
+    app: bittorrent-tracker-{{ .Release.Name }}
+    {{- include "deluge-benchmarks.selectorLabels" . | nindent 4 }}

k8s/charts/deluge/values.yaml

@@ -6,4 +6,5 @@ experiment:
   repetitions: 10
 
 deployment:
-  pvcName: ""
+  pvcName: ""
+  appName: ""