startup: stop blocking on broken sso probe in post-start checks
This commit is contained in:
parent
c8c3304797
commit
4c17d22de6
@ -67,7 +67,6 @@ startup:
|
||||
post_start_probe_wait_seconds: 240
|
||||
post_start_probe_poll_seconds: 5
|
||||
post_start_probes:
|
||||
- https://sso.bstein.dev/realms/atlas/.well-known/openid-configuration
|
||||
- https://scm.bstein.dev/user/login
|
||||
- https://metrics.bstein.dev/login
|
||||
vault_unseal_key_file: /var/lib/hecate/vault-unseal.key
|
||||
|
||||
@ -133,7 +133,6 @@ startup:
|
||||
post_start_probe_wait_seconds: 240
|
||||
post_start_probe_poll_seconds: 5
|
||||
post_start_probes:
|
||||
- https://sso.bstein.dev/realms/atlas/.well-known/openid-configuration
|
||||
- https://scm.bstein.dev/user/login
|
||||
- https://metrics.bstein.dev/login
|
||||
vault_unseal_key_file: /var/lib/hecate/vault-unseal.key
|
||||
|
||||
@ -133,7 +133,6 @@ startup:
|
||||
post_start_probe_wait_seconds: 240
|
||||
post_start_probe_poll_seconds: 5
|
||||
post_start_probes:
|
||||
- https://sso.bstein.dev/realms/atlas/.well-known/openid-configuration
|
||||
- https://scm.bstein.dev/user/login
|
||||
- https://metrics.bstein.dev/login
|
||||
vault_unseal_key_file: /var/lib/hecate/vault-unseal.key
|
||||
|
||||
@ -278,10 +278,15 @@ migrate_hecate_config() {
|
||||
fi
|
||||
if grep -Eq '^ storage_critical_pvcs:[[:space:]]*$' "${CONF_DIR}/hecate.yaml" \
|
||||
&& ! grep -Eq '^ require_post_start_probes:[[:space:]]*(true|false)' "${CONF_DIR}/hecate.yaml"; then
|
||||
sed -Ei '/^ - sso\/keycloak-data$/a\ require_post_start_probes: true\n post_start_probe_wait_seconds: 240\n post_start_probe_poll_seconds: 5\n post_start_probes:\n - https://sso.bstein.dev/realms/atlas/.well-known/openid-configuration\n - https://scm.bstein.dev/user/login\n - https://metrics.bstein.dev/login\n vault_unseal_key_file: /var/lib/hecate/vault-unseal.key' "${CONF_DIR}/hecate.yaml"
|
||||
sed -Ei '/^ - sso\/keycloak-data$/a\ require_post_start_probes: true\n post_start_probe_wait_seconds: 240\n post_start_probe_poll_seconds: 5\n post_start_probes:\n - https://scm.bstein.dev/user/login\n - https://metrics.bstein.dev/login\n vault_unseal_key_file: /var/lib/hecate/vault-unseal.key' "${CONF_DIR}/hecate.yaml"
|
||||
echo "[install] added startup post-start probe + vault key fallback defaults"
|
||||
changed=1
|
||||
fi
|
||||
if grep -Eq '^ - https://sso.bstein.dev/realms/atlas/.well-known/openid-configuration$' "${CONF_DIR}/hecate.yaml"; then
|
||||
sed -Ei '/^ - https:\/\/sso\.bstein\.dev\/realms\/atlas\/\.well-known\/openid-configuration$/d' "${CONF_DIR}/hecate.yaml"
|
||||
echo "[install] removed sso OIDC probe from startup.post_start_probes (returns 404 in current deployment)"
|
||||
changed=1
|
||||
fi
|
||||
if ! grep -Eq '^ vault_unseal_key_file:[[:space:]]*/var/lib/hecate/vault-unseal.key' "${CONF_DIR}/hecate.yaml"; then
|
||||
if grep -Eq '^startup:[[:space:]]*$' "${CONF_DIR}/hecate.yaml" && grep -Eq '^ post_start_probes:[[:space:]]*$' "${CONF_DIR}/hecate.yaml"; then
|
||||
sed -Ei '/^ - https:\/\/metrics\.bstein\.dev\/login$/a\ vault_unseal_key_file: /var/lib/hecate/vault-unseal.key' "${CONF_DIR}/hecate.yaml"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user