Merge branch 'nixidy' of gitlab.com:oceanbox/manifests into nixidy

values/dex/templates/dex/templates/login.html

@@ -5,6 +5,19 @@
 {{ end }}
 
 <login-app></login-app>
+
+<div class="theme-form-row">
+  <a href=".Connectors.oceanbox.URL" target="_self">
+    <button class="dex-btn theme-btn-provider">
+      <span class="dex-btn-icon dex-btn-icon--microsoft"></span>
+      <span class="dex-btn-text">Log in with Microsoft</span>
+    </button>
+  </a>
+</div>
+
 <script type="module" crossorigin src="/dex/static/js/@index@"></script>
 
 {{ template "footer.html" . }}
+
+
+<a href="/dex/auth/oceanbox?client_id=atlantis_dev&amp;code_challenge=z82xfjKjDpRH_KyBd7RTuhGLRz6T1AnuO89nDy4gIlU&amp;code_challenge_method=S256&amp;nonce=638703021061268435.ODA5ZTAxNzEtMTNmNy00MGYyLWI4ZjYtYjM4MGQxZDg3MjhmMWI0MDNkOWEtODc1Yi00YzIwLWFlYWItNTA3YzkwZmI0YzEw&amp;redirect_uri=https%3A%2F%2Fatlantis.beta.oceanbox.io%2Fsignin-oidc&amp;response_mode=form_post&amp;response_type=code&amp;scope=openid+profile+email+offline_access&amp;state=CfDJ8KGhUdBuYzBMotFnzpLx04ssdHGqQgOpG8xoFVuSsSxu3Vs37Kq_LWVWtkD_4D90xUrqmriVipINkn10hZZFXP0uokcuNtY5QtlGOvJVmnFoHFW0RJUPZseixr5UyvW0LdQtKgAzL-lU9fLe6xbAPnxEejaQXl92-e0oa_VIt-Yk2686PLdlxPq82EdOyvQKJYwA2fEFUTqF2wkvm86y-z4m7WN3kX4b6nS3zz1JJKMLlTibjFUJ6Ovh-5NcKyRhs59-7lmfTdr50YdvR3X1V51zmlDV81Tkj6IRzoOcv8ZrVHQ0AqMcfi79MrDNsc9LkCIrHGdduP-eM4wc4jfRupU1GH69V8F4H5uQMNoctEGX-Y21-3JFTUxWm_ji_ttlPuDS454plOlCyX7JMYH_MYo&amp;x-client-SKU=ID_NET9_0&amp;x-client-ver=8.0.1.0" target="_self" id="oceanbox.io" hidden=""></a>

values/keycloak/values.yaml

@@ -36,10 +36,6 @@ ingress:
   extraHosts:
     - name: auth.oceanbox.io
       path: /
-  extraTls:
-    - hosts:
-       - auth.oceanbox.io
-      secretName: auth.oceanbox.io-tls
   hostname: auth.srv.oceanbox.io
   ingressClassName: nginx
   path: /
@@ -57,16 +53,9 @@ adminIngress:
     nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
-  extraHosts:
-    - name: auth.oceanbox.io
-      path: /realms/master
-  extraTls:
-    - hosts:
-       - auth.oceanbox.io
-      secretName: auth.oceanbox.io-tls
-  hostname: auth.srv.oceanbox.io
+  hostname: auth.adm.oceanbox.io
   ingressClassName: nginx
-  path: /realms/master
+  path: /
   pathType: ImplementationSpecific
   selfSigned: false
   servicePort: http