Merge pull request #93 from helxplatform/develop

develop -> main

Chart.yaml

@@ -12,10 +12,10 @@ description: A Helm chart for Kubernetes
 type: application
 # 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.
-version: 3.2.1
+version: 3.3.0
 # This is the version number of the application being deployed. This version
 # number should be incremented each time you make changes to the application.
-appVersion: 3.1.0
+appVersion: 3.3.0
 dependencies:
   - name: postgresql
     condition: postgresql.enabled

README.md

@@ -2,7 +2,7 @@
 
 A Helm chart for Kubernetes
 
-![Version: 3.2.1](https://img.shields.io/badge/Version-3.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square)
+![Version: 3.2.3](https://img.shields.io/badge/Version-3.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square)
 
 ## CI/CD
 
@@ -71,6 +71,9 @@ Additionally there is a workflow that allows bumping the chart version, if this
 | image.pullPolicy | string | `"IfNotPresent"` | pull policy |
 | image.repository | string | `"containers.renci.org/helxplatform/appstore"` | repository where image is located |
 | image.tag | string | `nil` | Overrides the image tag whose default is the chart appVersion. Set to "" before release! |
+| imagePostgresql.pullPolicy | string | `"IfNotPresent"` | pull policy |
+| imagePostgresql.repository | string | `"docker.io/bitnami/postgresql"` | repository where postgresql image is located |
+| imagePostgresql.tag | int | `11` | Image tag for postgresql, coordinate this with postgresql dependency. |
 | imagePullSecrets | list | `[]` | credentials for a private repo |
 | irods.BRAINI_RODS | string | `""` |  |
 | irods.IROD_COLLECTIONS | string | `""` |  |
@@ -149,6 +152,8 @@ Additionally there is a workflow that allows bumping the chart version, if this
 | tycho.externalAppRegistryRepo | string | `"https://github.com/helxplatform/helx-apps/raw"` | Can be set to a git repo URL for fetching the app registry file or defaults file.  Something in the form of  'https://github.com/helxplatform/helx-apps/raw'. |
 | tycho.fsGroup | int | `0` | Application processes launched will also be part of this supplimentary group. |
 | tycho.init | object | `{"resources":{"cpus":"250m","memory":"250Mi"}}` | Resource for Tycho init container. Defaults cpus|250m memory|250Mi |
+| tycho.initImageRepository | string | `"busybox"` | The image repository to use for HeLx app init containers. |
+| tycho.initImageTag | string | `"latest"` | The image tag to use for HeLx app init containers. |
 | tycho.initRunAsGroup | int | `0` | Init processes will have this group permissions. |
 | tycho.initRunAsUser | int | `0` | Init processes will run as this user. |
 | tycho.parent_dir | string | `"/home"` | directory that will be used to mount user's home directories in |

templates/configmap.yaml

@@ -14,6 +14,8 @@ data:
   OAUTH_DB_DIR: /var/lib/sqlite3
   OAUTH_DB_FILE: DATABASE.sqlite3
   ACCOUNT_DEFAULT_HTTP_PROTOCOL: "{{ .Values.ACCOUNT_DEFAULT_HTTP_PROTOCOL }}"
+  AUTO_WHITELIST_PATTERNS: |
+    {{ toJson .Values.django.AUTO_WHITELIST_PATTERNS | nindent 4 }}
   DEV_PHASE: "{{ .Values.django.DEV_PHASE }}"
   # Just adding these ports temporarily until they have a default value in the code.
   BRAINI_PORT: "1247"

templates/deployment.yaml

@@ -36,7 +36,8 @@ spec:
       initContainers:
       {{- if .Values.postgresql.enabled }}
       - name: wait-for-postgresql
-        image: postgres:11
+        image: "{{ .Values.imagePostgresql.repository }}:{{ .Values.imagePostgresql.tag }}"
+        imagePullPolicy: "{{ .Values.imagePostgresql.pullPolicy }}"
         command:
           - sh
           - -c
@@ -136,6 +137,11 @@ spec:
             configMapKeyRef:
               key: ACCOUNT_DEFAULT_HTTP_PROTOCOL
               name: {{ include "appstore.fullname" . }}-env
+        - name: AUTO_WHITELIST_PATTERNS
+          valueFrom:
+            configMapKeyRef:
+              key: AUTO_WHITELIST_PATTERNS
+              name: {{ include "appstore.fullname" . }}-env
         - name: DEV_PHASE
           valueFrom:
             configMapKeyRef:
@@ -425,6 +431,10 @@ spec:
           {{- else }}
           value: "{{- .Values.tycho.externalAppRegistryRepo }}/{{- .Values.django.DOCKSTORE_APPS_BRANCH }}/{{- .Values.tycho.externalAppRegistryAppSpecsDir }}"
           {{- end }}
+        - name: TYCHO_APP_INIT_IMAGE_REPOSITORY
+          value: "{{- .Values.tycho.initImageRepository }}"
+        - name: TYCHO_APP_INIT_IMAGE_TAG
+          value: "{{- .Values.tycho.initImageTag }}"
         - name: INIT_SC_RUN_AS_USER
           value: "{{- .Values.tycho.initRunAsUser }}"
         - name: INIT_SC_RUN_AS_GROUP

values.yaml

@@ -13,6 +13,14 @@ image:
   # Set to "" before release!
   tag:
 
+imagePostgresql:
+  # -- repository where postgresql image is located
+  repository: docker.io/bitnami/postgresql
+  # -- pull policy
+  pullPolicy: IfNotPresent
+  # -- Image tag for postgresql, coordinate this with postgresql dependency.
+  tag: 11
+
 fetcherImage:
   # -- repository where image is located
   repository: helxplatform/url-fetch
@@ -101,6 +109,17 @@ gunicorn:
   workers: 5
 
 django:
+  # Note that these only run on a user's primary alias.
+  # If a user has [email protected] as their primary alias,
+  # and [email protected] as a secondary alias, they will only
+  # be whitelisted automatically if cs.unc.edu emails are allowed.
+  AUTO_WHITELIST_PATTERNS:
+    ### Whitelist all RENCI emails ###
+    # - "^[A-Za-z0-9._%+-]+@renci\\.org$"
+    ### Whitelist all UNC emails ###
+    # - "^[A-Za-z0-9._%+-]+@([A-Za-z0-9.-]+\.)?unc\.edu$"
+    ### Whitelist CS dept. (grad./prof.) UNC emails ###
+    # - "^[A-Za-z0-9._%+-]+@cs\.unc\.edu$"
   # -- create test users for load testing
   CREATE_TEST_USERS: "false"
   # -- parent directory where the users.txt would be mounted
@@ -128,7 +147,7 @@ django:
   # -- Specify URL to use for the "Image Download" link on the top part of website.
   IMAGE_DOWNLOAD_URL: ""
   # -- idle timeout for user web session
-  SESSION_IDLE_TIMEOUT: 3600
+  SESSION_IDLE_TIMEOUT: "2592000" # 30 days
   # -- list of appstore registration emails
   RECIPIENT_EMAILS: ""
   # -- should be 'live' unless you are doing some kind of development
@@ -251,6 +270,10 @@ tycho:
   # main container is started.  This can be to create certain directories or
   # set file permissions.
   enableInitContainer: true
+  # -- The image repository to use for HeLx app init containers.
+  initImageRepository: busybox
+  # -- The image tag to use for HeLx app init containers.
+  initImageTag: latest
   # -- Init processes will run as this user.
   initRunAsUser: 0
   # -- Init processes will have this group permissions.