Aggregate helms

topfreegames · Jun 13, 2017 · 96acf0c · 96acf0c
1 parent 1f83d1a
commit 96acf0c
Show file tree

Hide file tree

Showing 19 changed files with 43 additions and 90 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -43,5 +43,6 @@ ENV MAESTRO_RUN_SETUP ""
 ENV MAESTRO_EXTENSIONS_PG_HOST "maestro-postgres"
 ENV MAESTRO_EXTENSIONS_PG_PORT "5432"
 ENV MAESTRO_EXTENSIONS_PG_USER "maestro"
+ENV MAESTRO_EXTENSIONS_PG_PASS "pass"
 
-CMD if [ "$MAESTRO_RUN_SETUP" != "true" ]; then /app/maestro start; else sleep 10 && psql -U $MAESTRO_EXTENSIONS_PG_USER -h $MAESTRO_EXTENSIONS_PG_HOST -p $MAESTRO_EXTENSIONS_PG_PORT -f /app/scripts/drop.sql && make assets && /app/maestro migrate -c /app/config/local.yaml; fi
+CMD if [ "$MAESTRO_RUN_SETUP" != "true" ]; then /app/maestro start; else sleep 10 && psql -U $MAESTRO_EXTENSIONS_PG_USER -P $MAESTRO_EXTENSIONS_PG_PASS -h $MAESTRO_EXTENSIONS_PG_HOST -p $MAESTRO_EXTENSIONS_PG_PORT -f /app/scripts/drop.sql && make assets && /app/maestro migrate -c /app/config/local.yaml; fi
diff --git a/helm/charts/maestro-api/values.yaml b/helm/charts/maestro-api/values.yaml
diff --git a/helm/charts/maestro-db-config/.helmignore b/helm/charts/maestro-db-config/.helmignore
diff --git a/helm/charts/maestro-db-config/Chart.yaml b/helm/charts/maestro-db-config/Chart.yaml
diff --git a/helm/charts/maestro-db-config/values.yaml b/helm/charts/maestro-db-config/values.yaml
diff --git a/helm/charts/maestro-api/.helmignore → helm/charts/maestro-main/.helmignore b/helm/charts/maestro-api/.helmignore → helm/charts/maestro-main/.helmignore
diff --git a/helm/charts/maestro-api/Chart.yaml → helm/charts/maestro-main/Chart.yaml b/helm/charts/maestro-api/Chart.yaml → helm/charts/maestro-main/Chart.yaml
@@ -1,7 +1,7 @@
-name: maestro-api
+name: maestro-main
 home: https://github.com/topfreegames/maestro
-description: Maestro
-version: 2.4.1
+description: Maestro api and worker
+version: 2.5.0
 maintainers:
   - name: TFGCo
     email: backend@tfgco.com
diff --git a/...ts/maestro-api/templates/maestro-api.yaml → ...s/maestro-main/templates/maestro-api.yaml b/...ts/maestro-api/templates/maestro-api.yaml → ...s/maestro-main/templates/maestro-api.yaml
@@ -35,20 +35,20 @@ spec:
             - containerPort: 80
           env:
             - name: MAESTRO_EXTENSIONS_PG_HOST
-              value: {{ .Values.maestro.postgres_host }}
+              value: {{ .Values.postgres_host }}
             - name: MAESTRO_EXTENSIONS_PG_PORT
-              value: "{{ .Values.maestro.postgres_port }}"
+              value: "{{ .Values.postgres_port }}"
             - name: MAESTRO_EXTENSIONS_PG_USER
-              value: {{ .Values.maestro.postgres_user }}
+              value: {{ .Values.postgres_user }}
             - name: MAESTRO_EXTENSIONS_PG_PASS
-              value: {{ .Values.maestro.postgres_password }}
+              value: {{ .Values.postgres_password }}
             - name: MAESTRO_EXTENSIONS_PG_DATABASE
-              value: {{ .Values.maestro.postgres_database }}
+              value: {{ .Values.postgres_database }}
             - name: MAESTRO_GOOGLE_CLIENT_ID
-              value: {{ .Values.maestro.google_clientid }}
+              value: {{ .Values.google_clientid }}
             - name: MAESTRO_GOOGLE_CLIENT_SECRET
-              value: {{ .Values.maestro.google_clientsecret }}
+              value: {{ .Values.google_clientsecret }}
             - name: MAESTRO_OAUTH_ACCEPTEDDOMAINS
-              value: {{ .Values.maestro.oauth_domains }}
+              value: {{ .Values.oauth_domains }}
             - name: MAESTRO_EXTENSIONS_REDIS_URL
-              value: {{ .Values.maestro.redis_url }}
+              value: {{ .Values.redis_url }}
diff --git a/...b-config/templates/maestro-db-config.yaml → ...tro-main/templates/maestro-db-config.yaml b/...b-config/templates/maestro-db-config.yaml → ...tro-main/templates/maestro-db-config.yaml
@@ -18,14 +18,14 @@ spec:
         image: quay.io/tfgco/maestro:v{{ .Chart.Version }}
         env:
           - name: MAESTRO_EXTENSIONS_PG_HOST
