chore: add proper labels

* closes #114
inveniosoftware · Dec 5, 2024 · 0fce6fb · 0fce6fb
1 parent 473243a
commit 0fce6fb
Show file tree

Hide file tree

Showing 33 changed files with 103 additions and 0 deletions.
diff --git a/charts/invenio/templates/_helpers.tpl b/charts/invenio/templates/_helpers.tpl
@@ -1,3 +1,53 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "invenio.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "invenio.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "invenio.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "invenio.labels" -}}
+helm.sh/chart: {{ include "invenio.chart" . }}
+{{ include "invenio.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+Selector labels
+*/}}
+{{- define "invenio.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "invenio.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
 ###########################     Invenio hostname     ###########################
 {{/*
   This template renders the hostname for Invenio.

diff --git a/charts/invenio/templates/datacite-secret.yaml b/charts/invenio/templates/datacite-secret.yaml
@@ -6,6 +6,7 @@ type: Opaque
 metadata:
   name: datacite-secrets
   labels:
+    {{- include "invenio.labels" . | nindent 4 }}
     app: datacite-secrets
   annotations:
     helm.sh/resource-policy: keep

diff --git a/charts/invenio/templates/extra-secrets.yaml b/charts/invenio/templates/extra-secrets.yaml
@@ -8,6 +8,7 @@ type: Opaque
 metadata:
   name: {{ $value.secret_name }}
   labels:
+    {{- include "invenio.labels" . | nindent 4 }}
     app: {{ $value.secret_name }}
   annotations:
     helm.sh/resource-policy: keep

diff --git a/charts/invenio/templates/file-configmaps.yaml b/charts/invenio/templates/file-configmaps.yaml
@@ -4,6 +4,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ $key }}
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 data:
   {{ $value.fileName }}: |
     {{- $value.file | nindent 4 }}

diff --git a/charts/invenio/templates/flower/celery-configmap.yaml b/charts/invenio/templates/flower/celery-configmap.yaml
@@ -4,6 +4,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: flower-celery-config
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 data:
   celeryconfig.py: |-
     # looks like not really working

diff --git a/charts/invenio/templates/flower/deployment.yaml b/charts/invenio/templates/flower/deployment.yaml
@@ -4,6 +4,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: flower-management
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 spec:
   replicas: 1
   selector:

diff --git a/charts/invenio/templates/flower/flower-configmap.yaml b/charts/invenio/templates/flower/flower-configmap.yaml
@@ -4,6 +4,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: flower-config
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 data:
   flowerconfig.py: |-
     # looks like not really working

diff --git a/charts/invenio/templates/flower/route.yaml b/charts/invenio/templates/flower/route.yaml
@@ -4,6 +4,8 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   name: flower-management
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 spec:
   host: {{ .Values.flower.host }}
   to:

diff --git a/charts/invenio/templates/flower/secret.yaml b/charts/invenio/templates/flower/secret.yaml
@@ -7,6 +7,7 @@ type: Opaque
 metadata:
   name: {{ .Values.flower.secret_name }}
   labels:
+    {{- include "invenio.labels" . | nindent 4 }}
     app: {{ .Values.flower.secret_name }}
   annotations:
     helm.sh/resource-policy: keep

diff --git a/charts/invenio/templates/flower/service.yaml b/charts/invenio/templates/flower/service.yaml
@@ -5,6 +5,7 @@ kind: Service
 metadata:
   name: flower-management
   labels:
+    {{- include "invenio.labels" . | nindent 4 }}
     app: flower-management
 spec:
   ports:

diff --git a/charts/invenio/templates/haproxy/configmap.yaml b/charts/invenio/templates/haproxy/configmap.yaml
@@ -3,6 +3,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: haproxy-config
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 data:
   haproxy.cfg: |
     global

diff --git a/charts/invenio/templates/haproxy/deployment.yaml b/charts/invenio/templates/haproxy/deployment.yaml
@@ -4,6 +4,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: haproxy
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.haproxy.replicas }}
   selector:

diff --git a/charts/invenio/templates/haproxy/service.yaml b/charts/invenio/templates/haproxy/service.yaml
@@ -5,6 +5,7 @@ kind: Service
 metadata:
   name: haproxy
   labels:
+    {{- include "invenio.labels" . | nindent 4 }}
     app: haproxy
 spec:
   ports:

diff --git a/charts/invenio/templates/horizontalpodautoscaler.yaml b/charts/invenio/templates/horizontalpodautoscaler.yaml
@@ -4,6 +4,7 @@ apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
   labels:
+    {{- include "invenio.labels" . | nindent 4 }}
     app: web
     template: invenio-application
   name: web

diff --git a/charts/invenio/templates/ingress.yaml b/charts/invenio/templates/ingress.yaml
@@ -8,6 +8,8 @@ metadata:
   annotations:
     {{- .Values.ingress.annotations | toYaml | nindent 4}}
   {{- end }}
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 spec:
   {{- if .Values.ingress.class }}
   ingressClassName: {{ .Values.ingress.class }}

diff --git a/charts/invenio/templates/install-init-job.yaml b/charts/invenio/templates/install-init-job.yaml
@@ -4,6 +4,7 @@ kind: Job
 metadata:
   name: install-init
   labels:
+    {{- include "invenio.labels" . | nindent 4 }}
     app: install-init
     module: install
   annotations:

diff --git a/charts/invenio/templates/invenio-configmap.yaml b/charts/invenio/templates/invenio-configmap.yaml
@@ -3,6 +3,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: invenio-config
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 data:
   INVENIO_ACCOUNTS_SESSION_REDIS_URL: 'redis://{{ include "invenio.redis.hostname" . }}:6379/1'
   INVENIO_APP_ALLOWED_HOSTS: '["{{ include "invenio.hostname" $ }}"]'

diff --git a/charts/invenio/templates/logstash/deployment.yaml b/charts/invenio/templates/logstash/deployment.yaml
@@ -4,6 +4,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: logstash
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 spec:
   replicas: 1
   selector:

diff --git a/charts/invenio/templates/logstash/filebeat-configmap.yaml b/charts/invenio/templates/logstash/filebeat-configmap.yaml
@@ -4,6 +4,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: filebeat-config
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 data:
   filebeat.yml: |-
     filebeat.inputs:

diff --git a/charts/invenio/templates/logstash/logstash-configmap.yaml b/charts/invenio/templates/logstash/logstash-configmap.yaml
@@ -4,6 +4,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: logstash-configmap
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 data:
   logstash.yml: |
     http.host: "0.0.0.0"

diff --git a/charts/invenio/templates/logstash/service.yaml b/charts/invenio/templates/logstash/service.yaml
@@ -4,6 +4,8 @@ kind: Service
 apiVersion: v1
 metadata:
   name: logstash
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 spec:
   selector:
     app: logstash

diff --git a/charts/invenio/templates/nginx-configmap.yaml b/charts/invenio/templates/nginx-configmap.yaml
@@ -3,6 +3,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: nginx-config
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 data:
   invenio.conf: |
     upstream web {

diff --git a/charts/invenio/templates/persistentvolumeclaim.yaml b/charts/invenio/templates/persistentvolumeclaim.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 metadata:
   name: {{ .Values.persistence.name }}
   labels:
+    {{- include "invenio.labels" . | nindent 4 }}
     app: web
   annotations:
     helm.sh/resource-policy: keep

diff --git a/charts/invenio/templates/rabbitmq-routes.yaml b/charts/invenio/templates/rabbitmq-routes.yaml
@@ -4,6 +4,8 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   name: mq-management
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 spec:
   host: {{ required "Missing .Values.rabbitmq.ingress.hostname" .Values.rabbitmq.ingress.hostname }}
   to:

diff --git a/charts/invenio/templates/remote-apps-secret.yaml b/charts/invenio/templates/remote-apps-secret.yaml
@@ -6,6 +6,7 @@ type: Opaque
 metadata:
   name: {{ .Values.invenio.remote_apps.secret_name }}
   labels:
+    {{- include "invenio.labels" . | nindent 4 }}
     app: {{ .Values.invenio.remote_apps.secret_name }}
   annotations:
     helm.sh/resource-policy: keep

diff --git a/charts/invenio/templates/route.yaml b/charts/invenio/templates/route.yaml
@@ -10,6 +10,8 @@ metadata:
     {{ . }}
     {{- end }}
   {{- end }}
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 spec:
   host: {{ include "invenio.hostname" $ }}
   to:

diff --git a/charts/invenio/templates/secret.yaml b/charts/invenio/templates/secret.yaml
@@ -7,6 +7,7 @@ metadata:
   name: invenio-secrets
   labels:
     app: invenio-secrets
+    {{- include "invenio.labels" . | nindent 4 }}
   annotations:
     helm.sh/resource-policy: keep
 data:

diff --git a/charts/invenio/templates/sentry-secret.yaml b/charts/invenio/templates/sentry-secret.yaml
@@ -6,6 +6,7 @@ type: Opaque
 metadata:
   name: {{ .Values.invenio.sentry.secret_name }}
   labels:
+    {{- include "invenio.labels" . | nindent 4 }}
     app: {{ .Values.invenio.sentry.secret_name }}
   annotations:
     helm.sh/resource-policy: keep

diff --git a/charts/invenio/templates/uwsgi-configmap.yaml b/charts/invenio/templates/uwsgi-configmap.yaml
@@ -3,6 +3,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: uwsgi-config
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 data:
   uwsgi.ini: |
     [uwsgi]

diff --git a/charts/invenio/templates/web-deployment.yaml b/charts/invenio/templates/web-deployment.yaml
@@ -3,6 +3,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: web
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.web.replicas }}
   selector:

diff --git a/charts/invenio/templates/web-service.yaml b/charts/invenio/templates/web-service.yaml
@@ -4,7 +4,9 @@ kind: Service
 metadata:
   name: web
   labels:
+    {{- include "invenio.labels" . | nindent 4 }}
     run: web
+
   {{- if .Values.web.annotations }}
   annotations: {{- toYaml .Values.web.annotations | nindent 4 }}
   {{- end }}

diff --git a/charts/invenio/templates/worker-beat-deployment.yaml b/charts/invenio/templates/worker-beat-deployment.yaml
@@ -3,6 +3,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: worker-beat
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 spec:
   replicas: 1
   selector:

diff --git a/charts/invenio/templates/worker-deployment.yaml b/charts/invenio/templates/worker-deployment.yaml
@@ -3,6 +3,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: worker
+  labels:
+    {{- include "invenio.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.worker.replicas }}
   selector: