fix nginx ingress patch typo and largerd db size a bit

google38438 · Jan 10, 2019 · e2d7c46 · e2d7c46
1 parent 91fa969
commit e2d7c46
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/acceptancetests/assess_caas_deploy_charms.py b/acceptancetests/assess_caas_deploy_charms.py
@@ -191,7 +191,7 @@ def assess_caas_charm_deployment(client):
     caas_client.kubectl(
         'patch', 'daemonset.apps/nginx-ingress-kubernetes-worker-controller', '--patch',
         '''
-        {"spec": {"template": {"spec": {"containers": [{"name": "nginx-ingress-kubernetes-worker","args": ["/nginx-ingress-controller", "--default-backend-service=$(POD_NAMESPACE)/default-http-backend", "--configmap=$(POD_NAMESPACE)/nginx-load-balancer-conf", "---enable-ssl-chain-completion=False", "--publish-status-address=%s"]}]}}}}
+        {"spec": {"template": {"spec": {"containers": [{"name": "nginx-ingress-kubernetes-worker","args": ["/nginx-ingress-controller", "--default-backend-service=$(POD_NAMESPACE)/default-http-backend", "--configmap=$(POD_NAMESPACE)/nginx-load-balancer-conf", "--enable-ssl-chain-completion=False", "--publish-status-address=%s"]}]}}}}
         ''' % caas_client.get_first_worker_ip()
     )
 
@@ -228,7 +228,7 @@ def assess_caas_charm_deployment(client):
 
     k8s_model.deploy(
         charm="cs:~juju/mariadb-k8s-0",
-        storage='database=10M,{pool_name}'.format(pool_name=mariadb_storage_pool_name),
+        storage='database=100M,{pool_name}'.format(pool_name=mariadb_storage_pool_name),
     )
 
     k8s_model.juju('relate', ('mariadb-k8s', 'gitlab-k8s'))
@@ -241,9 +241,6 @@ def assess_caas_charm_deployment(client):
     log.info(caas_client.kubectl('get', 'all', '--all-namespaces'))
     k8s_model.juju(k8s_model._show_status, ('--format', 'tabular'))
 
-    # destroy model to peacefully exit.
-    k8s_model.destroy_model()
-
 
 def parse_args(argv):
     """Parse all arguments."""