Skip to content

Commit f6585f3

Browse files
nlamiraultakshay196
nlamirault
and
akshay196
authored
feat: add kubernetes recommended labels (#101)
Signed-off-by: Nicolas Lamirault <[email protected]> Co-authored-by: Akshay Gaikwad <[email protected]>
1 parent 5824ead commit f6585f3

30 files changed

+75
-6
lines changed

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ All notable changes to this project will be documented in this file.
77
## Added
88
- Option to override Relay external host in config from [plejik](https://github.com/plejik)
99

10+
### Changed
11+
- Updated Kubernetes labels from [nlamirault](https://github.com/nlamirault)
12+
1013
## [0.2.6] - 2023-09-25
1114

1215
### Changed

‎charts/ztka/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ helm show values paralus/ztka
8888

8989
| Key | Type | Default | Description |
9090
|-----|------|---------|-------------|
91+
| additionalLabels | object | `{}` | Additional labels to add to all resources |
9192
| affinity | object | `{}` | |
9293
| auditLogs.storage | string | `"database"` | database(postgres) by default |
9394
| autoscaling.enabled | bool | `false` | |

‎charts/ztka/templates/_helpers.tpl

+6
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,20 @@ helm.sh/chart: {{ include "ztka.chart" . }}
1313
{{- if .Chart.AppVersion }}
1414
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
1515
{{- end }}
16+
app.kubernetes.io/part-of: paralus
1617
app.kubernetes.io/managed-by: {{ .Release.Service }}
18+
{{- if .Values.additionalLabels }}
19+
{{ toYaml .Values.additionalLabels }}
20+
{{- end }}
1721
{{- end }}
1822

1923
{{- define "ztka.kratos.hooks.labels" -}}
2024
helm.sh/chart: {{ include "ztka.chart" . }}
2125
{{- if .Chart.AppVersion }}
2226
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
2327
{{- end }}
28+
app.kubernetes.io/component: kratos
29+
app.kubernetes.io/part-of: paralus
2430
app.kubernetes.io/managed-by: {{ .Release.Service }}
2531
{{- end }}
2632

‎charts/ztka/templates/configmap-fluentbit.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ apiVersion: v1
22
kind: ConfigMap
33
metadata:
44
name: fluentbit-config
5+
labels:
6+
{{- include "ztka.labels" . | nindent 4 }}
7+
app.kubernetes.io/name: fluentbit
8+
app.kubernetes.io/instance: {{ .Release.Name }}
9+
app.kubernetes.io/component: configuration
510
data:
611
custom_parsers.conf: |
712
[PARSER]

‎charts/ztka/templates/configmap-kratos-hooks.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ metadata:
55
name: kratos-config-hooks
66
labels:
77
{{- include "ztka.kratos.hooks.labels" . | nindent 4 }}
8+
app.kubernetes.io/name: kratos-config-hooks
9+
app.kubernetes.io/instance: {{ .Release.Name }}
10+
app.kubernetes.io/component: configuration
811
data:
912
kratos-config-hooks.yaml: |
1013
selfservice:

‎charts/ztka/templates/configmap-kratos.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ metadata:
55
name: kratos-config
66
labels:
77
{{- include "ztka.labels" . | nindent 4 }}
8+
app.kubernetes.io/name: kratos-config
9+
app.kubernetes.io/instance: {{ .Release.Name }}
10+
app.kubernetes.io/component: configuration
811
data:
912
serve_public_base_url: {{ include "ztka.consoleFQDNWithScheme" . }}
1013
default_browser_return_url: {{ include "ztka.consoleFQDNWithScheme" . }}

‎charts/ztka/templates/configmap-paralus.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
labels:
66
{{- include "ztka.labels" . | nindent 4 }}
77
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.paralus "release" $.Release) | nindent 4 }}
8+
app.kubernetes.io/component: configuration
89
data:
910
DEV: "false"
1011
AUDIT_LOG_FILE: "/audit-logs/audit.log"

