From 3af68e79d542fa07cef20218efa4edb4f298648d Mon Sep 17 00:00:00 2001
From: Kaspars Skels <kaspars.skels@gmail.com>
Date: Tue, 13 Feb 2018 17:44:00 -0600
Subject: [PATCH] Few fixes for chart values

Remove unused database vars for maas chart
Set default images using quay
Allow export key job to log more info

Change-Id: I71b6ef0e3a08136b748b626de004078f2913e269
---
 charts/maas/templates/bin/_export-api-key.sh.tpl |  5 +++--
 charts/maas/values.yaml                          | 16 ++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/charts/maas/templates/bin/_export-api-key.sh.tpl b/charts/maas/templates/bin/_export-api-key.sh.tpl
index 9c776d1..c697658 100644
--- a/charts/maas/templates/bin/_export-api-key.sh.tpl
+++ b/charts/maas/templates/bin/_export-api-key.sh.tpl
@@ -35,7 +35,7 @@ function post_secret {
         --method=POST \
         --body-file=/tmp/secret.json \
         https://kubernetes.default.svc.cluster.local/api/v1/namespaces/${SECRET_NAMESPACE}/secrets \
-        2>&1 | grep -E "HTTP/1.1 (201 Created|409 Conflict)"
+        2>&1
 }
 
 KEY=$(maas-region apikey --username=${ADMIN_USERNAME})
@@ -64,7 +64,8 @@ EOS
             echo 'Secret exists, clearing before trying again'
             clear_secret
         else
-          echo Secret creation failed
+          echo 'Secret creation failed'
+          echo $result
         fi
         sleep 15
     done
diff --git a/charts/maas/values.yaml b/charts/maas/values.yaml
index 5e00650..05b73f4 100644
--- a/charts/maas/values.yaml
+++ b/charts/maas/values.yaml
@@ -70,12 +70,12 @@ manifests:
 images:
   tags:
     db_init: docker.io/postgres:9.5
-    db_sync: sthussey/maas-region-controller:2.3_patchv4
-    maas_rack: sthussey/maas-rack-controller:2.3
-    maas_region: sthussey/maas-region-controller:2.3_patchv4
-    bootstrap: sthussey/maas-region-controller:2.3_patchv4
-    export_api_key: sthussey/maas-region-controller:2.3_patchv4
-    maas_cache: quay.io/attcomdev/maas-cache:master
+    db_sync: quay.io/attcomdev/maas-region-controller:latest
+    maas_rack: quay.io/attcomdev/maas-rack-controller:latest
+    maas_region: quay.io/attcomdev/maas-region-controller:latest
+    bootstrap: quay.io/attcomdev/maas-region-controller:latest
+    export_api_key: quay.io/attcomdev/maas-region-controller:latest
+    maas_cache: quay.io/attcomdev/sstream-cache:latest
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
   pull_policy: IfNotPresent
 
@@ -143,10 +143,6 @@ conf:
       peer_proxy_enabled: false
       # An external proxy server to use
       proxy_server: null
-    database:
-      database_name: maasdb
-      database_user: maas
-      database_password: password
     images:
       default_os: 'ubuntu'
       default_image: 'xenial'