version info added to labels

- to allow gatekeeper rules based on them - old (non-standard) labels removed Signed-off-by: Birk Bohne <[email protected]>
sapcc · Oct 15, 2024 · 4854a95 · 4854a95
1 parent 3cf7660
commit 4854a95
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 24 deletions.
diff --git a/common/memcached/CHANGELOG.md b/common/memcached/CHANGELOG.md
@@ -0,0 +1,9 @@
+# Changelog
+
+## v0.6.0 - 2024/10/15
+* version info added to labels
+  * to allow gatekeeper rules based on them
+* old (non-standard) labels removed
+* memcached version bumped to `1.6.31-alpine3.20`
+  * added alpine version to the tag to enforce exactly this version
+* chart version bumped
diff --git a/common/memcached/templates/_helpers.tpl b/common/memcached/templates/_helpers.tpl
@@ -84,3 +84,28 @@ app.kubernetes.io/version: {{ .Chart.Version }}
 app.kubernetes.io/component: {{ .Chart.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- end }}
+
+{{/*
+  Generate labels
+  $ = global values
+  version/noversion = enable/disable version fields in labels
+  memcached = desired component name
+  job = object type
+  config = provided function
+  include "memcached.labels" (list $ "version" "memcached" "deployment" "kvstore")
+  include "memcached.labels" (list $ "version" "memcached" "job" "config")
+*/}}
+{{- define "memcached.labels" }}
+{{- $ := index . 0 }}
+{{- $component := index . 2 }}
+{{- $type := index . 3 }}
+{{- $function := index . 4 }}
+app.kubernetes.io/name: {{ $.Chart.Name }}
+app.kubernetes.io/instance: {{ $.Release.Name }}-{{ $.Chart.Name }}
+app.kubernetes.io/component: {{ $.Chart.Name }}-{{ $type }}-{{ $function }}
+app.kubernetes.io/part-of: {{ $.Release.Name }}
+  {{- if eq (index . 1) "version" }}
+app.kubernetes.io/version: {{ $.Values.imageTag | regexFind "[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}" }}
+helm.sh/chart: {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
+  {{- end }}
+{{- end }}
diff --git a/common/memcached/templates/alerts.yaml b/common/memcached/templates/alerts.yaml
@@ -6,12 +6,8 @@ kind: PrometheusRule
 metadata:
   name: {{ template "fullname" . }}-memcached-alerts
   labels:
-    app: {{ template "fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
     prometheus: {{ required ".Values.alerts.prometheus missing" .Values.alerts.prometheus }}
-    {{- include "sharedservices.labels" . | indent 4 }}
+    {{- include "memcached.labels" (list $ "version" "memcached" "prometheusrule" "alert") | indent 4 }}
 
 spec:
 {{ include (print .Template.BasePath "/alerts/_memcached.alerts.tpl") . | indent 2 }}

diff --git a/common/memcached/templates/configmap.yaml b/common/memcached/templates/configmap.yaml
@@ -4,8 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-memcached-config
   labels:
-    type: configuration
-    application: {{ .Release.Name }}
+    {{- include "memcached.labels" (list $ "version" "memcached" "configmap" "kvstore") | indent 4 }}
 stringData:
   memcached.conf: |
     mech_list: plain

diff --git a/common/memcached/templates/deployment.yaml b/common/memcached/templates/deployment.yaml
@@ -2,12 +2,6 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: {{ template "fullname" . }}
-  labels:
-    app: {{ template "fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    {{- include "sharedservices.labels" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicas }}
   revisionHistoryLimit: {{ .Values.upgrades.revisionHistory }}
@@ -24,9 +18,7 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "fullname" . }}
-        component: memcached
-        {{- include "sharedservices.labels" . | indent 8 }}
+        {{- include "memcached.labels" (list $ "version" "memcached" "deployment" "kvstore") | indent 8 }}
       annotations:
         {{- if and (and $.Values.global.linkerd_enabled $.Values.global.linkerd_requested) $.Values.linkerd.enabled }}
         linkerd.io/inject: enabled

diff --git a/common/memcached/templates/secrets.yaml b/common/memcached/templates/secrets.yaml
@@ -4,8 +4,7 @@ kind: Secret
 metadata:
   name: {{ .Release.Name }}-memcached-secrets
   labels:
-    type: configuration
-    application: {{ .Release.Name }}
+    {{- include "memcached.labels" (list $ "version" "memcached" "secret" "kvstore") | indent 4 }}
 data:
   memcached-sasl-db: {{ include "memcached.sasl_pwdb" . | b64enc | quote }}
 {{- end }}
diff --git a/common/memcached/templates/service.yaml b/common/memcached/templates/service.yaml
@@ -3,12 +3,7 @@ kind: Service
 metadata:
   name: {{ template "fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    component: memcached
-    {{- include "sharedservices.labels" . | indent 4 }}
+    {{- include "memcached.labels" (list $ "version" "memcached" "service" "kvstore") | indent 4 }}
   annotations:
     {{- if and $.Values.global.linkerd_enabled $.Values.global.linkerd_requested }}
     linkerd.io/inject: enabled