remove unnecessary alpha config for simple case without path encoding…

… bug
cryostatio · Oct 31, 2024 · 3739b9a · 3739b9a
1 parent 7164ff4
commit 3739b9a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 36 deletions.
diff --git a/charts/cryostat/templates/_reports_authproxy.tpl b/charts/cryostat/templates/_reports_authproxy.tpl
@@ -50,10 +50,16 @@
   securityContext:
     {{- toYaml (.Values.oauth2Proxy).securityContext | nindent 4 }}
   image: "{{ (.Values.oauth2Proxy).image.repository }}:{{ (.Values.oauth2Proxy).image.tag }}"
-  args:
-    - "--alpha-config=/etc/oauth2_proxy/alpha_config/alpha_config.yaml"
   imagePullPolicy: {{ (.Values.oauth2Proxy).image.pullPolicy }}
   env:
+    - name: OAUTH2_PROXY_CLIENT_ID
+      value: dummy
+    - name: OAUTH2_PROXY_CLIENT_SECRET
+      value: none
+    - name: OAUTH2_PROXY_HTTP_ADDRESS
+      value: 0.0.0.0:4180
+    - name: OAUTH2_PROXY_UPSTREAMS
+      value: http://localhost:10001/
     - name: OAUTH2_PROXY_REDIRECT_URL
       value: "http://localhost:4180/oauth2/callback"
     - name: OAUTH2_PROXY_COOKIE_SECRET
@@ -70,15 +76,15 @@
       value: /etc/oauth2_proxy/basicauth/htpasswd
     - name: OAUTH2_PROXY_SKIP_AUTH_ROUTES
       value: "^/health(/liveness)?$"
+    - name: OAUTH2_PROXY_PROXY_WEBSOCKETS
+      value: "false"
   ports:
     - containerPort: 4180
       name: http
       protocol: TCP
   resources:
     {{- toYaml .Values.oauth2Proxy.resources | nindent 4 }}
   volumeMounts:
-    - name: reports-alpha-config
-      mountPath: /etc/oauth2_proxy/alpha_config
     - name: {{ .Release.Name }}-reports-secret
       mountPath: /etc/oauth2_proxy/basicauth
       readOnly: true

diff --git a/charts/cryostat/templates/reports_alpha_config.yaml b/charts/cryostat/templates/reports_alpha_config.yaml
diff --git a/charts/cryostat/templates/reports_deployment.yaml b/charts/cryostat/templates/reports_deployment.yaml
@@ -81,11 +81,6 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       volumes:
-      {{- if not (.Values.authentication.openshift).enabled }}
-      - name: reports-alpha-config
-        configMap:
-          name: {{ .Release.Name }}-reports-alpha-config
-      {{- end }}
       - name: {{ .Release.Name }}-reports-secret
         secret:
           defaultMode: 0440