Fix some typo (#9056)

* fix ingress controller task name

* fix calico word

* add check typo
This commit is contained in:
Samuel Liu 2022-07-12 00:49:48 +08:00 committed by GitHub
parent 058e05df41
commit d821bed2ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 3 deletions

View file

@ -39,7 +39,7 @@
ingress_nginx_templates: "{{ ingress_nginx_templates_for_psp + ingress_nginx_templates }}" ingress_nginx_templates: "{{ ingress_nginx_templates_for_psp + ingress_nginx_templates }}"
when: podsecuritypolicy_enabled when: podsecuritypolicy_enabled
- name: NGINX Ingress Controller | Append extra templates to NGINX Ingress Templates list for PodSecurityPolicy - name: NGINX Ingress Controller | Append extra templates to NGINX Ingress Templates list for webhook
set_fact: set_fact:
ingress_nginx_templates: "{{ ingress_nginx_templates + ingress_nginx_templates_for_webhook }}" ingress_nginx_templates: "{{ ingress_nginx_templates + ingress_nginx_templates_for_webhook }}"
when: ingress_nginx_webhook_enabled when: ingress_nginx_webhook_enabled

View file

@ -143,7 +143,7 @@ calico_allow_ip_forwarding: false
calico_ipam_strictaffinity: false calico_ipam_strictaffinity: false
# Calico IPAM autoAllocateBlocks # Calico IPAM autoAllocateBlocks
calcio_ipam_autoallocateblocks: true calico_ipam_autoallocateblocks: true
# Calico IPAM maxBlocksPerHost, default 0 # Calico IPAM maxBlocksPerHost, default 0
calico_ipam_maxblocksperhost: 0 calico_ipam_maxblocksperhost: 0

View file

@ -15,6 +15,15 @@
run_once: True run_once: True
delegate_to: "{{ groups['kube_control_plane'][0] }}" delegate_to: "{{ groups['kube_control_plane'][0] }}"
- name: Stop if legacy encapsulation variables are detected (calcio_ipam_autoallocateblocks)
assert:
that:
- calcio_ipam_autoallocateblocks is not defined
msg: "'calcio_ipam_autoallocateblocks' configuration variable is deprecated, it's a typo, please configure your inventory with 'calico_ipam_autoallocateblocks' set to 'true' or 'false' according to your specific needs"
run_once: True
delegate_to: "{{ groups['kube_control_plane'][0] }}"
- name: Stop if incompatible network plugin and cloudprovider - name: Stop if incompatible network plugin and cloudprovider
assert: assert:
that: that:

View file

@ -3,6 +3,6 @@ kind: IPAMConfig
metadata: metadata:
name: default name: default
spec: spec:
autoAllocateBlocks: {{ calcio_ipam_autoallocateblocks }} autoAllocateBlocks: {{ calico_ipam_autoallocateblocks }}
strictAffinity: {{ calico_ipam_strictaffinity }} strictAffinity: {{ calico_ipam_strictaffinity }}
maxBlocksPerHost: {{ calico_ipam_maxblocksperhost }} maxBlocksPerHost: {{ calico_ipam_maxblocksperhost }}