Merge pull request #5203 from BacLuc/expose-logging-via-reverse-proxy

Expose kibana via oauth2 proxy
ecamp · Jun 4, 2024 · ca8965b · ca8965b
2 parents c3a9b83 + 6a74780
commit ca8965b
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/.ops/ops-dashboard/Chart.lock b/.ops/ops-dashboard/Chart.lock
@@ -8,5 +8,8 @@ dependencies:
 - name: oauth2-proxy
   repository: https://oauth2-proxy.github.io/manifests
   version: 7.7.1
-digest: sha256:6aa46fcbee157662cd3c66b6528a6df3df2457ba3ceeacb39108f0d6ee808b89
-generated: "2024-05-31T19:18:54.433436914Z"
+- name: oauth2-proxy
+  repository: https://oauth2-proxy.github.io/manifests
+  version: 7.7.1
+digest: sha256:1347cf4d5d91368a57a24cbe2fe2f57a58e626bd95bc3320afbb5e90ba0121ab
+generated: "2024-06-03T22:10:50.048317587+02:00"
diff --git a/.ops/ops-dashboard/Chart.yaml b/.ops/ops-dashboard/Chart.yaml
@@ -35,3 +35,7 @@ dependencies:
     alias: kubernetes-dashboard-proxy
     version: 7.7.1
     repository: https://oauth2-proxy.github.io/manifests
+  - name: oauth2-proxy
+    alias: logging-proxy
+    version: 7.7.1
+    repository: https://oauth2-proxy.github.io/manifests
diff --git a/.ops/ops-dashboard/README.md b/.ops/ops-dashboard/README.md
@@ -25,7 +25,7 @@ helm repo update
 First, make sure you don't overwrite the configuration currently applied:
 
 ```shell
-helm get values ops-dashboard
+helm -n ops-dashboard get values ops-dashboard
 ```
 
 Fill in the values for values.access.yaml according to demo.values.access.yaml

diff --git a/.ops/ops-dashboard/demo.values.access.yaml b/.ops/ops-dashboard/demo.values.access.yaml
@@ -29,3 +29,18 @@ kubernetes-dashboard-proxy:
     clientSecret: ""
     # use the same cookieSecret as above
     cookieSecret: ""
+logging-proxy:
+  config:
+    # OAuth client ID
+    clientID:
+    # OAuth client secret
+    clientSecret:
+    # use the same cookieSecret as above
+    cookieSecret:
+  extraArgs:
+    # dev, stage or prod kubernetes-dashboard url
+    whitelist-domain: dev-logging.ecamp3.ch
+  ingress:
+    hosts:
+      # dev, stage or prod kubernetes-dashboard url
+      - dev-logging.ecamp3.ch
diff --git a/.ops/ops-dashboard/values.yaml b/.ops/ops-dashboard/values.yaml
@@ -15,3 +15,11 @@ kubernetes-dashboard-proxy:
     github-org: ecamp
     upstream: https://ops-dashboard-kong-proxy.ops-dashboard.svc.cluster.local
     ssl-upstream-insecure-skip-verify: true
+logging-proxy:
+  ingress:
+    enabled: true
+    className: nginx
+  extraArgs:
+    provider: github
+    github-org: ecamp
+    upstream: http://kibana.ecamp3-logging.svc.cluster.local:5601