‎charts/ztka/templates/configmap-prompt.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
labels:
66
{{- include "ztka.labels" . | nindent 4 }}
77
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.prompt "release" $.Release) | nindent 4 }}
8+
app.kubernetes.io/component: configuration
89
data:
910
DEV: "false"
1011
AUDIT_LOG_FILE: "/audit-logs/audit.log"

‎charts/ztka/templates/configmap-relay.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
labels:
66
{{- include "ztka.labels" . | nindent 4 }}
77
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.relay "release" $.Release) | nindent 4 }}
8+
app.kubernetes.io/component: configuration
89
data:
910
PARALUS_RELAY_PEERSERVICE: https://paralus:10001
1011
SENTRY_ADDR: paralus:10000

‎charts/ztka/templates/deployment-dashboard.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
labels:
66
{{- include "ztka.labels" . | nindent 4 }}
77
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.dashboard "release" $.Release) | nindent 4 }}
8+
app.kubernetes.io/component: workload
89
spec:
910
{{- if not .Values.autoscaling.enabled }}
1011
replicas: {{ .Values.replicaCount }}
@@ -19,7 +20,9 @@ spec:
1920
{{- toYaml . | nindent 8 }}
2021
{{- end }}
2122
labels:
23+
{{- include "ztka.labels" . | nindent 8 }}
2224
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.dashboard "release" $.Release) | nindent 8 }}
25+
app.kubernetes.io/component: workload
2326
spec:
2427
{{- with .Values.imagePullSecrets }}
2528
imagePullSecrets:

‎charts/ztka/templates/deployment-paralus.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
labels:
66
{{- include "ztka.labels" . | nindent 4 }}
77
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.paralus "release" $.Release) | nindent 4 }}
8+
app.kubernetes.io/component: workload
89
spec:
910
{{- if not .Values.autoscaling.enabled }}
1011
replicas: {{ .Values.replicaCount }}
@@ -20,7 +21,9 @@ spec:
2021
{{- toYaml . | nindent 8 }}
2122
{{- end }}
2223
labels:
24+
{{- include "ztka.labels" . | nindent 8 }}
2325
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.paralus "release" $.Release) | nindent 8 }}
26+
app.kubernetes.io/component: workload
2427
spec:
2528
{{- with .Values.imagePullSecrets }}
2629
imagePullSecrets:

‎charts/ztka/templates/deployment-prompt.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
labels:
66
{{- include "ztka.labels" . | nindent 4 }}
77
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.prompt "release" $.Release) | nindent 4 }}
8+
app.kubernetes.io/component: workload
89
spec:
910
{{- if not .Values.autoscaling.enabled }}
1011
replicas: {{ .Values.replicaCount }}
@@ -19,7 +20,9 @@ spec:
1920
{{- toYaml . | nindent 8 }}
2021
{{- end }}
2122
labels:
23+
{{- include "ztka.labels" . | nindent 8 }}
2224
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.prompt "release" $.Release) | nindent 8 }}
25+
app.kubernetes.io/component: workload
2326
spec:
2427
{{- with .Values.imagePullSecrets }}
2528
imagePullSecrets:

‎charts/ztka/templates/deployment-relay.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
labels:
66
{{- include "ztka.labels" . | nindent 4 }}
77
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.relay "release" $.Release) | nindent 4 }}
8+
app.kubernetes.io/component: workload
89
spec:
910
{{- if not .Values.autoscaling.enabled }}
1011
replicas: {{ .Values.replicaCount }}
@@ -19,7 +20,9 @@ spec:
1920
{{- toYaml . | nindent 8 }}
2021
{{- end }}
2122
labels:
23+
{{- include "ztka.labels" . | nindent 8 }}
2224
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.relay "release" $.Release) | nindent 8 }}
25+
app.kubernetes.io/component: workload
2326
spec:
2427
{{- with .Values.imagePullSecrets }}
2528
imagePullSecrets:

‎charts/ztka/templates/hpa.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
name: paralus
66
labels:
77
{{- include "ztka.labels" . | nindent 4 }}
8+
app.kubernetes.io/component: autoscaling
89
spec:
910
scaleTargetRef:
1011
apiVersion: apps/v1

