Bug fixes: job image and scale down

helm/charts/maestro-api/Chart.yaml

@@ -1,7 +1,7 @@
 name: maestro-api
 home: https://github.com/topfreegames/maestro
 description: Maestro
-version: 2.3.1
+version: 2.3.2
 maintainers:
   - name: TFGCo
     email: backend@tfgco.com

helm/charts/maestro-db-config/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

helm/charts/maestro-db-config/Chart.yaml

@@ -0,0 +1,7 @@
+name: maestro-db-config
+home: https://github.com/topfreegames/maestro
+description: Configre Maestro databse
+version: 2.3.2
+maintainers:
+  - name: TFGCo
+    email: backend@tfgco.com

helm/charts/maestro-db-config/templates/maestro-db-config.yaml

@@ -0,0 +1,34 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: pg-config
+  labels:
+    name: pg-config
+    heritage: pg-config
+  annotations:
+    "helm.sh/hook": post-install
+    "helm.sh/hook-weight": "3"
+spec:
+  template:
+    metadata:
+      name: pg-config
+      labels:
+        name: pg-config
+    spec:
+      restartPolicy: OnFailure
+      containers:
+      - name: pg-config
+        image: quay.io/tfgco/maestro:v{{ .Chart.Version }}
+        env:
+          - name: MAESTRO_EXTENSIONS_PG_HOST
+            value: {{ .Values.postgres_host }}
+          - name: MAESTRO_EXTENSIONS_PG_PORT
+            value: "{{ .Values.postgres_port }}"
+          - name: MAESTRO_EXTENSIONS_PG_USER
+            value: {{ .Values.postgres_user }}
+          - name: MAESTRO_EXTENSIONS_PG_PASS
+            value: {{ .Values.postgres_password }}
+          - name: MAESTRO_EXTENSIONS_PG_DATABASE
+            value: {{ .Values.postgres_database }}
+          - name: MAESTRO_RUN_SETUP
+            value: "true"

helm/charts/maestro-db-config/values.yaml

@@ -0,0 +1,4 @@
+postgres_host: maestro-postgres
+postgres_port: "5432"
+postgres_user: maestro
+postgres_database: maestro

helm/charts/maestro-postgres/templates/config.yaml

@@ -15,7 +15,7 @@ spec:
       labels:
         name: pg-config
     spec:
-      restartPolicy: Always
+      restartPolicy: OnFailure
       containers:
       - name: pg-config
         image: quay.io/tfgco/maestro:v{{ .Chart.Version }}

helm/charts/maestro-worker/Chart.yaml

@@ -1,7 +1,7 @@
 name: maestro-worker
 home: https://github.com/topfreegames/maestro
 description: Maestro
-version: 2.3.1
+version: 2.3.2
 maintainers:
   - name: TFGCo
     email: backend@tfgco.com

helm/charts/maestro/Chart.yaml

@@ -1,7 +1,7 @@
 name: maestro
 home: https://github.com/topfreegames/maestro
 description: Maestro
-version: 0.1.4
+version: 0.1.5
 maintainers:
   - name: TFGCo
     email: backend@tfgco.com

helm/charts/maestro/requirements.yaml

@@ -6,8 +6,11 @@ dependencies:
     version: 0.1.0
     repository: http://helm.tfgco.com
   - name: maestro-api
-    version: 2.3.1
+    version: 2.3.2
     repository: http://helm.tfgco.com
   - name: maestro-worker
-    version: 2.3.1
+    version: 2.3.2
+    repository: http://helm.tfgco.com
+  - name: maestro-db-config
+    version: 2.3.2
     repository: http://helm.tfgco.com

metadata/version.go

@@ -8,7 +8,7 @@
 package metadata
 
 //Version of Maestro
-var Version = "1.0.0"
+var Version = "2.3.2"
 
 //KubeVersion is the desired Kubernetes version
 var KubeVersion = "v1.6.4"

watcher/watcher.go

@@ -249,7 +249,7 @@ func (w *Watcher) AutoScale() {
 			w.RedisClient.Client,
 			w.KubernetesClient,
 			scheduler,
-			autoScalingInfo.Up.Delta,
+			autoScalingInfo.Down.Delta,
 			timeoutSec,
 		)
 		scheduler.State = models.StateInSync

watcher/watcher_test.go

@@ -513,7 +513,7 @@ var _ = Describe("Watcher", func() {
 			err = controller.ScaleUp(logger, mr, mockDb, mockRedisClient, clientset, scheduler, scaleUpAmount, timeoutSec, true)
 
 			// ScaleDown
-			scaleDownAmount := 2
+			scaleDownAmount := configYaml1.AutoScaling.Down.Delta
 			names, err := controller.GetServiceNames(scaleDownAmount, scheduler.Name, clientset)
 			Expect(err).NotTo(HaveOccurred())
 			mockRedisClient.EXPECT().