Skip to content

Remove duplicate labels from postgrest deployment and service #50

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
toddkazakov wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove duplicate labels from postgrest deployment and service #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 22 additions & 1 deletion charts/tooljet/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,27 @@ app.kubernetes.io/name: {{ include "tooljet.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
Postgrest labels
*/}}
{{- define "tooljet-postgrest.labels" -}}
helm.sh/chart: {{ include "tooljet.chart" . }}
{{ include "tooljet-postgrest.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end }}

{{/*
Postgrest Selector labels
*/}}
{{- define "tooljet-postgrest.selectorLabels" -}}
app.kubernetes.io/name: {{ include "tooljet.name" . }}-postgrest
app.kubernetes.io/component: {{ include "tooljet.name" . }}-postgrest
app.kubernetes.io/instance: {{ .Release.Name }}-postgrest
{{- end }}

{{/*
Create a default fully qualified postgresql name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
Expand Down Expand Up @@ -143,4 +164,4 @@ Return the appropriate apiVersion for autoscaling.
{{- else -}}
{{- print "autoscaling/v2beta2" -}}
{{- end -}}
{{- end -}}
{{- end -}}
15 changes: 3 additions & 12 deletions charts/tooljet/templates/deployment-pgrst.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,15 @@ metadata:
name: {{ include "tooljet.fullname" . }}-postgrest
labels:
{{- include "tooljet.labels" . | nindent 4 }}
app.kubernetes.io/component: tooljet-postgrest
app.kubernetes.io/instance: tooljet-postgrest
app.kubernetes.io/name: tooljet-postgrest
spec:
replicas: {{ .Values.postgrest.replicaCount | default 1 }}
selector:
matchLabels:
{{- include "tooljet.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: tooljet-postgrest
app.kubernetes.io/instance: tooljet-postgrest
app.kubernetes.io/name: tooljet-postgrest
{{- include "tooljet-postgrest.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
{{- include "tooljet.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: tooljet-postgrest
app.kubernetes.io/instance: tooljet-postgrest
app.kubernetes.io/name: tooljet-postgrest
{{- include "tooljet-postgrest.selectorLabels" . | nindent 8 }}
spec:
containers:
- name: postgrest
Expand Down Expand Up @@ -64,4 +55,4 @@ spec:
{{- with .Values.postgrest.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
10 changes: 2 additions & 8 deletions charts/tooljet/templates/service-pgrst.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,10 @@ kind: Service
metadata:
name: {{ include "tooljet.fullname" . }}-postgrest
labels:
{{- include "tooljet.labels" . | nindent 4 }}
app.kubernetes.io/component: tooljet-postgrest
app.kubernetes.io/instance: tooljet-postgrest
app.kubernetes.io/name: tooljet-postgrest
{{- include "tooljet-postgrest.labels" . | nindent 4 }}
spec:
selector:
{{- include "tooljet.selectorLabels" . | nindent 4 }}
app.kubernetes.io/component: tooljet-postgrest
app.kubernetes.io/instance: tooljet-postgrest
app.kubernetes.io/name: tooljet-postgrest
{{- include "tooljet-postgrest.selectorLabels" . | nindent 4 }}
type: {{ .Values.postgrest.service.type }}
ports:
- name: http
Expand Down