‎charts/ztka/templates/httpproxy-console.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ apiVersion: projectcontour.io/v1
33
kind: HTTPProxy
44
metadata:
55
name: console
6+
labels:
7+
{{- include "ztka.labels" . | nindent 4 }}
8+
app.kubernetes.io/component: networking
69
spec:
710
virtualhost:
811
fqdn: {{ include "ztka.consoleFQDN" . | quote }}

‎charts/ztka/templates/httpproxy-ztka.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ apiVersion: projectcontour.io/v1
33
kind: HTTPProxy
44
metadata:
55
name: ztka-core-connector
6+
labels:
7+
{{- include "ztka.labels" . | nindent 4 }}
8+
app.kubernetes.io/component: networking
69
spec:
710
virtualhost:
811
fqdn: {{ include "ztka.coreConnectorFQDN" . | quote }}
@@ -17,6 +20,9 @@ apiVersion: projectcontour.io/v1
1720
kind: HTTPProxy
1821
metadata:
1922
name: ztka-user
23+
labels:
24+
{{- include "ztka.labels" . | nindent 4 }}
25+
app.kubernetes.io/component: networking
2026
spec:
2127
virtualhost:
2228
fqdn: {{ include "ztka.userFQDN" . | quote }}

‎charts/ztka/templates/ingress-console.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ metadata:
1111
name: console
1212
labels:
1313
{{- include "ztka.labels" . | nindent 4 }}
14+
app.kubernetes.io/component: networking
1415
{{- with .Values.ingress.annotations }}
1516
annotations:
1617
{{- toYaml . | nindent 4 }}

‎charts/ztka/templates/ingress-ztka.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ metadata:
1111
name: ztka
1212
labels:
1313
{{- include "ztka.labels" . | nindent 4 }}
14+
app.kubernetes.io/component: networking
1415
annotations:
1516
{{- with .Values.ingress.annotations }}
1617
{{- toYaml . | nindent 4 }}

‎charts/ztka/templates/job-kratos-hooks.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ metadata:
1919
helm.sh/hook: post-upgrade,post-rollback
2020
helm.sh/hook-delete-policy: hook-succeeded
2121
helm.sh/hook-weight: "-2"
22+
labels:
23+
{{- include "ztka.labels" . | nindent 4 }}
2224
rules:
2325
- apiGroups: ["apps"]
2426
resources: ["deployments"]
@@ -34,6 +36,9 @@ metadata:
3436
helm.sh/hook: post-upgrade,post-rollback
3537
helm.sh/hook-delete-policy: hook-succeeded
3638
helm.sh/hook-weight: "-1"
39+
labels:
40+
{{- include "ztka.labels" . | nindent 4 }}
41+
app.kubernetes.io/component: job
3742
roleRef:
3843
apiGroup: rbac.authorization.k8s.io
3944
kind: Role
@@ -51,6 +56,9 @@ metadata:
5156
helm.sh/hook: post-upgrade,post-rollback
5257
helm.sh/hook-delete-policy: hook-succeeded
5358
helm.sh/hook-weight: "0"
59+
labels:
60+
{{- include "ztka.labels" . | nindent 4 }}
61+
app.kubernetes.io/component: job
5462
spec:
5563
backoffLimit: 2
5664
activeDeadlineSeconds: 600

‎charts/ztka/templates/job-paralus-post-install-analytics.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ metadata:
66
name: paralus-post-install-analytics
77
labels:
88
{{- include "ztka.labels" . | nindent 4 }}
9+
app.kubernetes.io/component: job
910
annotations:
1011
# This is what defines this resource as a hook. Without this line, the
1112
# job is considered part of the release.
12-
"helm.sh/hook": post-install
13-
"helm.sh/hook-delete-policy": hook-succeeded
13+
helm.sh/hook: post-install
14+
helm.sh/hook-delete-policy: hook-succeeded
1415
spec:
1516
template:
1617
metadata:

