Merge pull request #2366 from SEED-platform/doesitbuildbranches

Doesitbuildbranches
SEED-platform · Aug 11, 2020 · 358d168 · 358d168
2 parents 7f80d1a + f6a684b
commit 358d168
Show file tree

Hide file tree

Showing 42 changed files with 312 additions and 332 deletions.
diff --git a/charts/admin/dev-namepsace.json b/charts/admin/dev-namepsace.json
diff --git a/charts/backend/templates/NOTES.txt b/charts/backend/templates/NOTES.txt
diff --git a/charts/backend/templates/tests/test-connection.yaml b/charts/backend/templates/tests/test-connection.yaml
diff --git a/charts/frontend/.helmignore b/charts/frontend/.helmignore
diff --git a/charts/frontend/Chart.yaml b/charts/frontend/Chart.yaml
diff --git a/charts/frontend/templates/NOTES.txt b/charts/frontend/templates/NOTES.txt
diff --git a/charts/frontend/templates/_helpers.tpl b/charts/frontend/templates/_helpers.tpl
diff --git a/charts/frontend/templates/tests/test-connection.yaml b/charts/frontend/templates/tests/test-connection.yaml
diff --git a/charts/middleware/.helmignore b/charts/middleware/.helmignore
diff --git a/charts/middleware/values.yaml b/charts/middleware/values.yaml
diff --git a/charts/persistentvolumes/templates/seed-media-persistentvolumeclaim.yaml b/charts/persistentvolumes/templates/seed-media-persistentvolumeclaim.yaml
@@ -10,5 +10,5 @@ spec:
   - ReadWriteOnce
   resources:
     requests:
-      storage: 100Mi
+      storage: 20Gi
 status: {}
diff --git a/charts/persistentvolumes/templates/seed-pgdata-persistentvolumeclaim.yaml b/charts/persistentvolumes/templates/seed-pgdata-persistentvolumeclaim.yaml
@@ -10,5 +10,5 @@ spec:
   - ReadWriteOnce
   resources:
     requests:
-      storage: 100Mi
+      storage: 50Gi
 status: {}
diff --git a/charts/seed-dev/.helmignore b/charts/seed-dev/.helmignore
diff --git a/charts/backend/Chart.yaml → charts/seed-dev/Chart.yaml b/charts/backend/Chart.yaml → charts/seed-dev/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: backend
+name: seed
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.

diff --git a/charts/seed-dev/templates/NOTES.txt b/charts/seed-dev/templates/NOTES.txt
diff --git a/charts/backend/templates/_helpers.tpl → charts/seed-dev/templates/_helpers.tpl b/charts/backend/templates/_helpers.tpl → charts/seed-dev/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "backend.name" -}}
+{{- define "seed.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "backend.fullname" -}}
+{{- define "seed.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "backend.chart" -}}
+{{- define "seed.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Common labels
 */}}
-{{- define "backend.labels" -}}
-helm.sh/chart: {{ include "backend.chart" . }}
-{{ include "backend.selectorLabels" . }}
+{{- define "seed.labels" -}}
+helm.sh/chart: {{ include "seed.chart" . }}
+{{ include "seed.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -46,17 +46,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "backend.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "backend.name" . }}
+{{- define "seed.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "seed.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "backend.serviceAccountName" -}}
+{{- define "seed.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
-    {{ default (include "backend.fullname" .) .Values.serviceAccount.name }}
+    {{ default (include "seed.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}

diff --git a/...end/templates/db-postgres-deployment.yaml → ...dev/templates/db-postgres-deployment.yaml b/...end/templates/db-postgres-deployment.yaml → ...dev/templates/db-postgres-deployment.yaml
@@ -28,8 +28,9 @@ spec:
         - name: POSTGRES_PASSWORD
           value: super-secret-password
         - name: POSTGRES_USER
-          value: seed
-        image: seedplatform/postgres-seed:11.2
+          value: seeduser
+        image: timescale/timescaledb-postgis:latest-pg12
+        imagePullPolicy: Always
         name: db-postrgres
 #        command: ["tail"]
 #        args: ['-f', '/dev/null']

diff --git a/...ackend/templates/db-postgres-service.yaml → ...ed-dev/templates/db-postgres-service.yaml b/...ackend/templates/db-postgres-service.yaml → ...ed-dev/templates/db-postgres-service.yaml
diff --git a/...ackend/templates/db-redis-deployment.yaml → ...ed-dev/templates/db-redis-deployment.yaml b/...ackend/templates/db-redis-deployment.yaml → ...ed-dev/templates/db-redis-deployment.yaml
diff --git a/charts/backend/templates/redis-service.yaml → charts/seed-dev/templates/redis-service.yaml b/charts/backend/templates/redis-service.yaml → charts/seed-dev/templates/redis-service.yaml
diff --git a/charts/seed-dev/templates/tests/test-connection.yaml b/charts/seed-dev/templates/tests/test-connection.yaml