wip: checkpoint - first deploy

Author: bodom0015

chart/templates/custom-errors.yaml

@@ -9,7 +9,7 @@ spec:
   tls:
     - hosts:
       - '{{ .Values.ingress.hostname }}'
-      secretName: ndslabs-tls
+      secretName: {{ .Values.ingress.tls.secretName }}
   rules:
   - host: '{{ .Values.ingress.hostname }}'
     http:

chart/templates/middleware.yaml

@@ -1,34 +1,3 @@
-{{- if .Values.config.corsHeader.enabled }}
-apiVersion: traefik.io/v1alpha1
-kind: Middleware
-metadata:
-  name: {{ .Values.config.corsHeader.name }}
-spec:
-  headers:
-    accessControlAllowCredentials: true
-    accessControlAllowHeaders:
-    - Origin
-    - X-Requested-With
-    - X-Retry-In
-    - Retry-After
-    - Content-Type
-    - content-type
-    - Accept
-    - Authorization
-    accessControlAllowMethods:
-    - GET
-    - OPTIONS
-    - PUT
-    - DELETE
-    - POST
-    - PATCH
-    accessControlAllowOriginList:
-    - '{{ .Values.config.corsHeader.allowedOrigins }}'
-    accessControlExposeHeaders:
-    - X-Retry-In
-    - Retry-After
----
-{{- end }}
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:

chart/values.amr.yaml

@@ -5,17 +5,17 @@
 replicaCount: 1
 
 config:
-  # URL where we should route user to sign in (e.g. /oauth2/start, do not include redirect parameter)
+  # Where should we send the user to log in?
   signInUrl: "https://workbench.amr-rti.ncsa.illinois.edu/oauth2/start"
 
+  # How to know if we should route to the login page
   privateAuth:
     forwardAddress: "https://workbench.amr-rti.ncsa.illinois.edu/oauth2/auth"
 
-  corsHeader:
-    enabled: false
-
+# How should this error page be served?
 ingress:
   className: traefik
-  hostname: "https://workbench.amr-rti.ncsa.illinois.edu"
-  tlsSecretName: ndslabs-tls
+  hostname: "workbench.amr-rti.ncsa.illinois.edu"
+  tls:
+    secretName: ndslabs-tls
 

chart/values.yaml

@@ -17,13 +17,6 @@ config:
     name: workbench-private-auth
     forwardAddress: "" 
 
-  # Configure the Headers middleware
-  corsHeader:
-    enable: false
-    name: workbench-cors-header
-    # TODO: origins could be a list
-    allowedOrigins: ""
-
 image:
   repository: ndslabs/custom-errors
   pullPolicy: IfNotPresent
@@ -35,6 +28,7 @@ service:
 ingress:
   className: ""
   hostname: ""
-  tlsSecretName: ndslabs-tls
+  tls:
+    secretName: ""
 
 extraDeploy: []