Adding environment params for CILogon and OIDC

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: 5.0.1
+version: 5.1.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: 4.3.0
+appVersion: 4.4.0
 dependencies:
   - name: postgresql
     condition: postgresql.enabled

README.md

@@ -2,7 +2,7 @@
 
 A Helm chart for Kubernetes
 
-![Version: 5.0.1](https://img.shields.io/badge/Version-5.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.0](https://img.shields.io/badge/AppVersion-4.3.0-informational?style=flat-square)
+![Version: 5.1.0](https://img.shields.io/badge/Version-5.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.0](https://img.shields.io/badge/AppVersion-4.4.0-informational?style=flat-square)
 
 ## CI/CD
 
@@ -106,17 +106,20 @@ Additionally there is a workflow that allows bumping the chart version, if this
 | nameOverride | string | `""` |  |
 | networkPolicyLabels.role | string | `"appstore"` |  |
 | nodeSelector | object | `{}` |  |
+| oauth.CILOGON_CLIENT_ID | string | `""` |  |
+| oauth.CILOGON_NAME | string | `""` |  |
+| oauth.CILOGON_SECRET | string | `""` |  |
 | oauth.GITHUB_CLIENT_ID | string | `""` |  |
-| oauth.GITHUB_KEY | string | `""` |  |
 | oauth.GITHUB_NAME | string | `""` |  |
 | oauth.GITHUB_SECRET | string | `""` |  |
-| oauth.GITHUB_SITES | string | `""` |  |
 | oauth.GOOGLE_CLIENT_ID | string | `""` |  |
-| oauth.GOOGLE_KEY | string | `""` |  |
 | oauth.GOOGLE_NAME | string | `""` |  |
 | oauth.GOOGLE_SECRET | string | `""` |  |
-| oauth.GOOGLE_SITES | string | `""` |  |
 | oauth.OAUTH_PROVIDERS | string | `""` | oauth providers separated by commas (google, github) |
+| oauth.OIDC_CLIENT_ID | string | `""` |  |
+| oauth.OIDC_NAME | string | `""` |  |
+| oauth.OIDC_SECRET | string | `""` |  |
+| oauth.OIDC_SERVER_URL | string | `""` |  |
 | octave.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for Octave |
 | pgadmin.enabled | bool | `true` | Disabling will turn off the creation of secrets/configmaps for PgAdmin |
 | podAnnotations | object | `{}` |  |

templates/deployment.yaml

@@ -237,21 +237,8 @@ spec:
             secretKeyRef:
               key: GITHUB_SECRET
               name: {{ include "appstore.fullname" . }}
-        {{- if .Values.oauth.GITHUB_KEY }}
-        - name: GITHUB_KEY
-          valueFrom:
-            secretKeyRef:
-              key: GITHUB_KEY
-              name: {{ include "appstore.fullname" . }}
-        {{- end }}
-        {{- if .Values.oauth.GITHUB_SITES }}
-        - name: GITHUB_SITES
-          valueFrom:
-            secretKeyRef:
-              key: GITHUB_SITES
-              name: {{ include "appstore.fullname" . }}
-        {{- end }}
         {{- end }}
+
         {{- if .Values.oauth.GOOGLE_NAME }}
         - name: GOOGLE_NAME
           valueFrom:
@@ -268,21 +255,49 @@ spec:
             secretKeyRef:
               key: GOOGLE_SECRET
               name: {{ include "appstore.fullname" . }}
-        {{- if .Values.oauth.GOOGLE_KEY }}
-        - name: GOOGLE_KEY
+        {{- end }}
+
+        {{- if .Values.oauth.CILOGON_NAME }}
+        - name: CILOGON_NAME
           valueFrom:
             secretKeyRef:
-              key: GOOGLE_KEY
+              key: CILOGON_NAME
               name: {{ include "appstore.fullname" . }}
-        {{- end }}
-        {{- if .Values.oauth.GOOGLE_SITES }}
-        - name: GOOGLE_SITES
+        - name: CILOGON_CLIENT_ID
+          valueFrom:
+            secretKeyRef:
+              key: CILOGON_CLIENT_ID
+              name: {{ include "appstore.fullname" . }}
+        - name: CILOGON_SECRET
           valueFrom:
             secretKeyRef:
-              key: GOOGLE_SITES
+              key: CILOGON_SECRET
               name: {{ include "appstore.fullname" . }}
         {{- end }}
+
+        {{- if .Values.oauth.OIDC_NAME }}
+        - name: OIDC_NAME
+          valueFrom:
+            secretKeyRef:
+              key: OIDC_NAME
+              name: {{ include "appstore.fullname" . }}
+        - name: OIDC_CLIENT_ID
+          valueFrom:
+            secretKeyRef:
+              key: OIDC_CLIENT_ID
+              name: {{ include "appstore.fullname" . }}
+        - name: OIDC_SECRET
+          valueFrom:
+            secretKeyRef:
+              key: OIDC_SECRET
+              name: {{ include "appstore.fullname" . }}
+        - name: OIDC_SERVER_URL
+          valueFrom:
+            secretKeyRef:
+              key: OIDC_SERVER_URL
+              name: {{ include "appstore.fullname" . }}
         {{- end }}
+
         {{- if .Values.irods.enabled }}
         - name: BRAINI_RODS
           valueFrom:

templates/secrets.yaml

@@ -67,16 +67,27 @@ data:
   GITHUB_NAME: {{ .Values.oauth.GITHUB_NAME | b64enc }}
   GITHUB_CLIENT_ID: {{ .Values.oauth.GITHUB_CLIENT_ID | b64enc }}
   GITHUB_SECRET: {{ .Values.oauth.GITHUB_SECRET | b64enc }}
-  GITHUB_KEY: {{ .Values.oauth.GITHUB_KEY | b64enc | quote }}
-  GITHUB_SITES: {{ .Values.oauth.GITHUB_SITES | b64enc | quote }}
   {{- end }}
+
   {{ if .Values.oauth.GOOGLE_NAME }}
   GOOGLE_NAME: {{ .Values.oauth.GOOGLE_NAME | b64enc }}
   GOOGLE_CLIENT_ID: {{ .Values.oauth.GOOGLE_CLIENT_ID | b64enc }}
   GOOGLE_SECRET: {{ .Values.oauth.GOOGLE_SECRET | b64enc }}
-  GOOGLE_KEY: {{ .Values.oauth.GOOGLE_KEY | b64enc | quote }}
-  GOOGLE_SITES: {{ .Values.oauth.GOOGLE_SITES | b64enc | quote }}
   {{- end }}
+
+  {{ if .Values.oauth.CILOGON_NAME }}
+  CILOGON_NAME: {{ .Values.oauth.CILOGON_NAME | b64enc }}
+  CILOGON_CLIENT_ID: {{ .Values.oauth.CILOGON_CLIENT_ID | b64enc }}
+  CILOGON_SECRET: {{ .Values.oauth.CILOGON_SECRET | b64enc }}
+  {{- end }}
+
+  {{ if .Values.oauth.OIDC_NAME }}
+  OIDC_NAME: {{ .Values.oauth.OIDC_NAME | b64enc }}
+  OIDC_CLIENT_ID: {{ .Values.oauth.OIDC_CLIENT_ID | b64enc }}
+  OIDC_SECRET: {{ .Values.oauth.OIDC_SECRET | b64enc }}
+  OIDC_SERVER_URL: {{ .Values.oauth.OIDC_SERVER_URL | b64enc | quote }}
+  {{- end }}
+
   {{- if .Values.irods.enabled }}
   BRAINI_RODS: {{ .Values.irods.BRAINI_RODS | b64enc }}
   NRC_MICROSCOPY_IRODS: {{ .Values.irods.NRC_MICROSCOPY_IRODS | b64enc }}

values.yaml

@@ -154,15 +154,18 @@ oauth:
   # -- oauth providers separated by commas (google, github)
   OAUTH_PROVIDERS: ""
   GITHUB_NAME: ""
-  GITHUB_KEY: ""
-  GITHUB_SITES: ""
   GITHUB_CLIENT_ID: ""
   GITHUB_SECRET: ""
   GOOGLE_NAME: ""
-  GOOGLE_KEY: ""
-  GOOGLE_SITES: ""
   GOOGLE_CLIENT_ID: ""
   GOOGLE_SECRET: ""
+  CILOGON_NAME: ""
+  CILOGON_CLIENT_ID: ""
+  CILOGON_SECRET: ""
+  OIDC_NAME: ""
+  OIDC_CLIENT_ID: ""
+  OIDC_SECRET: ""
+  OIDC_SERVER_URL: ""
 
 saml:
   cache: