Rename internal/external nginx to ingress (#910)
This commit is contained in:
1 parent
4e335b284a
commit
2b07190d91
6 files changed
+29
-29
No files matched your search
@@ -67,29 +67,29 @@
|
||||
success_msg: k8s_gateway address {{ bootstrap_k8s_gateway_addr }} is within {{ bootstrap_node_cidr }}.
|
||||
fail_msg: k8s_gateway address {{ bootstrap_k8s_gateway_addr }} is not within {{ bootstrap_node_cidr }}.
|
||||
|
||||
- name: Verify internal nginx
|
||||
- name: Verify internal ingress
|
||||
ansible.builtin.assert:
|
||||
that: bootstrap_internal_nginx_addr is ansible.utils.ipv4
|
||||
success_msg: internal nginx address {{ bootstrap_internal_nginx_addr }} is valid.
|
||||
fail_msg: internal nginx address {{ bootstrap_internal_nginx_addr }} is invalid.
|
||||
that: bootstrap_internal_ingress_addr is ansible.utils.ipv4
|
||||
success_msg: internal ingress address {{ bootstrap_internal_ingress_addr }} is valid.
|
||||
fail_msg: internal ingress address {{ bootstrap_internal_ingress_addr }} is invalid.
|
||||
|
||||
- name: Verify internal nginx in node CIDR
|
||||
- name: Verify internal ingress in node CIDR
|
||||
ansible.builtin.assert:
|
||||
that: bootstrap_node_cidr | ansible.utils.network_in_usable(bootstrap_internal_nginx_addr)
|
||||
success_msg: internal nginx address {{ bootstrap_internal_nginx_addr }} is within {{ bootstrap_node_cidr }}.
|
||||
fail_msg: internal nginx address {{ bootstrap_internal_nginx_addr }} is not within {{ bootstrap_node_cidr }}.
|
||||
that: bootstrap_node_cidr | ansible.utils.network_in_usable(bootstrap_internal_ingress_addr)
|
||||
success_msg: internal ingress address {{ bootstrap_internal_ingress_addr }} is within {{ bootstrap_node_cidr }}.
|
||||
fail_msg: internal ingress address {{ bootstrap_internal_ingress_addr }} is not within {{ bootstrap_node_cidr }}.
|
||||
|
||||
- name: Verify external nginx
|
||||
- name: Verify external ingress
|
||||
ansible.builtin.assert:
|
||||
that: bootstrap_external_nginx_addr is ansible.utils.ipv4
|
||||
success_msg: external nginx address {{ bootstrap_external_nginx_addr }} is valid.
|
||||
fail_msg: external nginx address {{ bootstrap_external_nginx_addr }} is invalid.
|
||||
that: bootstrap_external_ingress_addr is ansible.utils.ipv4
|
||||
success_msg: external ingress address {{ bootstrap_external_ingress_addr }} is valid.
|
||||
fail_msg: external ingress address {{ bootstrap_external_ingress_addr }} is invalid.
|
||||
|
||||
- name: Verify external nginx in node CIDR
|
||||
- name: Verify external ingress in node CIDR
|
||||
ansible.builtin.assert:
|
||||
that: bootstrap_node_cidr | ansible.utils.network_in_usable(bootstrap_external_nginx_addr)
|
||||
success_msg: external nginx address {{ bootstrap_external_nginx_addr }} is within {{ bootstrap_node_cidr }}.
|
||||
fail_msg: external nginx address {{ bootstrap_external_nginx_addr }} is not within {{ bootstrap_node_cidr }}.
|
||||
that: bootstrap_node_cidr | ansible.utils.network_in_usable(bootstrap_external_ingress_addr)
|
||||
success_msg: external ingress address {{ bootstrap_external_ingress_addr }} is within {{ bootstrap_node_cidr }}.
|
||||
fail_msg: external ingress address {{ bootstrap_external_ingress_addr }} is not within {{ bootstrap_node_cidr }}.
|
||||
|
||||
- name: Verify kube-vip
|
||||
ansible.builtin.assert:
|
||||
@@ -108,16 +108,16 @@
|
||||
that: >
|
||||
[
|
||||
bootstrap_k8s_gateway_addr,
|
||||
bootstrap_external_nginx_addr,
|
||||
bootstrap_internal_nginx_addr,
|
||||
bootstrap_external_ingress_addr,
|
||||
bootstrap_internal_ingress_addr,
|
||||
bootstrap_kube_vip_addr
|
||||
] | unique | length == 4
|
||||
success_msg: All IP addresses are unique.
|
||||
fail_msg: All IP addresses are not unique.
|
||||
|
||||
- name: Verify nodes are not the same IPs as k8s_gateway, nginx external/internal or kube-vip
|
||||
- name: Verify nodes are not the same IPs as k8s_gateway, ingress external/internal or kube-vip
|
||||
ansible.builtin.assert:
|
||||
that: item.address not in (bootstrap_k8s_gateway_addr, bootstrap_external_nginx_addr, bootstrap_internal_nginx_addr, bootstrap_kube_vip_addr)
|
||||
that: item.address not in (bootstrap_k8s_gateway_addr, bootstrap_external_ingress_addr, bootstrap_internal_ingress_addr, bootstrap_kube_vip_addr)
|
||||
success_msg: Node address {{ item.address }} is different than k8s_gateway, ingress-nginx or kube-vip.
|
||||
fail_msg: Node address {{ item.address }} is not different than k8s_gateway, ingress-nginx or kube-vip.
|
||||
quiet: true
|
||||
|
||||
Reference in new issue
Block a user