Merge remote-tracking branch 'upstream/devel' into feature/cursor-indicator-link

Author: manuelmeister

.github/workflows/continuous-integration.yml

@@ -233,6 +233,8 @@ jobs:
 
       - run: composer test
         working-directory: api
+        env:
+          PERFORMANCE_TEST_DEBUG_OUTPUT: ${{ vars.PERFORMANCE_TEST_DEBUG_OUTPUT }}
 
       - name: send coveralls report
         run: |

.github/workflows/reusable-api-performance-test.yml

@@ -68,3 +68,5 @@ jobs:
 
       - run: composer performance_test
         working-directory: api
+        env:
+          PERFORMANCE_TEST_DEBUG_OUTPUT: ${{ vars.PERFORMANCE_TEST_DEBUG_OUTPUT }}

.ops/aws-setup/package-lock.json

@@ -16,7 +16,7 @@
     },
     "devDependencies": {
         "@babel/eslint-parser": "7.24.6",
-        "@types/node": "20.13.0",
+        "@types/node": "20.14.1",
         "eslint": "8.57.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-import": "2.29.1",

.ops/aws-setup/package.json

@@ -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"

.ops/ops-dashboard/Chart.lock

@@ -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

.ops/ops-dashboard/Chart.yaml

@@ -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

.ops/ops-dashboard/README.md

@@ -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

.ops/ops-dashboard/demo.values.access.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

.ops/ops-dashboard/values.yaml

@@ -0,0 +1,2 @@
+imports:
+    - resource: ../test/http_cache.yaml