Use only one values.yaml

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

Hide file tree

Showing 12 changed files with 27 additions and 48 deletions.
diff --git a/helm/charts/maestro-api/Chart.yaml b/helm/charts/maestro-api/Chart.yaml
@@ -1,7 +1,7 @@
 name: maestro-api
 home: https://github.com/topfreegames/maestro
 description: Maestro
-version: 2.4.0
+version: 2.4.1
 maintainers:
   - name: TFGCo
     email: backend@tfgco.com
diff --git a/helm/charts/maestro-api/templates/maestro-api.yaml b/helm/charts/maestro-api/templates/maestro-api.yaml
@@ -35,20 +35,20 @@ spec:
             - containerPort: 80
           env:
             - name: MAESTRO_EXTENSIONS_PG_HOST
-              value: {{ .Values.postgres_host }}
+              value: {{ .Values.maestro.postgres_host }}
             - name: MAESTRO_EXTENSIONS_PG_PORT
-              value: "{{ .Values.postgres_port }}"
+              value: "{{ .Values.maestro.postgres_port }}"
             - name: MAESTRO_EXTENSIONS_PG_USER
-              value: {{ .Values.postgres_user }}
+              value: {{ .Values.maestro.postgres_user }}
             - name: MAESTRO_EXTENSIONS_PG_PASS
-              value: {{ .Values.postgres_password }}
+              value: {{ .Values.maestro.postgres_password }}
             - name: MAESTRO_EXTENSIONS_PG_DATABASE
-              value: {{ .Values.postgres_dbname }}
+              value: {{ .Values.maestro.postgres_database }}
             - name: MAESTRO_GOOGLE_CLIENT_ID
-              value: {{ .Values.google_clientid }}
+              value: {{ .Values.maestro.google_clientid }}
             - name: MAESTRO_GOOGLE_CLIENT_SECRET
-              value: {{ .Values.google_clientsecret }}
+              value: {{ .Values.maestro.google_clientsecret }}
             - name: MAESTRO_OAUTH_ACCEPTEDDOMAINS
-              value: {{ .Values.oauth_domains }}
+              value: {{ .Values.maestro.oauth_domains }}
             - name: MAESTRO_EXTENSIONS_REDIS_URL
-              value: {{ .Values.redis_url }}
+              value: {{ .Values.maestro.redis_url }}
diff --git a/helm/charts/maestro-api/values.yaml b/helm/charts/maestro-api/values.yaml
@@ -1,8 +0,0 @@
-postgres_host: maestro-postgres
-postgres_port: "5432"
-postgres_user: maestro
-postgres_database: maestro
-redis_url: redis://:@maestro-redis:6379
-google_clientid: ""
-google_clientsecret: ""
-oauth_domains: "example.com other.com"

diff --git a/helm/charts/maestro-db-config/Chart.yaml b/helm/charts/maestro-db-config/Chart.yaml
@@ -1,7 +1,7 @@
 name: maestro-db-config
 home: https://github.com/topfreegames/maestro
 description: Configre Maestro databse
-version: 2.4.0
+version: 2.4.1
 maintainers:
   - name: TFGCo
     email: backend@tfgco.com
diff --git a/helm/charts/maestro-db-config/templates/maestro-db-config.yaml b/helm/charts/maestro-db-config/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.postgres_host }}
+            value: {{ .Values.maestro.postgres_host }}
           - name: MAESTRO_EXTENSIONS_PG_PORT
-            value: "{{ .Values.postgres_port }}"
+            value: "{{ .Values.maestro.postgres_port }}"
           - name: MAESTRO_EXTENSIONS_PG_USER
-            value: {{ .Values.postgres_user }}
+            value: {{ .Values.maestro.postgres_user }}
           - name: MAESTRO_EXTENSIONS_PG_PASS
-            value: {{ .Values.postgres_password }}
+            value: {{ .Values.maestro.postgres_password }}
           - name: MAESTRO_EXTENSIONS_PG_DATABASE
-            value: {{ .Values.postgres_database }}
+            value: {{ .Values.maestro.postgres_database }}
           - name: MAESTRO_RUN_SETUP
             value: "true"
diff --git a/helm/charts/maestro-db-config/values.yaml b/helm/charts/maestro-db-config/values.yaml
@@ -1,4 +0,0 @@
-postgres_host: maestro-postgres
-postgres_port: "5432"
-postgres_user: maestro
-postgres_database: maestro

diff --git a/helm/charts/maestro-postgres/values.yaml b/helm/charts/maestro-postgres/values.yaml
@@ -1,4 +0,0 @@
-postgres_host: maestro-postgres
-postgres_port: "5432"
-postgres_user: maestro
-postgres_database: maestro

diff --git a/helm/charts/maestro-worker/Chart.yaml b/helm/charts/maestro-worker/Chart.yaml
@@ -1,7 +1,7 @@
 name: maestro-worker
 home: https://github.com/topfreegames/maestro
 description: Maestro
-version: 2.4.0
+version: 2.4.1
 maintainers:
   - name: TFGCo
     email: backend@tfgco.com
diff --git a/helm/charts/maestro-worker/templates/maestro-worker.yaml b/helm/charts/maestro-worker/templates/maestro-worker.yaml
@@ -22,14 +22,14 @@ spec:
           imagePullPolicy: Always
           env:
             - name: MAESTRO_EXTENSIONS_PG_HOST
-              value: {{ .Values.postgres_host }}
+              value: {{ .Values.maestro.postgres_host }}
             - name: MAESTRO_EXTENSIONS_PG_PORT
-              value: "{{ .Values.postgres_port }}"
+              value: "{{ .Values.maestro.postgres_port }}"
             - name: MAESTRO_EXTENSIONS_PG_USER
-              value: {{ .Values.postgres_user }}
+              value: {{ .Values.maestro.postgres_user }}
             - name: MAESTRO_EXTENSIONS_PG_PASS
-              value: {{ .Values.postgres_password }}
+              value: {{ .Values.maestro.postgres_password }}
             - name: MAESTRO_EXTENSIONS_PG_DATABASE
-              value: {{ .Values.postgres_database }}
+              value: {{ .Values.maestro.postgres_database }}
             - name: MAESTRO_EXTENSIONS_REDIS_URL
-              value: {{ .Values.redis_url }}
+              value: {{ .Values.maestro.redis_url }}
diff --git a/helm/charts/maestro-worker/values.yaml b/helm/charts/maestro-worker/values.yaml
@@ -1,5 +0,0 @@
-postgres_host: maestro-postgres
-postgres_port: "5432"
-postgres_user: maestro
-postgres_database: maestro
-redis_url: redis://:@maestro-redis:6379

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.7
+version: 0.1.8
 maintainers:
   - name: TFGCo
     email: backend@tfgco.com
diff --git a/helm/charts/maestro/requirements.yaml b/helm/charts/maestro/requirements.yaml
@@ -6,11 +6,11 @@ dependencies:
     version: 0.1.0
     repository: http://helm.tfgco.com
   - name: maestro-api
-    version: 2.4.0
+    version: 2.4.1
     repository: http://helm.tfgco.com
   - name: maestro-worker
-    version: 2.4.0
+    version: 2.4.1
     repository: http://helm.tfgco.com
   - name: maestro-db-config
-    version: 2.4.0
+    version: 2.4.1
     repository: http://helm.tfgco.com