Skip to content

Support user labels and annotations in lightlytics chart #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fmartinez255 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support user labels and annotations in lightlytics chart #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
147d84a
Support user labels and annotations (#5)
fmartinez255 Apr 17, 2024
54036f6
Merge branch 'lightlytics:master' into master
fmartinez255 May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion charts/lightlytics/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end }}

{{/*
User labels
*/}}
{{- define "user.labels" -}}
{{- with .Values.userLabels }}
{{ toYaml .}}
{{- end }}
{{- end }}

{{/*
Selector labels
*/}}
Expand All @@ -71,6 +80,15 @@ app.kubernetes.io/name: {{ include "lightlytics.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
User annotations
*/}}
{{- define "user.annotations" -}}
{{- with .Values.userAnnotations }}
{{ toYaml .}}
{{- end }}
{{- end }}

{{/*
Create the name of the service account to use
*/}}
Expand All @@ -88,4 +106,4 @@ Create the name of the service account to use
{{- else }}
{{- default "default" .Values.lightlytics.clusterRole.name }}
{{- end }}
{{- end }}
{{- end }}
9 changes: 8 additions & 1 deletion charts/lightlytics/templates/cost_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "lightlytics.labels" . | nindent 4 }}
{{- if .Values.userLabels }}
{{- include "user.labels" . | indent 4 }}
{{- end }}
{{- if .Values.userAnnotations }}
annotations:
{{- include "user.annotations" . | indent 4 }}
{{- end }}
spec:
replicas: {{ .Values.lightlytics.replicas }}
selector:
Expand Down Expand Up @@ -72,4 +79,4 @@ spec:
value: {{ $envVarValue | quote }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
9 changes: 8 additions & 1 deletion charts/lightlytics/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ metadata:
namespace: {{ .Release.Namespace }}
labels:
{{- include "lightlytics.labels" . | nindent 4 }}
{{- if .Values.userLabels }}
{{- include "user.labels" . | indent 4 }}
{{- end }}
{{- if .Values.userAnnotations }}
annotations:
{{- include "user.annotations" . | indent 4 }}
{{- end }}
spec:
replicas: {{ .Values.lightlytics.replicas }}
selector:
Expand Down Expand Up @@ -107,4 +114,4 @@ spec:
{{- end }}
{{- end }}

{{- end }}
{{- end }}
9 changes: 8 additions & 1 deletion charts/lightlytics/templates/process_discovery_ds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ metadata:
labels:
{{- include "lightlytics.labels" . | nindent 4 }}
app: {{ template "lightlytics.fullname" . }}-process-discovery
{{- if .Values.userLabels }}
{{- include "user.labels" . | indent 4 }}
{{- end }}
{{- if .Values.userAnnotations }}
annotations:
{{- include "user.annotations" . | indent 4 }}
{{- end }}
spec:
selector:
matchLabels:
Expand Down Expand Up @@ -100,4 +107,4 @@ spec:
- protocol: TCP
port: 8080
targetPort: 8080
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions charts/lightlytics/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ nameOverride: # ""

fullnameOverride: # ""

userLabels: {}

userAnnotations: {}

registry: public.ecr.aws/f1v0s3d7

lightlytics:
Expand Down
4 changes: 4 additions & 0 deletions charts/lightlytics/values.yaml.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ nameOverride: # ""

fullnameOverride: # ""

userLabels: # ""

userAnnotations: # ""

registry: {{ecr_repo}}

lightlytics:
Expand Down