Fix the invalid kube vip manifest (#8831)

* add Feature synchronized time checking * fix-invalid-kube-vip-manifest
kubernetes-sigs · May 18, 2022 · 3d8f3bc · 3d8f3bc
1 parent eea7bb7
commit 3d8f3bc
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/roles/kubernetes/node/templates/manifests/kube-vip.manifest.j2 b/roles/kubernetes/node/templates/manifests/kube-vip.manifest.j2
@@ -14,31 +14,31 @@ spec:
       value: {{ kube_vip_arp_enabled | string | to_json }}
     - name: port
       value: "6443"
-    {% if kube_vip_interface %}
+{% if kube_vip_interface %}
     - name: vip_interface
-      value: "{{ kube_vip_interface | string | to_json }}"
-    {% endif %}
-    {% if kube_vip_services_interface %}
+      value: {{ kube_vip_interface | string | to_json }}
+{% endif %}
+{% if kube_vip_services_interface %}
     - name: vip_servicesinterface
       value: {{ kube_vip_services_interface | string | to_json }}
-    {% endif %}
-    {% if kube_vip_cidr %}
+{% endif %}
+{% if kube_vip_cidr %}
     - name: vip_cidr
       value: {{ kube_vip_cidr | string | to_json }}
-    {% endif %}
-    {% if kube_vip_controlplane_enabled %}
+{% endif %}
+{% if kube_vip_controlplane_enabled %}
     - name: cp_enable
       value: "true"
     - name: cp_namespace
       value: kube-system
     - name: vip_ddns
       value: {{ kube_vip_ddns_enabled | string | to_json }}
-    {% endif %}
-    {% if kube_vip_services_enabled %}
+{% endif %}
+{% if kube_vip_services_enabled %}
     - name: svc_enable
       value: "true"
-    {% endif %}
-    {% if kube_vip_leader_election_enabled %}
+{% endif %}
+{% if kube_vip_leader_election_enabled %}
     - name: vip_leaderelection
       value: "true"
     - name: vip_leaseduration
@@ -47,8 +47,8 @@ spec:
       value: "3"
     - name: vip_retryperiod
       value: "1"
-    {% endif %}
-    {% if kube_vip_bgp_enabled %}
+{% endif %}
+{% if kube_vip_bgp_enabled %}
     - name: bgp_enable
       value: "true"
     - name: bgp_routerid
@@ -61,11 +61,11 @@ spec:
       value: {{ kube_vip_bgp_peerpass | to_json }}
     - name: bgp_peeras
       value: {{ kube_vip_bgp_peeras | to_json }}
-    {% if kube_vip_bgppeers %}
+{% if kube_vip_bgppeers %}
     - name: bgp_peers
       value: {{ kube_vip_bgp_peeras | join(',')  | to_json }}
-    {% endif %}
-    {% endif %}
+{% endif %}
+{% endif %}
     - name: address
       value: {{ kube_vip_address | to_json }}
     image: {{ kube_vip_image_repo }}:{{ kube_vip_image_tag }}

diff --git a/tests/files/packet_centos7-flannel-addons-ha.yml b/tests/files/packet_centos7-flannel-addons-ha.yml
@@ -40,3 +40,9 @@ etcd_tls_cipher_suites:
 containerd_storage_dir: /var/data/containerd
 containerd_state_dir: /run/cri/containerd
 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