From: Ward Vandewege <wvandewege@veritasgenetics.com>
Date: Mon, 21 May 2018 19:08:06 +0000 (-0400)
Subject: helm: Make the package versions part of the values.yaml file.
X-Git-Url: https://git.arvados.org/arvados-k8s.git/commitdiff_plain/18f0d7866fb9a02ceb2fcb95fab9b39b48bf8ce0

helm: Make the package versions part of the values.yaml file.
helm: Make the external IP part of the values.yaml file.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>
---

diff --git a/arvados/cert-gen.sh b/arvados/cert-gen.sh
index aba4432..8558cb3 100755
--- a/arvados/cert-gen.sh
+++ b/arvados/cert-gen.sh
@@ -6,7 +6,7 @@
 
 if [[ -z $1 ]] ; then
     echo "ERROR: A floating IP must be supplied."
-    echo "Usage: $0 <floatingIP>"
+    echo "Usage: $0 <externalIP>"
     exit 1
 fi
 
diff --git a/arvados/config/api-server/application.yml b/arvados/config/api-server/application.yml
index 4616d27..08a87c5 100644
--- a/arvados/config/api-server/application.yml
+++ b/arvados/config/api-server/application.yml
@@ -42,7 +42,7 @@ common:
   # sso-provider).
   sso_app_secret: app_secret
   sso_app_id: arvados-server
-  sso_provider_url: http://8.8.8.8:3002
+  sso_provider_url: http://{{ .Values.externalIP }}:3002
 
   # If this is not false, HTML requests at the API server's root URL
   # are redirected to this location, and it is provided in the text of
@@ -60,7 +60,7 @@ common:
   #
   # Example:
   #websocket_address: wss://ws.zzzzz.arvadosapi.com/websocket
-  websocket_address: wss://8.8.8.8:9003/websocket
+  websocket_address: wss://{{ .Values.externalIP }}:9003/websocket
 
   # Maximum number of websocket connections allowed
   websocket_max_connections: 500
diff --git a/arvados/config/api-server/create-workbench-api-client.rb b/arvados/config/api-server/create-workbench-api-client.rb
index b5fdf30..379b65a 100644
--- a/arvados/config/api-server/create-workbench-api-client.rb
+++ b/arvados/config/api-server/create-workbench-api-client.rb
@@ -4,7 +4,7 @@
 
 include CurrentApiClient
 act_as_system_user do
-  wb = ApiClient.new(:url_prefix => "8.8.8.8")
+  wb = ApiClient.new(:url_prefix => "{{ .Values.externalIP }}")
   wb.save!
   wb.update_attributes!(is_trusted: true)
 end