-            value: {{ .Values.maestro.postgres_host }}
+            value: {{ .Values.postgres_host }}
           - name: MAESTRO_EXTENSIONS_PG_PORT
-            value: "{{ .Values.maestro.postgres_port }}"
+            value: "{{ .Values.postgres_port }}"
           - name: MAESTRO_EXTENSIONS_PG_USER
-            value: {{ .Values.maestro.postgres_user }}
+            value: {{ .Values.postgres_user }}
           - name: MAESTRO_EXTENSIONS_PG_PASS
-            value: {{ .Values.maestro.postgres_password }}
+            value: {{ .Values.postgres_password }}
           - name: MAESTRO_EXTENSIONS_PG_DATABASE
-            value: {{ .Values.maestro.postgres_database }}
+            value: {{ .Values.postgres_database }}
           - name: MAESTRO_RUN_SETUP
             value: "true"
diff --git a/...stro-worker/templates/maestro-worker.yaml → ...aestro-main/templates/maestro-worker.yaml b/...stro-worker/templates/maestro-worker.yaml → ...aestro-main/templates/maestro-worker.yaml
@@ -22,14 +22,14 @@ spec:
           imagePullPolicy: Always
           env:
             - name: MAESTRO_EXTENSIONS_PG_HOST
-              value: {{ .Values.maestro.postgres_host }}
+              value: {{ .Values.postgres_host }}
             - name: MAESTRO_EXTENSIONS_PG_PORT
-              value: "{{ .Values.maestro.postgres_port }}"
+              value: "{{ .Values.postgres_port }}"
             - name: MAESTRO_EXTENSIONS_PG_USER
-              value: {{ .Values.maestro.postgres_user }}
+              value: {{ .Values.postgres_user }}
             - name: MAESTRO_EXTENSIONS_PG_PASS
-              value: {{ .Values.maestro.postgres_password }}
+              value: {{ .Values.postgres_password }}
             - name: MAESTRO_EXTENSIONS_PG_DATABASE
-              value: {{ .Values.maestro.postgres_database }}
+              value: {{ .Values.postgres_database }}
             - name: MAESTRO_EXTENSIONS_REDIS_URL
-              value: {{ .Values.maestro.redis_url }}
+              value: {{ .Values.redis_url }}
diff --git a/helm/charts/maestro-main/values.yaml b/helm/charts/maestro-main/values.yaml
@@ -0,0 +1,9 @@
+postgres_host: maestro-postgres
+postgres_port: "5432"
+postgres_user: maestro
+postgres_database: maestro
+postgres_password: ""
+redis_url: redis://:@maestro-redis:6379
+google_clientid: ""
+google_clientsecret: ""
+oauth_domains: "example.com other.com"
diff --git a/helm/charts/maestro-postgres/values.yaml b/helm/charts/maestro-postgres/values.yaml
@@ -0,0 +1,4 @@
+postgres_host: maestro-postgres
+postgres_port: "5432"
+postgres_user: maestro
+postgres_database: maestro
diff --git a/helm/charts/maestro-redis/values.yaml b/helm/charts/maestro-redis/values.yaml
@@ -0,0 +1 @@
+redis_url: redis://:@maestro-redis:6379
diff --git a/helm/charts/maestro-worker/.helmignore b/helm/charts/maestro-worker/.helmignore
diff --git a/helm/charts/maestro-worker/Chart.yaml b/helm/charts/maestro-worker/Chart.yaml
diff --git a/helm/charts/maestro-worker/values.yaml b/helm/charts/maestro-worker/values.yaml
diff --git a/helm/charts/maestro/Chart.yaml b/helm/charts/maestro/Chart.yaml
@@ -1,7 +1,7 @@
 name: maestro
 home: https://github.com/topfreegames/maestro
 description: Maestro
-version: 0.1.8
+version: 0.1.9
 maintainers:
   - name: TFGCo
     email: backend@tfgco.com
diff --git a/helm/charts/maestro/requirements.yaml b/helm/charts/maestro/requirements.yaml
@@ -5,12 +5,6 @@ dependencies:
   - name: maestro-postgres
     version: 0.1.0
     repository: http://helm.tfgco.com
-  - name: maestro-api
-    version: 2.4.1
-    repository: http://helm.tfgco.com
-  - name: maestro-worker
-    version: 2.4.1
-    repository: http://helm.tfgco.com
-  - name: maestro-db-config
-    version: 2.4.1
+  - name: maestro-main
+    version: 2.5.0
     repository: http://helm.tfgco.com
diff --git a/helm/charts/maestro/values.yaml b/helm/charts/maestro/values.yaml
@@ -1,6 +1,6 @@
 global:
   database_location: "on-cluster"
-maestro:
+maestro-main:
   postgres_host: maestro-postgres
   postgres_port: "5432"
   postgres_user: maestro