More updates.

Author: Gerrit91

Makefile

@@ -11,7 +11,7 @@ KUBECONFIG := $(shell pwd)/.kubeconfig
 
 METALCTL_HMAC := $(or $(METALCTL_HMAC),metal-admin)
 METALCTL_API_URL := $(or $(METALCTL_API_URL),http://api.172.17.0.1.nip.io:8080/metal)
-METAL_APIV2_URL := $(or $(METAL_APIV2_URL),http://v2.api.172.17.0.1.nip.io:8080)
+METAL_APIV2_URL := $(or $(METAL_APIV2_URL),http://v2.172.17.0.1.nip.io:8080)
 
 MKE2FS_CONFIG := $(shell pwd)/mke2fs.conf
 # Default values

README.md

@@ -14,6 +14,9 @@ This project can also be used as a template for writing your own metal-stack dep
 - [Known Limitations](#known-limitations)
 - [Try it out](#try-it-out)
     - [Power management](#power-management)
+- [Development](#development)
+    - [Release vector](#release-vector)
+    - [Using local checkouts of dependencies](#using-local-checkouts-of-dependencies)
 - [Flavors](#flavors)
 - [Network topology](#network-topology)
 - [V2 Quickstart](#v2-quickstart)
@@ -191,7 +194,7 @@ make power-<on,reset,off>-<machine name>
 ```
 
 ## Development
-If you want to contribute to the _metal-stack_ project, you can use the mini-lab as a local development environment. It allows you to quickly test changes to the _metal-stack_ components without needing any external clusters or hardware. 
+If you want to contribute to the _metal-stack_ project, you can use the mini-lab as a local development environment. It allows you to quickly test changes to the _metal-stack_ components without needing any external clusters or hardware.
 You can also use it to test changes to the Ansible roles and modules used by the _metal-stack_.
 
 ### Release vector
@@ -209,7 +212,7 @@ Further overrides can be looked up in `metal-roles` where the mapping is defined
 
 ### Using local checkouts of dependencies
 
-By default, the `mini-lab` runs with pre-packaged Ansible roles and modules. 
+By default, the `mini-lab` runs with pre-packaged Ansible roles and modules.
 If you want to use local checkouts of dependencies for development, you must start the `mini-lab` with `DEV=true`:
 
 ```bash
@@ -272,5 +275,5 @@ Password: Gerrit.Guest123!
 
 Zitadel Admin:
 
-User: admin@metal-stack.zitadel.172.17.0.1.nip.io
+User: admin@metal-stack.auth.172.17.0.1.nip.io
 Password: Password1!

inventories/group_vars/control_plane/dex.yaml

@@ -16,11 +16,10 @@ metal_api_nsq_tcp_address: nsqd:4150
 metal_apiserver_pdb_min_available: 1
 
 metal_apiserver_enabled: true
-metal_apiserver_url: http://v2.api.{{ metal_control_plane_ingress_dns }}:8080
+metal_apiserver_url: http://v2.{{ metal_control_plane_ingress_dns }}:8080
 
-metal_apiserver_oidc_secret_name: zitadel-client-credentials
-metal_apiserver_oidc_discovery_url: https://zitadel.{{ metal_control_plane_ingress_dns }}:4443/.well-known/openid-configuration
-metal_apiserver_oidc_end_session_url: "https://zitadel.{{ metal_control_plane_ingress_dns }}:4443/oidc/v1/end_session"
+metal_apiserver_oidc_discovery_url: https://auth.{{ metal_control_plane_ingress_dns }}:4443/.well-known/openid-configuration
+metal_apiserver_oidc_end_session_url: "https://auth.{{ metal_control_plane_ingress_dns }}:4443/oidc/v1/end_session"
 
 metal_apiserver_secure_cookie: false
 

inventories/group_vars/control_plane/metal.yml

@@ -1,6 +1,6 @@
 ---
 zitadel_endpoint: zitadel.{{ metal_control_plane_namespace }}.svc.cluster.local
-zitadel_external_domain: zitadel.{{ metal_control_plane_ingress_dns }}
+zitadel_external_domain: auth.{{ metal_control_plane_ingress_dns }}
 zitadel_ingress_dns: https://{{ zitadel_external_domain }}:4443
 zitadel_port: 8080
 zitadel_skip_verify_tls: true
@@ -23,4 +23,4 @@ zitadel_init_config:
     # later id will be added but currently not possible with zitadel
     id: metal-stack
     name: metal-stack
-    redirect_uri: http://v2.api.172.17.0.1.nip.io:8080/auth/openid-connect/callback
+    redirect_uri: http://v2.172.17.0.1.nip.io:8080/auth/openid-connect/callback