diff --git a/configure.sh b/configure.sh index c0403d5b..2e92a7f7 100755 --- a/configure.sh +++ b/configure.sh @@ -108,7 +108,7 @@ _has_envar() { _has_valid_ip() { local ip="${1}" local variable_name="${2}" - + if ! ipcalc "${ip}" | awk 'BEGIN{FS=":"; is_invalid=0} /^INVALID/ {is_invalid=1; print $1} END{exit is_invalid}' >/dev/null 2>&1; then _log "INFO" "Variable '${variable_name}' has an invalid IP address '${ip}'" exit 1 @@ -123,14 +123,14 @@ verify_gpg() { if ! gpg --list-keys "${BOOTSTRAP_PERSONAL_KEY_FP}" >/dev/null 2>&1; then _log "ERROR" "Invalid Personal GPG FP ${BOOTSTRAP_PERSONAL_KEY_FP}" - exit 1 + exit 1 else _log "INFO" "Found Personal GPG Fingerprint '${BOOTSTRAP_PERSONAL_KEY_FP}'" fi if ! gpg --list-keys "${BOOTSTRAP_FLUX_KEY_FP}" >/dev/null 2>&1; then _log "ERROR" "Invalid Flux GPG FP '${BOOTSTRAP_FLUX_KEY_FP}'" - exit 1 + exit 1 else _log "INFO" "Found Flux GPG Fingerprint '${BOOTSTRAP_FLUX_KEY_FP}'" fi @@ -260,6 +260,7 @@ generate_ansible_host_secrets() { generate_ansible_hosts() { local worker_node_count= { + printf -- "---\n" printf "kubernetes:\n" printf " children:\n" printf " master:\n" diff --git a/tmpl/cluster/kube-vip-daemonset.yaml b/tmpl/cluster/kube-vip-daemonset.yaml index e7994a12..9808d0fa 100644 --- a/tmpl/cluster/kube-vip-daemonset.yaml +++ b/tmpl/cluster/kube-vip-daemonset.yaml @@ -44,9 +44,9 @@ spec: securityContext: capabilities: add: - - NET_ADMIN - - NET_RAW - - SYS_TIME + - NET_ADMIN + - NET_RAW + - SYS_TIME hostAliases: - hostnames: - kubernetes