Remove annotations and off-cluster redis

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

Hide file tree

Showing 12 changed files with 15 additions and 63 deletions.
diff --git a/config/local.yaml b/config/local.yaml
@@ -12,18 +12,18 @@ extensions:
     url: redis://localhost:6363
     connectionTimeout: 200
 watcher:
-  autoScalingPeriod: 10
+  autoScalingPeriod: 30
   lockKey: "maestro-lock-key"
   lockTimeoutMs: 180000
   gracefulShutdownTimeout: 300
 worker:
-  syncPeriod: 10
+  syncPeriod: 30
   gracefulShutdownTimeout: 300
-scaleUpTimeoutSeconds: 60
-scaleDownTimeoutSeconds: 60
-deleteTimeoutSeconds: 60
+scaleUpTimeoutSeconds: 300
+scaleDownTimeoutSeconds: 300
+deleteTimeoutSeconds: 600
 pingTimeout: 60
-updateTimeoutSeconds: 60
+updateTimeoutSeconds: 300
 sentry:
   url: ""
 newrelic:

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.3.2
+version: 2.4.0
 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
@@ -2,9 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: maestro-api
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "1"
 spec:
   selector:
     app: maestro-api
@@ -19,9 +16,6 @@ metadata:
   name: maestro-api
   labels:
     heritage: maestro-api
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "1"
 spec:
   replicas: 1
   template:

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.3.2
+version: 2.4.0
 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
@@ -5,9 +5,6 @@ metadata:
   labels:
     name: pg-config
     heritage: pg-config
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "3"
 spec:
   template:
     metadata:

diff --git a/helm/charts/maestro-postgres/templates/config.yaml b/helm/charts/maestro-postgres/templates/config.yaml
diff --git a/helm/charts/maestro-postgres/templates/maestro-postgres.yaml b/helm/charts/maestro-postgres/templates/maestro-postgres.yaml
@@ -6,8 +6,6 @@ metadata:
   labels:
     name: maestro-postgres
   name: maestro-postgres
-  annotations:
-    "helm.sh/hook": pre-install
 spec:
   ports:
     - port: 5432
@@ -21,8 +19,6 @@ metadata:
   name: maestro-postgres
   labels:
     heritage: maestro-postgres
-  annotations:
-    "helm.sh/hook": pre-install
 spec:
   replicas: 1
   template:

diff --git a/helm/charts/maestro-redis/templates/maestro-redis.yaml b/helm/charts/maestro-redis/templates/maestro-redis.yaml
@@ -1,3 +1,4 @@
+{{- if eq .Values.global.redis_location "on-cluster" }}
 ---
 apiVersion: v1
 kind: Service
@@ -30,3 +31,4 @@ spec:
           - redis-server 
         ports:
           - containerPort: 6379
+{{- end}}
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.3.2
+version: 2.4.0
 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
@@ -5,9 +5,6 @@ metadata:
   name: maestro-worker
   labels:
     heritage: maestro-worker
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "2"
 spec:
   replicas: 1
   template:

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.5
+version: 0.1.7
 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.3.2
+    version: 2.4.0
     repository: http://helm.tfgco.com
   - name: maestro-worker
-    version: 2.3.2
+    version: 2.4.0
     repository: http://helm.tfgco.com
   - name: maestro-db-config
-    version: 2.3.2
+    version: 2.4.0
     repository: http://helm.tfgco.com