Merge branch 'feature/bump-oidc-library' into q/128.0

scality · Sep 16, 2024 · a6dcea0 · a6dcea0
2 parents b410c2f + 9518210
commit a6dcea0
Show file tree

Hide file tree

Showing 20 changed files with 19,530 additions and 14,975 deletions.
diff --git a/.github/workflows/single-node-test.yaml b/.github/workflows/single-node-test.yaml
@@ -100,7 +100,7 @@ jobs:
           source product.txt
           echo "METALK8S_VERSION=$VERSION" >> $GITHUB_ENV
 
-     ## Spawn {{{
+      ## Spawn {{{
       - name: Export environment variables for accessing the cloud
         uses: ./.github/actions/export-cloud-env
         with:
@@ -240,6 +240,16 @@ jobs:
         uses: ./.github/actions/bastion-ui-tests
       # }}}
 
+      - name: Collect UI tests videos
+        if: always()
+        continue-on-error: true
+        run: |
+          export DEST_DIR="artifacts/ui-e2e-tests/${{ github.job }}"
+          mkdir -p ${DEST_DIR}
+          scp -F ssh_config \
+            "bastion:/home/centos/metalk8s/ui/cypress/videos/e2e/*" \
+            "${DEST_DIR}/"
+
       - name: Generate and Collect sosreport
         if: always()
         uses: ./.github/actions/sosreport-logs

diff --git a/docs/developer/running/ui.rst b/docs/developer/running/ui.rst
@@ -39,7 +39,7 @@ This will allow you to register localhost:8084 as a valid authentication
         redirectURIs:
           - https://<bootstrap_control_plane_ip>:8443/
           - http://localhost:8084/
-        secret: ybrMJpVMQxsiZw26MhJzCjA2ut
+        public: true
 
 You can retrieve the ``bootstrap_control_plane_ip`` by running:
 

diff --git a/salt/metalk8s/addons/dex/config/dex.yaml.j2 b/salt/metalk8s/addons/dex/config/dex.yaml.j2
@@ -77,7 +77,7 @@ spec:
       name: MetalK8s UI
       redirectURIs:
       - {{ control_plane_ingress_ep }}/{{ metalk8s_ui_config.spec.basePath.lstrip('/') }}
-      secret: ybrMJpVMQxsiZw26MhJzCjA2ut
+      public: true
     - id: grafana-ui
       name: Grafana UI
       redirectURIs:

diff --git a/salt/metalk8s/addons/ui/config/metalk8s-shell-ui-config.yaml.j2 b/salt/metalk8s/addons/ui/config/metalk8s-shell-ui-config.yaml.j2
@@ -23,7 +23,7 @@ spec:
     providerUrl: "/oidc"
     redirectUrl: "{{ salt.metalk8s_network.get_control_plane_ingress_endpoint() }}/{{ metalk8s_ui_config.spec.basePath.lstrip('/') }}"
     clientId: "metalk8s-ui"
-    responseType: "id_token"
+    responseType: "code"
     scopes: "openid profile email groups offline_access audience:server:client_id:oidc-auth-client"
   userGroupsMapping:
   {%- for user in dex.spec.config.staticPasswords | map(attribute='email') %}

diff --git a/salt/metalk8s/addons/ui/config/metalk8s-ui-config.yaml.j2 b/salt/metalk8s/addons/ui/config/metalk8s-ui-config.yaml.j2
@@ -23,7 +23,7 @@ spec:
     providerUrl: "/oidc"
     redirectUrl: "{{ salt.metalk8s_network.get_control_plane_ingress_endpoint() }}/"
     clientId: "metalk8s-ui"
-    responseType: "id_token"
+    responseType: "code"
     scopes: "openid profile email groups offline_access audience:server:client_id:oidc-auth-client"
 {%- endif %}
 

diff --git a/shell-ui/jest.config.js b/shell-ui/jest.config.js
@@ -7,4 +7,5 @@ module.exports = {
   moduleNameMapper: {
     '\\.(css|less)$': 'identity-obj-proxy',
   },
+  testEnvironment: 'jsdom',
 };