add helpmenu, remove users

Author: robkooper

Chart.yaml

@@ -13,7 +13,7 @@ description: >
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.14.3
+version: 0.14.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -55,4 +55,7 @@ annotations:
     - name: Helm Chart
       url: https://github.com/clowder-framework/clowder-helm
   artifacthub.io/changes: |
-    - Update clowder to version 1.19.2
+    - allow for mounting of extra volumes in clowder
+    - use tempfolder for clowder (/home/clowder/data/tmp)
+    - use helpmenu to add additional entries to the botttom of the help menu.
+    - remove users option, use initialadmins instead

templates/NOTES.txt

@@ -1,18 +1,6 @@
 {{- $fullname := include "clowder.fullname" . }}
 ** Please be patient while the chart is being deployed **
 
-{{- if .Values.users }}
-Credentials:
-  {{- range $index, $element := .Values.users }}
-{{- if .username }}
-    Username      : {{ .username }}
-{{- else }}
-    Username      : {{ .email }}
-{{- end }}
-  echo "Password      : $(kubectl get secret --namespace {{ $.Release.Namespace }} {{  $fullname }} -o jsonpath="{.data.password-{{ $index }}}" | base64 --decode)"
-  {{- end }}
-{{- end }}
-
 Clowder Admin Key:
     echo "Clowder Key   : $(kubectl get secret --namespace {{ .Release.Namespace }} {{ $fullname }} -o jsonpath="{.data.clowder-key}" | base64 --decode)"
 

templates/configmap.yaml

@@ -71,6 +71,13 @@ data:
     elasticsearchSettings.serverAddress={{ include "clowder.fullname" . }}-elasticsearch-discovery
     elasticsearchSettings.serverPort=9300
 {{- end }}
+    helpMenu = [
+{{- range .Values.helpmenu }}
+    {{- . | toJson | nindent 6 }}
+{{- end }}
+    ]
+    clowder.proxy {
+    }
 {{- range .Values.extraConfig }}
     {{ . }}
 {{- end }}

templates/deployment.yaml

@@ -42,7 +42,7 @@ spec:
           args:
             - -c
             - >-
-              mkdir {{ .Values.tempfolder }} &&
+              mkdir -p {{ .Values.tempfolder }} &&
               chown "{{ .Values.userid }}:{{ .Values.groupid }}" /home/clowder/data {{ .Values.tempfolder }}
           securityContext:
             runAsUser: 0
@@ -53,36 +53,6 @@ spec:
           {{- with .Values.extraVolumeMounts }}
           {{- . | toYaml | nindent 10 }}
           {{- end }}
-{{- end }}
-{{- if .Values.users }}
-{{- range $index, $element := .Values.users }}
-        - name: mongo-add-user-{{ $index }}
-          image: "{{ $.Values.image.repository }}/mongo-init:{{ $.Values.image.tag | default $.Chart.AppVersion }}"
-          imagePullPolicy: {{ $.Values.image.pullPolicy }}
-          env:
-            - name: MONGO_URI
-              valueFrom:
-                secretKeyRef:
-                  name: {{ $.Release.Name }}
-                  key: mongodb-uri
-{{- if .username }}
-            - name: USERNAME
-              value: {{ .username | quote }}
-{{- end }}
-            - name: PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ $.Release.Name }}
-                  key: "password-{{ $index }}"
-            - name: EMAIL_ADDRESS
-              value: {{ .email | quote }}
-            - name: FIRST_NAME
-              value: {{ .firstname | quote }}
-            - name: LAST_NAME
-              value: {{ .lastname | quote }}
-            - name: ADMIN
-              value: {{ .admin | quote }}
-{{- end }}
 {{- end }}
       containers:
         - name: {{ .Chart.Name }}

values.yaml

@@ -21,6 +21,8 @@ memory: 2048
 
 ## List of admins for Clowder. These people will at every restart of clowder be given admin
 ## priveleges. Can also be used to recover system by giving existing user admin rights.
+## Make sure to provide at least one initialAdmin user, otherwise you will not be able
+## to login.
 initialAdmins:
 #  - [email protected]
 
@@ -36,20 +38,6 @@ registerThroughAdmins: true
 ## a replicated setup. Best is for kubernetes to generate a random key.
 #secretKey:
 
-## List of initial users. These users will be added after clowder is installed. The
-## users will still need to accept the data policy.
-## email     : Email address, also used to login
-## password  : Initial password, if not set a random password is generated
-## firstname : First name of the user
-## lastname  : Last name of the user
-## admin     : should user be given admin privileges
-users: []
-  # - email: [email protected]
-  #   #password: secret
-  #   firstname: Admin
-  #   lastname: User
-  #   admin: true
-
 ## idleTimeoutInMinutes the time in minutes that your session is valid for until clowder
 ## logs you out.
 idleTimeoutInMinutes: 30
@@ -84,6 +72,12 @@ groupid: 0
 ## is for this to be on the same volume as the final storage, or on a fast storage.
 tempfolder: /home/clowder/data/tmp/
 
+## helpmenu is a list of entries that are added to the help menu in clowder, each entry has
+## two fields, label (shown in menu) and the url.
+helpmenu: []
+# - label: "FAQs"
+#   url: "https://example.com/faqs"
+
 # ----------------------------------------------------------------------
 # Configure the ingress object to hook into existing infastructure
 # ref : http://kubernetes.io/docs/user-guide/ingress/