@@ -124,6 +124,12 @@ machine:
124124 op: create
125125
126126cluster:
127+ apiServer:
128+ extraArgs:
129+ oidc-issuer-url: "https://keycloak.example.org/realms/cozy"
130+ oidc-client-id: "kubernetes"
131+ oidc-username-claim: "preferred_username"
132+ oidc-groups-claim: "groups"
127133 network:
128134 cni:
129135 name: none
@@ -182,7 +188,8 @@ timeout 60 sh -c 'until nc -nzv 192.168.123.11 50000 && nc -nzv 192.168.123.12 5
182188timeout 10 sh -c ' until talosctl bootstrap -n 192.168.123.11 -e 192.168.123.11; do sleep 1; done'
183189
184190# Wait for etcd
185- timeout 180 sh -c ' while talosctl etcd members -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.10 2>&1 | grep "rpc error"; do sleep 1; done'
191+ timeout 180 sh -c ' until timeout -s 9 2 talosctl etcd members -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.10 2>&1; do sleep 1; done'
192+ timeout 60 sh -c ' while talosctl etcd members -n 192.168.123.11,192.168.123.12,192.168.123.13 -e 192.168.123.10 2>&1 | grep "rpc error"; do sleep 1; done'
186193
187194rm -f kubeconfig
188195talosctl kubeconfig kubeconfig -e 192.168.123.10 -n 192.168.123.10
@@ -203,6 +210,8 @@ data:
203210 ipv4-pod-gateway: "10.244.0.1"
204211 ipv4-svc-cidr: "10.96.0.0/16"
205212 ipv4-join-cidr: "100.64.0.0/16"
213+ root-host: example.org
214+ api-server-endpoint: https://192.168.123.10:6443
206215EOT
207216
208217#
@@ -287,23 +296,23 @@ spec:
287296 avoidBuggyIPs: false
288297EOT
289298
290- kubectl patch -n tenant-root hr/tenant- root --type=merge -p ' {"spec":{ "values ":{
299+ kubectl patch -n tenant-root tenants.apps.cozystack.io root --type=merge -p ' {"spec":{
291300 "host": "example.org",
292301 "ingress": true,
293302 "monitoring": true,
294303 "etcd": true,
295304 "isolated": true
296- }}} '
305+ }}'
297306
298307# Wait for HelmRelease be created
299308timeout 60 sh -c ' until kubectl get hr -n tenant-root etcd ingress monitoring tenant-root; do sleep 1; done'
300309
301310# Wait for HelmReleases be installed
302311kubectl wait --timeout=2m --for=condition=ready -n tenant-root hr etcd ingress monitoring tenant-root
303312
304- kubectl patch -n tenant-root hr/ ingress --type=merge -p ' {"spec":{ "values ":{
313+ kubectl patch -n tenant-root ingresses.apps.cozystack.io ingress --type=merge -p ' {"spec":{
305314 "dashboard": true
306- }}} '
315+ }}'
307316
308317# Wait for nginx-ingress-controller
309318timeout 60 sh -c ' until kubectl get deploy -n tenant-root root-ingress-controller; do sleep 1; done'
@@ -326,3 +335,12 @@ ip=$(kubectl get svc -n tenant-root root-ingress-controller -o jsonpath='{.statu
326335
327336# Check Grafana
328337curl -sS -k " https://$ip " -H ' Host: grafana.example.org' | grep Found
338+
339+
340+ # Test OIDC
341+ kubectl patch -n cozy-system cm/cozystack --type=merge -p ' {"data":{
342+ "oidc-enable": "true"
343+ }}'
344+
345+ timeout 60 sh -c ' until kubectl get hr -n cozy-keycloak keycloak keycloak-configure keycloak-operator; do sleep 1; done'
346+ kubectl wait --timeout=10m --for=condition=ready -n cozy-keycloak hr keycloak keycloak-configure keycloak-operator
0 commit comments