Skip to content
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.

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

Helmchart #490

Merged
merged 2 commits into from
Jun 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions helm-chart/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{ if .Values.daemon.enabled }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -152,7 +153,9 @@ spec:
value: {{ .Values.webui.user | default "pgwatch2" }}
- name: PW2_WEBPASSWORD
value: {{ .Values.webui.password | default "pgwatch2" }}
{{ end }}
---
{{ if .Values.webui.enabled }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -239,3 +242,4 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{ end }}
6 changes: 4 additions & 2 deletions helm-chart/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if .Values.webui.enabled -}}
{{- if .Values.webui.ingress.enabled -}}
{{- $ingressApiIsStable := eq (include "pgwatch2.ingress.isStable" .) "true" -}}
{{- $ingressSupportsIngressClassName := eq (include "pgwatch2.ingress.supportsIngressClassName" .) "true" -}}
Expand Down Expand Up @@ -46,11 +47,11 @@ spec:
backend:
{{- if $ingressApiIsStable }}
service:
name: {{ $fullName }}
name: {{ $fullName }}-webui
port:
number: {{ $servicePort }}
{{- else }}
serviceName: {{ $fullName }}
serviceName: {{ $fullName }}-webui
servicePort: {{ $servicePort }}
{{- end }}
{{- end }}
Expand All @@ -75,3 +76,4 @@ spec:
{{- end }}
{{- end -}}
{{- end }}
{{- end }}
2 changes: 2 additions & 0 deletions helm-chart/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{ if .Values.webui.enabled }}
{{ if .Values.webui.service.enabled }}
apiVersion: v1
kind: Service
Expand Down Expand Up @@ -48,3 +49,4 @@ spec:
selector:
{{- include "webui.selectorLabels" . | nindent 4 }}
{{ end }}
{{ end }}
16 changes: 10 additions & 6 deletions helm-chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ databases:
- pgwatch2

daemon:
enabled: true
image:
repository: cybertec/pgwatch2-daemon
tag: latest
Expand All @@ -50,19 +51,20 @@ postgresql:
influxdb:
enabled: true
service:
type: LoadBalancer
type: ClusterIP

webui:
enable: true
service:
enabled: True
port: 80
targetPort: 8080
type: LoadBalancer
type: ClusterIP
image:
repository: cybertec/pgwatch2
tag: latest
ingress:
enabled: false
enabled: true
# For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
# See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress
# ingressClassName: nginx
Expand All @@ -77,7 +79,7 @@ webui:
pathType: Prefix

hosts:
- chart-example.local
- webui-pgwatch2.local
## Extra paths to prepend to every host configuration. This is useful when working with annotation based services.
extraPaths: []
# - path: /*
Expand Down Expand Up @@ -106,13 +108,15 @@ grafana:
enabled: true
enabled: True
service:
type: LoadBalancer
type: ClusterIP
noAnonymous: false
user: admin
password: pgwatch2admin # password will be auto generated if emtpy
ingress:
# Use webui.ingress as an example if you want to use ingress for grafana.
enabled: false
enabled: true
hosts:
- grafana-pgwatch2.local
ldap:
enabled: true
config: |
Expand Down