diff --git a/arvados/config/shell-server/99-init-keep.sh b/arvados/config/shell-server/99-init-keep.sh
index 1a20c1f..093995e 100644
--- a/arvados/config/shell-server/99-init-keep.sh
+++ b/arvados/config/shell-server/99-init-keep.sh
@@ -27,7 +27,7 @@ EOF
 
 arv keep_service create --keep-service "$(cat <<EOF
 {
- "service_host":"8.8.8.8",
+ "service_host":"{{ .Values.externalIP }}",
  "service_port":25107,
  "service_ssl_flag":true,
  "service_type":"proxy"
diff --git a/arvados/config/workbench/application.yml b/arvados/config/workbench/application.yml
index 111a3da..cb332b5 100644
--- a/arvados/config/workbench/application.yml
+++ b/arvados/config/workbench/application.yml
@@ -32,11 +32,11 @@ production:
   secret_token: 69f1fd650250e925cb1d9428094add92
 
   # You probably also want to point to your API server.
-  arvados_login_base: https://8.8.8.8:444/login
-  arvados_v1_base: https://8.8.8.8:444/arvados/v1
+  arvados_login_base: https://{{ .Values.externalIP }}:444/login
+  arvados_v1_base: https://{{ .Values.externalIP }}:444/arvados/v1
   arvados_insecure_https: true # TODO: Change this to false.
 
   # You need to configure at least one of these:
-  keep_web_url: https://8.8.8.8:9002/c=%{uuid_or_pdh}
-  keep_web_download_url: https://8.8.8.8:9002/c=%{uuid_or_pdh}
+  keep_web_url: https://{{ .Values.externalIP }}:9002/c=%{uuid_or_pdh}
+  keep_web_download_url: https://{{ .Values.externalIP }}:9002/c=%{uuid_or_pdh}
   trust_all_content: true # TODO: remove this.
diff --git a/arvados/templates/api-server-configmap.yaml b/arvados/templates/api-server-configmap.yaml
index d1f3818..3465e18 100644
--- a/arvados/templates/api-server-configmap.yaml
+++ b/arvados/templates/api-server-configmap.yaml
@@ -12,4 +12,4 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-{{ (.Files.Glob "config/api-server/*").AsConfig | indent 2 }}
+{{ (tpl (.Files.Glob "config/api-server/*").AsConfig . ) | indent 2 }}
diff --git a/arvados/templates/api-server-deployment.yaml b/arvados/templates/api-server-deployment.yaml
index 95027ce..94c3a1f 100644
--- a/arvados/templates/api-server-deployment.yaml
+++ b/arvados/templates/api-server-deployment.yaml
@@ -30,7 +30,7 @@ spec:
           command:
             - "sh"
             - "-c"
-            - "install /init-scripts/*.sh /etc/my_init.d && /usr/local/bin/bootstrap.sh arvados-api-server=1.1.3.20180405021932* && cd /var/www/arvados-api/current && exec /sbin/my_init"
+            - "install /init-scripts/*.sh /etc/my_init.d && /usr/local/bin/bootstrap.sh arvados-api-server={{ .Values.arvados.versions.distribution.arvadosApiServer }} && cd /var/www/arvados-api/current && exec /sbin/my_init"
           env:
             - name: RAILS_ENV
               value: "production"
diff --git a/arvados/templates/api-server-service.yaml b/arvados/templates/api-server-service.yaml
index bbb003f..0582af2 100644
--- a/arvados/templates/api-server-service.yaml
+++ b/arvados/templates/api-server-service.yaml
@@ -13,7 +13,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   type: LoadBalancer
-  loadBalancerIP: "8.8.8.8"
+  loadBalancerIP: {{ required "A valid externalIP is required!" .Values.externalIP }}
   ports:
   - name: http
     port: 444
diff --git a/arvados/templates/keep-proxy-deployment.yaml b/arvados/templates/keep-proxy-deployment.yaml
index dad4fac..4d2b3b9 100644
--- a/arvados/templates/keep-proxy-deployment.yaml
+++ b/arvados/templates/keep-proxy-deployment.yaml
@@ -31,11 +31,10 @@ spec:
           command:
             - "sh"
             - "-c"
-            # TODO: the apt-get update should be run in the Dockerfile
-            - "apt-get update && /usr/local/bin/bootstrap.sh keepproxy=1.1.3.20180404192345* && keepproxy"
+            - "/usr/local/bin/bootstrap.sh keepproxy={{ .Values.arvados.versions.distribution.keepProxy }} && keepproxy"
           env:
             - name : ARVADOS_API_HOST
-              value: "8.8.8.8:444"
+              value: "{{ .Values.externalIP }}:444"
             - name : ARVADOS_API_HOST_INSECURE
               value: "true"
             - name : ARVADOS_API_TOKEN
diff --git a/arvados/templates/keep-proxy-https.yaml b/arvados/templates/keep-proxy-https.yaml
index 2a90519..9c6b1af 100644
--- a/arvados/templates/keep-proxy-https.yaml
+++ b/arvados/templates/keep-proxy-https.yaml
@@ -99,7 +99,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   type: LoadBalancer
-  loadBalancerIP: "8.8.8.8"
+  loadBalancerIP: {{ required "A valid externalIP is required!" .Values.externalIP }}
   ports:
   - name: https
     port: 25107
diff --git a/arvados/templates/keep-store-deployment.yaml b/arvados/templates/keep-store-deployment.yaml
index 92a80e3..c1224e4 100644
--- a/arvados/templates/keep-store-deployment.yaml
+++ b/arvados/templates/keep-store-deployment.yaml
@@ -31,8 +31,7 @@ spec:
           command:
             - "sh"
             - "-c"
-            # TODO: the apt-get update should be run in the Dockerfile
-            - "apt-get update && mkdir /keepdata && /usr/local/bin/bootstrap.sh keepstore=1.1.3.20180404192345* && GOGC=10 keepstore -enforce-permissions=true -blob-signing-key-file=/etc/keepstore/blob-signing.key -max-buffers=100 -serialize=true -never-delete=false -volume=/keepdata"
+            - "mkdir /keepdata && /usr/local/bin/bootstrap.sh keepstore={{ .Values.arvados.versions.distribution.keepStore }} && GOGC=10 keepstore -enforce-permissions=true -blob-signing-key-file=/etc/keepstore/blob-signing.key -max-buffers=100 -serialize=true -never-delete=false -volume=/keepdata"
           volumeMounts:
             - name: keep-store-configmap
               mountPath: /etc/keepstore/blob-signing.key
diff --git a/arvados/templates/keep-web-deployment.yaml b/arvados/templates/keep-web-deployment.yaml
index 6758cae..999edaa 100644
--- a/arvados/templates/keep-web-deployment.yaml
+++ b/arvados/templates/keep-web-deployment.yaml
@@ -31,11 +31,10 @@ spec:
           command:
             - "sh"
             - "-c"
-            # TODO: the apt-get update should be run in the Dockerfile
-            - "apt-get update && /usr/local/bin/bootstrap.sh keep-web=1.1.3.20180404192345* && keep-web -listen=:9002 -trust-all-content"
+            - "/usr/local/bin/bootstrap.sh keep-web={{ .Values.arvados.versions.distribution.keepWeb }} && keep-web -listen=:9002 -trust-all-content"
           env:
             - name : ARVADOS_API_HOST
-              value: "8.8.8.8:444"
+              value: "{{ .Values.externalIP }}:444"
             - name : ARVADOS_API_HOST_INSECURE
               value: "true"
             - name : ARVADOS_API_TOKEN
diff --git a/arvados/templates/keep-web-https.yaml b/arvados/templates/keep-web-https.yaml
index 1fa54e2..e132b5d 100644
--- a/arvados/templates/keep-web-https.yaml
+++ b/arvados/templates/keep-web-https.yaml
@@ -99,7 +99,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   type: LoadBalancer
-  loadBalancerIP: "8.8.8.8"
+  loadBalancerIP: {{ required "A valid externalIP is required!" .Values.externalIP }}
   ports:
   - name: https
     port: 9002
diff --git a/arvados/templates/shell-server-configmap.yaml b/arvados/templates/shell-server-configmap.yaml
index b5ac2f0..6c7649f 100644
--- a/arvados/templates/shell-server-configmap.yaml
+++ b/arvados/templates/shell-server-configmap.yaml
@@ -12,4 +12,4 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-{{ (.Files.Glob "config/shell-server/*").AsConfig | indent 2 }}
+{{ (tpl (.Files.Glob "config/shell-server/*").AsConfig . ) | indent 2 }}
diff --git a/arvados/templates/shell-server-deployment.yaml b/arvados/templates/shell-server-deployment.yaml
index b4df56d..455d2ff 100644
--- a/arvados/templates/shell-server-deployment.yaml
+++ b/arvados/templates/shell-server-deployment.yaml
@@ -30,13 +30,12 @@ spec:
           command:
             - "sh"
             - "-c"
-            # TODO: the apt-get update should be run in the Dockerfile
-            - "apt-get update && /usr/local/bin/bootstrap.sh python-arvados-python-client=1.1.3.20180404223512* gem:arvados-cli=1.1.4.20180412190507 gem:arvados-login-sync=1.1.4.20180412190507 crunchrunner=1.1.3.20180403215323* python-arvados-fuse=1.1.3.20180404223512* && install /init-scripts-staging/* /etc/my_init.d && /sbin/my_init"
+            - "/usr/local/bin/bootstrap.sh python-arvados-python-client={{ .Values.arvados.versions.distribution.pythonArvadosPythonClient }} gem:arvados-cli={{ .Values.arvados.versions.gem.arvadosCLI }} gem:arvados-login-sync={{ .Values.arvados.versions.gem.arvadosLoginSync }} crunchrunner={{ .Values.arvados.versions.distribution.crunchRunner }} python-arvados-fuse={{ .Values.arvados.versions.distribution.pythonArvadosFuse }} && install /init-scripts-staging/* /etc/my_init.d && /sbin/my_init"
           env:
             - name: RAILS_ENV
               value: "production"
             - name: ARVADOS_API_HOST
-              value: "8.8.8.8:444"
+              value: "{{ .Values.externalIP }}:444"
             - name : ARVADOS_API_HOST_INSECURE
               value: "true"
             - name : ARVADOS_API_TOKEN
diff --git a/arvados/templates/sso-deployment.yaml b/arvados/templates/sso-deployment.yaml
index d407b83..507c482 100644
--- a/arvados/templates/sso-deployment.yaml
+++ b/arvados/templates/sso-deployment.yaml
@@ -30,7 +30,7 @@ spec:
           command:
             - "sh"
             - "-c"
-            - "install /init-scripts/*.sh /etc/my_init.d && /usr/local/bin/bootstrap.sh arvados-sso-server=0.1.20171122141118.ba584a7* && cd /var/www/arvados-sso/current && exec /sbin/my_init"
+            - "install /init-scripts/*.sh /etc/my_init.d && /usr/local/bin/bootstrap.sh arvados-sso-server={{ .Values.arvados.versions.distribution.arvadosSSOServer }} && cd /var/www/arvados-sso/current && exec /sbin/my_init"
           env:
             - name: RAILS_ENV
               value: "production"
diff --git a/arvados/templates/sso-service.yaml b/arvados/templates/sso-service.yaml
index 43cdc08..fd9ad1a 100644
--- a/arvados/templates/sso-service.yaml
+++ b/arvados/templates/sso-service.yaml
@@ -13,7 +13,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   type: LoadBalancer
-  loadBalancerIP: "8.8.8.8"
+  loadBalancerIP: {{ required "A valid externalIP is required!" .Values.externalIP }}
   ports:
   - name: http
     port: 3002
diff --git a/arvados/templates/workbench-configmap.yaml b/arvados/templates/workbench-configmap.yaml
index 0929859..09fb669 100644
--- a/arvados/templates/workbench-configmap.yaml
+++ b/arvados/templates/workbench-configmap.yaml
@@ -12,4 +12,4 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-{{ (.Files.Glob "config/workbench/*").AsConfig | indent 2 }}
+{{ (tpl (.Files.Glob "config/workbench/*").AsConfig . ) | indent 2 }}
diff --git a/arvados/templates/workbench-deployment.yaml b/arvados/templates/workbench-deployment.yaml
index 1b1e0f8..6ed3a44 100644
--- a/arvados/templates/workbench-deployment.yaml
+++ b/arvados/templates/workbench-deployment.yaml
@@ -30,7 +30,7 @@ spec:
           command:
             - "sh"
             - "-c"
-            - "/usr/local/bin/bootstrap.sh arvados-workbench=1.1.3.20180323182125* && exec /sbin/my_init"
+            - "/usr/local/bin/bootstrap.sh arvados-workbench={{ .Values.arvados.versions.distribution.arvadosWorkbench }} && exec /sbin/my_init"
           env:
             - name: RAILS_ENV
               value: "production"
diff --git a/arvados/templates/workbench-service.yaml b/arvados/templates/workbench-service.yaml
index 05fed6e..86ee2cb 100644
--- a/arvados/templates/workbench-service.yaml
+++ b/arvados/templates/workbench-service.yaml
@@ -13,7 +13,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   type: LoadBalancer
-  loadBalancerIP: "8.8.8.8"
+  loadBalancerIP: {{ required "A valid externalIP is required!" .Values.externalIP }}
   ports:
   - name: http
     port: 443
diff --git a/arvados/templates/ws-deployment.yaml b/arvados/templates/ws-deployment.yaml
index dd918b2..ad80874 100644
--- a/arvados/templates/ws-deployment.yaml
+++ b/arvados/templates/ws-deployment.yaml
@@ -30,7 +30,7 @@ spec:
           command:
             - "sh"
             - "-c"
-            - "/usr/local/bin/bootstrap.sh arvados-ws=1.1.3.20180403215323* && arvados-ws"
+            - "/usr/local/bin/bootstrap.sh arvados-ws={{ .Values.arvados.versions.distribution.arvadosWs }} && arvados-ws"
           volumeMounts:
             - name: ws-configmap
               mountPath: /etc/arvados/ws/ws.yml
diff --git a/arvados/templates/ws-https.yaml b/arvados/templates/ws-https.yaml
index 41215db..8824e41 100644
--- a/arvados/templates/ws-https.yaml
+++ b/arvados/templates/ws-https.yaml
@@ -99,7 +99,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   type: LoadBalancer
-  loadBalancerIP: "8.8.8.8"
+  loadBalancerIP: {{ required "A valid externalIP is required!" .Values.externalIP }}
   ports:
   - name: https
     port: 9003
diff --git a/arvados/values.yaml b/arvados/values.yaml
index b7fc0f2..55e276e 100644
--- a/arvados/values.yaml
+++ b/arvados/values.yaml
@@ -47,3 +47,35 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+# The external IP address for this Arvados cluster.
+# Must be set to a valid IP address, e.g. by using --set when invoking helm
+externalIP: ~
+
+# The package versions for this Arvados cluster. Also see
+#
+#   curl http://versions.arvados.org/v1/commit/ | jq .
+#
+arvados:
+  versions:
+    distribution:
+      arvadosApiServer: 1.1.4.20180521175419*
+      arvadosGitHttpd: 1.1.4.20180516205929*
+      arvadosHealth: 1.1.4.20180516205929*
+      arvadosWorkbench: 1.1.4.20180521175419*
+      arvadosWs: 1.1.4.20180516205929*
+      arvadosSSOServer: 0.1.20171122141118.ba584a7*
+      crunchDispatchSlurm: 1.1.4.20180516205929*
+      crunchRun: 1.1.4.20180516205929*
+      crunchRunner: 1.1.4.20180516205929*
+      keepBalance: 1.1.4.20180516205929*
+      keepStore: 1.1.4.20180516205929*
+      keepWeb: 1.1.4.20180516205929*
+      keepProxy: 1.1.4.20180516205929*
+      libPamArvados: 1.1.4.20180404223512*
+      pythonArvadosFuse: 1.1.4.20180507184611*
+      pythonArvadosPythonClient: 1.1.4.20180510153813*
+    gem:
+      arvados: 1.1.4.20180412190507
+      arvadosCLI: 1.1.4.20180412190507
+      arvadosLoginSync: 1.1.4.20180424214444