feat!: rename BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDRESS to BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDR

Signed-off-by: Devin Buhl <devin@buhl.casa>
This commit is contained in:
Devin Buhl committed 2022-05-06 12:57:21 -04:00
1 parent e19ba910f5
commit 718427c9b8
4 files changed
+11 -11

No files matched your search

+1 -1
View File
@@ -43,7 +43,7 @@ export BOOTSTRAP_ANSIBLE_KUBE_VIP_INTERFACE=""
# Pick a unused IP that is on the same network as your nodes
# and also outside the ${BOOTSTRAP_METALLB_TRAEFIK_ADDR} range
# e.g. 192.168.1.254
export BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDRESS=""
export BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDR=""
#
# Default prefixes for hostnames assigned by Ansible
+8 -8
View File
@@ -174,8 +174,8 @@ verify_binaries() {
}
verify_kubevip() {
_has_envar "BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDRESS"
_has_valid_ip "${BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDRESS}" "BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDRESS"
_has_envar "BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDR"
_has_valid_ip "${BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDR}" "BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDR"
}
verify_metallb() {
@@ -284,18 +284,18 @@ verify_ansible_hosts() {
_has_envar "${node_control}"
_has_optional_envar "${node_hostname}"
if [[ "${node_addr}" == "${BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDRESS}" ]]; then
_log "ERROR" "The kube-vip IP '${BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDRESS}' should not be the same as the IP for node '${node_addr}'"
if [[ "${!node_addr}" == "${BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDR}" ]]; then
_log "ERROR" "The kube-vip IP '${BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDR}' should not be the same as the IP for node '${!node_addr}'"
exit 1
fi
if [[ "${node_addr}" == "${BOOTSTRAP_METALLB_K8S_GATEWAY_ADDR}" ]]; then
_log "ERROR" "The k8s-gateway load balancer IP '${BOOTSTRAP_METALLB_K8S_GATEWAY_ADDR}' should not be the same as the IP for node '${node_addr}'"
if [[ "${!node_addr}" == "${BOOTSTRAP_METALLB_K8S_GATEWAY_ADDR}" ]]; then
_log "ERROR" "The k8s-gateway load balancer IP '${BOOTSTRAP_METALLB_K8S_GATEWAY_ADDR}' should not be the same as the IP for node '${!node_addr}'"
exit 1
fi
if [[ "${node_addr}" == "${BOOTSTRAP_METALLB_TRAEFIK_ADDR}" ]]; then
_log "ERROR" "The traefik load balancer IP '${BOOTSTRAP_METALLB_TRAEFIK_ADDR}' should not be the same as the IP for node '${node_addr}'"
if [[ "${!node_addr}" == "${BOOTSTRAP_METALLB_TRAEFIK_ADDR}" ]]; then
_log "ERROR" "The traefik load balancer IP '${BOOTSTRAP_METALLB_TRAEFIK_ADDR}' should not be the same as the IP for node '${!node_addr}'"
exit 1
fi
+1 -1
View File
@@ -2,4 +2,4 @@
# (string) The interface on the host kube-vip should attach to
kubevip_interface: "${BOOTSTRAP_ANSIBLE_KUBE_VIP_INTERFACE}"
# (string) The ARP address kube-vip broadcasts
kubevip_address: "${BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDRESS}"
kubevip_address: "${BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDR}"
+1 -1
View File
@@ -40,7 +40,7 @@ spec:
- name: svc_enable
value: "false"
- name: address
value: "${BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDRESS}"
value: "${BOOTSTRAP_ANSIBLE_KUBE_VIP_ADDR}"
securityContext:
capabilities:
add: