Some further cleanup.

No issue #

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

diff --git a/AUTHORS b/AUTHORS
index 55c4624044a99242594be0c9064a9071a5b85a2b..cae6d95e255c7ac1e451c832f8dbb99e41098237 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,14 +8,5 @@
 #
 # See python fnmatch module documentation for more information.
 
-Curoverse, Inc. <*@curoverse.com>
-Adam Savitzky <adam.savitzky@gmail.com>
-Colin Nolan <colin.nolan@sanger.ac.uk>
-David <davide.fiorentino.loregio@gmail.com>
-Guillermo Carrasco <guille.ch.88@gmail.com>
-Joshua Randall <joshua.randall@sanger.ac.uk>
-President and Fellows of Harvard College <*@harvard.edu>
-Thomas Mooney <tmooney@genome.wustl.edu>
-Chen Chen <aflyhorse@gmail.com>
 Veritas Genetics, Inc. <*@veritasgenetics.com>
 Kevin Lin <kevin@kelda.io>

diff --git a/charts/arvados/templates/NOTES.txt b/charts/arvados/templates/NOTES.txt
deleted file mode 100644 (file)
index 8bef514..0000000
--- a/charts/arvados/templates/NOTES.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "arvados.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "arvados.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "arvados.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "arvados.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:80
-{{- end }}

diff --git a/charts/arvados/values.yaml b/charts/arvados/values.yaml
index 3015cdfd9c446ce3770953ebe35e4f7b38837c8b..b9270b3e562b4238ca216434eb06d21c1c84d385 100644 (file)
--- a/charts/arvados/values.yaml
+++ b/charts/arvados/values.yaml
@@ -6,48 +6,9 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-replicaCount: 1
-
 image:
-  repository: nginx
-  tag: stable
   pullPolicy: Always
 
-service:
-  type: ClusterIP
-  port: 80
-
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  path: /
-  hosts:
-    - chart-example.local
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-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: ~
@@ -73,7 +34,7 @@ arvados:
       arvadosHealth: 1.1.4.20180605191011*
       arvadosWorkbench: 1.1.4.20180605195657*
       arvadosWs: 1.1.4.20180605191011*
-      arvadosSSOServer: 0.1.20171122141118.ba584a7*
+      arvadosSSOServer: 1.1.4*
       crunchDispatchSlurm: 1.1.4.20180605191011*
       crunchRun: 1.1.4.20180605191011*
       crunchRunner: 1.1.4.20180605191011*