‎charts/ztka/templates/job-paralus-post-upgrade-analytics.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ metadata:
66
name: paralus-post-upgrade-analytics
77
labels:
88
{{- include "ztka.labels" . | nindent 4 }}
9+
app.kubernetes.io/component: job
910
annotations:
1011
# This is what defines this resource as a hook. Without this line, the
1112
# job is considered part of the release.
12-
"helm.sh/hook": post-upgrade
13-
"helm.sh/hook-delete-policy": hook-succeeded
13+
helm.sh/hook: post-upgrade
14+
helm.sh/hook-delete-policy: hook-succeeded
1415
spec:
1516
template:
1617
metadata:

‎charts/ztka/templates/job-paralus-pre-upgrade-analytics.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ metadata:
66
name: paralus-pre-upgrade-analytics
77
labels:
88
{{- include "ztka.labels" . | nindent 4 }}
9+
app.kubernetes.io/component: job
910
annotations:
1011
# This is what defines this resource as a hook. Without this line, the
1112
# job is considered part of the release.
12-
"helm.sh/hook": pre-upgrade
13-
"helm.sh/hook-delete-policy": hook-succeeded
13+
helm.sh/hook: pre-upgrade
14+
helm.sh/hook-delete-policy: hook-succeeded
1415
spec:
1516
template:
1617
metadata:

‎charts/ztka/templates/secret-database.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ metadata:
44
name: paralus-db
55
labels:
66
{{- include "ztka.labels" . | nindent 4 }}
7+
app.kubernetes.io/component: secret
78
type: Opaque
89
data:
910
DB_ADDR: {{ include "ztka.dbAddr" . | b64enc | quote }}

‎charts/ztka/templates/secret-kratos.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
name: kratos
66
labels:
77
{{- include "ztka.labels" . | nindent 4 }}
8+
app.kubernetes.io/component: secret
89
type: Opaque
910
data:
1011
dsn: {{ include "ztka.dsn" . | b64enc | quote }}

‎charts/ztka/templates/secret-postgresql.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
name: postgresql
66
labels:
77
{{- include "ztka.labels" . | nindent 4 }}
8+
app.kubernetes.io/component: secret
89
type: Opaque
910
data:
1011
password: {{ .Values.postgresql.auth.password | b64enc | quote }}

‎charts/ztka/templates/service-paralus.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
labels:
66
{{- include "ztka.labels" . | nindent 4 }}
77
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.paralus "release" $.Release) | nindent 4 }}
8+
app.kubernetes.io/component: networking
89
spec:
910
type: {{ .Values.services.paralus.type }}
1011
ports:

‎charts/ztka/templates/service-prompt.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
labels:
66
{{- include "ztka.labels" . | nindent 4 }}
77
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.prompt "release" $.Release) | nindent 4 }}
8+
app.kubernetes.io/component: networking
89
spec:
910
type: {{ .Values.services.prompt.type }}
1011
ports:

‎charts/ztka/templates/service-relay.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
labels:
66
{{- include "ztka.labels" . | nindent 4 }}
77
{{- include "ztka.selectorLabels" (dict "image" $.Values.images.relay "release" $.Release) | nindent 4 }}
8+
app.kubernetes.io/component: networking
89
spec:
910
type: {{ .Values.services.relay.type }}
1011
ports:

‎charts/ztka/templates/serviceaccount.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
name: {{ include "ztka.serviceAccountName" . }}
66
labels:
77
{{- include "ztka.labels" . | nindent 4 }}
8+
app.kubernetes.io/component: rbac
89
{{- with .Values.serviceAccount.annotations }}
910
annotations:
1011
{{- toYaml . | nindent 4 }}

‎charts/ztka/values.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ serviceAccount:
5353
# -- Annotations for the all deployed pods
5454
podAnnotations: {}
5555

56+
# -- Additional labels to add to all resources
57+
additionalLabels: {}
58+
5659
# Pod Security Context
5760
podSecurityContext: {}
5861
# fsGroup: 2000

0 commit comments

Comments
 (0)