C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the invalid kube vip manifest (#8831)

Browse source 
* add Feature synchronized time checking

* fix-invalid-kube-vip-manifest
This commit is contained in:
Kay Yan 2022-05-18 14:48:55 +08:00 committed by GitHub
parent eea7bb7692
commit 3d8f3bc0b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
roles/kubernetes/node/templates/manifests/kube-vip.manifest.j2
View file

@ -14,31 +14,31 @@ spec:
value: {{ kube_vip_arp_enabled | string | to_json }} value: {{ kube_vip_arp_enabled | string | to_json }}
- name: port - name: port
value: "6443" value: "6443"
{% if kube_vip_interface %} {% if kube_vip_interface %}
- name: vip_interface - name: vip_interface
value: "{{ kube_vip_interface | string | to_json }}" value: {{ kube_vip_interface | string | to_json }}
{% endif %} {% endif %}
{% if kube_vip_services_interface %} {% if kube_vip_services_interface %}
- name: vip_servicesinterface - name: vip_servicesinterface
value: {{ kube_vip_services_interface | string | to_json }} value: {{ kube_vip_services_interface | string | to_json }}
{% endif %} {% endif %}
{% if kube_vip_cidr %} {% if kube_vip_cidr %}
- name: vip_cidr - name: vip_cidr
value: {{ kube_vip_cidr | string | to_json }} value: {{ kube_vip_cidr | string | to_json }}
{% endif %} {% endif %}
{% if kube_vip_controlplane_enabled %} {% if kube_vip_controlplane_enabled %}
- name: cp_enable - name: cp_enable
value: "true" value: "true"
- name: cp_namespace - name: cp_namespace
value: kube-system value: kube-system
- name: vip_ddns - name: vip_ddns
value: {{ kube_vip_ddns_enabled | string | to_json }} value: {{ kube_vip_ddns_enabled | string | to_json }}
{% endif %} {% endif %}
{% if kube_vip_services_enabled %} {% if kube_vip_services_enabled %}
- name: svc_enable - name: svc_enable
value: "true" value: "true"
{% endif %} {% endif %}
{% if kube_vip_leader_election_enabled %} {% if kube_vip_leader_election_enabled %}
- name: vip_leaderelection - name: vip_leaderelection
value: "true" value: "true"
- name: vip_leaseduration - name: vip_leaseduration
@ -47,8 +47,8 @@ spec:
value: "3" value: "3"
- name: vip_retryperiod - name: vip_retryperiod
value: "1" value: "1"
{% endif %} {% endif %}
{% if kube_vip_bgp_enabled %} {% if kube_vip_bgp_enabled %}
- name: bgp_enable - name: bgp_enable
value: "true" value: "true"
- name: bgp_routerid - name: bgp_routerid
@ -61,11 +61,11 @@ spec:
value: {{ kube_vip_bgp_peerpass | to_json }} value: {{ kube_vip_bgp_peerpass | to_json }}
- name: bgp_peeras - name: bgp_peeras
value: {{ kube_vip_bgp_peeras | to_json }} value: {{ kube_vip_bgp_peeras | to_json }}
{% if kube_vip_bgppeers %} {% if kube_vip_bgppeers %}
- name: bgp_peers - name: bgp_peers
value: {{ kube_vip_bgp_peeras | join(',') | to_json }} value: {{ kube_vip_bgp_peeras | join(',') | to_json }}
{% endif %} {% endif %}
{% endif %} {% endif %}
- name: address - name: address
value: {{ kube_vip_address | to_json }} value: {{ kube_vip_address | to_json }}
image: {{ kube_vip_image_repo }}:{{ kube_vip_image_tag }} image: {{ kube_vip_image_repo }}:{{ kube_vip_image_tag }}

6
tests/files/packet_centos7-flannel-addons-ha.yml
View file

@ -40,3 +40,9 @@ etcd_tls_cipher_suites:
containerd_storage_dir: /var/data/containerd containerd_storage_dir: /var/data/containerd
containerd_state_dir: /run/cri/containerd containerd_state_dir: /run/cri/containerd
containerd_oom_score: -999 containerd_oom_score: -999
# Kube-vip
kube_vip_enabled: true
kube_vip_arp_enabled: true
kube_vip_controlplane_enabled: true
kube_vip_address: 192.168.1.100