summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheFrenchGhosty <47571719+TheFrenchGhosty@users.noreply.github.com>2020-09-25 23:10:09 +0000
committerGitHub <noreply@github.com>2020-09-25 23:10:09 +0000
commit651fd793250b83876d637da603dac7199ad6d5e3 (patch)
treea0dd0bf911de6a021744b4ef5cd0e95eb9fbcb1c
parentb53f988fca6f746f546de52a6746ff13076a896e (diff)
parentfa3eb185aba77a59896a64f67113178b371e0b32 (diff)
downloadinvidious-651fd793250b83876d637da603dac7199ad6d5e3.tar.gz
invidious-651fd793250b83876d637da603dac7199ad6d5e3.tar.bz2
invidious-651fd793250b83876d637da603dac7199ad6d5e3.zip
Merge pull request #1360 from FlipEnergy/helm_services
[Helm] add service type values and InitContainer to wait for Postgres
-rw-r--r--kubernetes/Chart.yaml2
-rw-r--r--kubernetes/templates/deployment.yaml8
-rw-r--r--kubernetes/templates/service.yaml6
-rw-r--r--kubernetes/values.yaml5
4 files changed, 19 insertions, 2 deletions
diff --git a/kubernetes/Chart.yaml b/kubernetes/Chart.yaml
index 0d7791d7..bb0838ad 100644
--- a/kubernetes/Chart.yaml
+++ b/kubernetes/Chart.yaml
@@ -1,7 +1,7 @@
apiVersion: v2
name: invidious
description: Invidious is an alternative front-end to YouTube
-version: 1.0.0
+version: 1.1.0
appVersion: 0.20.1
keywords:
- youtube
diff --git a/kubernetes/templates/deployment.yaml b/kubernetes/templates/deployment.yaml
index 34156127..bb0b832f 100644
--- a/kubernetes/templates/deployment.yaml
+++ b/kubernetes/templates/deployment.yaml
@@ -23,6 +23,13 @@ spec:
runAsUser: {{ .Values.securityContext.runAsUser }}
runAsGroup: {{ .Values.securityContext.runAsGroup }}
fsGroup: {{ .Values.securityContext.fsGroup }}
+ initContainers:
+ - name: wait-for-postgresql
+ image: postgres
+ args:
+ - /bin/sh
+ - -c
+ - until pg_isready -h {{ .Values.config.db.host }} -p {{ .Values.config.db.port }} -U {{ .Values.config.db.user }}; do echo waiting for database; sleep 2; done;
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -50,4 +57,5 @@ spec:
httpGet:
port: 3000
path: /
+ initialDelaySeconds: 15
restartPolicy: Always
diff --git a/kubernetes/templates/service.yaml b/kubernetes/templates/service.yaml
index 56bdea2e..01454d4e 100644
--- a/kubernetes/templates/service.yaml
+++ b/kubernetes/templates/service.yaml
@@ -7,10 +7,14 @@ metadata:
chart: {{ .Chart.Name }}
release: {{ .Release.Name }}
spec:
+ type: {{ .Values.service.type }}
ports:
- name: http
- port: 3000
+ port: {{ .Values.service.port }}
targetPort: 3000
selector:
app: {{ template "invidious.name" . }}
release: {{ .Release.Name }}
+{{- if .Values.service.loadBalancerIP }}
+ loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+{{- end }}
diff --git a/kubernetes/values.yaml b/kubernetes/values.yaml
index ce32b257..4d037022 100644
--- a/kubernetes/values.yaml
+++ b/kubernetes/values.yaml
@@ -13,6 +13,11 @@ autoscaling:
maxReplicas: 16
targetCPUUtilizationPercentage: 50
+service:
+ type: clusterIP
+ port: 3000
+ #loadBalancerIP:
+
resources: {}
#requests:
# cpu: 100m