Merge branch '18278-GKE-fixes'

refs #18278

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/charts/arvados/templates/postgres-deployment.yaml b/charts/arvados/templates/postgres-deployment.yaml
index d820e8eeff69e94ab909e21d91a9099c9d8e4139..2d7489f5bc439f201966e0f592a41f87634d179f 100644 (file)
--- a/charts/arvados/templates/postgres-deployment.yaml
+++ b/charts/arvados/templates/postgres-deployment.yaml
@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 1
       containers:
         - name: {{ .Chart.Name }}
-          image: "postgres:9.5"
+          image: "postgres:10"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: POSTGRES_HOST_AUTH_METHOD
@@ -39,7 +39,7 @@ spec:
               subPath: create_dbs.sh
             {{- if .Values.postgres.persistence.enabled }}
             - name: postgres-storage
-              mountPath: /var/lib/postgresql/data
+              mountPath: /var/lib/postgresql
             {{- end }}
       volumes:
         - name: postgres-configmap

diff --git a/tests/GKE.sh b/tests/GKE.sh
index 07ee1170bd49381687e52403aa3970de53f1a18c..0d9adaa4e4530975ed9d51f7bb1894e59ed59f87 100755 (executable)
--- a/tests/GKE.sh
+++ b/tests/GKE.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 set -e
 
 DEBUG=$1
@@ -32,7 +36,7 @@ startK8s() {
   CLUSTER=`gcloud container clusters describe arvados --zone us-central1-a 2>/dev/null`
   set -e
   if [[ -z "$CLUSTER" ]]; then
-    gcloud container clusters create arvados --zone us-central1-a --machine-type n1-standard-2 --cluster-version 1.15
+    gcloud container clusters create arvados --zone us-central1-a --machine-type n1-standard-2
   fi
 
   set +e