diff --git a/k8s/charts/deluge/templates/_helpers.tpl b/k8s/charts/deluge/templates/_helpers.tpl index 65ab001..b9cc8c0 100644 --- a/k8s/charts/deluge/templates/_helpers.tpl +++ b/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 -}} \ No newline at end of file +{{- 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 }} diff --git a/k8s/charts/deluge/templates/deluge-pvc.yaml b/k8s/charts/deluge/templates/deluge-pvc.yaml index e214d71..4fa3f9b 100644 --- a/k8s/charts/deluge/templates/deluge-pvc.yaml +++ b/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: diff --git a/k8s/charts/deluge/templates/deluge-service.yaml b/k8s/charts/deluge/templates/deluge-service.yaml index b2a49d8..f220dfb 100644 --- a/k8s/charts/deluge/templates/deluge-service.yaml +++ b/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: diff --git a/k8s/charts/deluge/templates/deluge-statefulset.yaml b/k8s/charts/deluge/templates/deluge-statefulset.yaml index 0151822..5241dc1 100644 --- a/k8s/charts/deluge/templates/deluge-statefulset.yaml +++ b/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: diff --git a/k8s/charts/deluge/templates/testrunner-job.yaml b/k8s/charts/deluge/templates/testrunner-job.yaml index fb89fb9..02651b1 100644 --- a/k8s/charts/deluge/templates/testrunner-job.yaml +++ b/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: diff --git a/k8s/charts/deluge/templates/tracker-deployment.yaml b/k8s/charts/deluge/templates/tracker-deployment.yaml index d6c15df..7f4bd35 100644 --- a/k8s/charts/deluge/templates/tracker-deployment.yaml +++ b/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: diff --git a/k8s/charts/deluge/templates/tracker-service.yaml b/k8s/charts/deluge/templates/tracker-service.yaml index 20acd15..d363968 100644 --- a/k8s/charts/deluge/templates/tracker-service.yaml +++ b/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 }} \ No newline at end of file + app: bittorrent-tracker-{{ .Release.Name }} + {{- include "deluge-benchmarks.selectorLabels" . | nindent 4 }} \ No newline at end of file diff --git a/k8s/charts/deluge/values.yaml b/k8s/charts/deluge/values.yaml index 0811f04..07271ef 100644 --- a/k8s/charts/deluge/values.yaml +++ b/k8s/charts/deluge/values.yaml @@ -6,4 +6,5 @@ experiment: repetitions: 10 deployment: - pvcName: "" \ No newline at end of file + pvcName: "" + appName: "" \ No newline at end of file