Skip to content

Commit 32da750

Browse files
authored
fix: change kube_vip to kube-vip (#3118)
Signed-off-by: redscholar <blacktiledhouse@gmail.com>
1 parent de76cc5 commit 32da750

26 files changed

Lines changed: 42 additions & 42 deletions

File tree

builtin/capkk/roles/precheck/env_check/tasks/kubernetes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{{ not $existIP }}
2121
fail_msg: >-
2222
"kubernetes.control_plane_endpoint.kube_vip.address" should be a un-used ip address.
23-
when: .kubernetes.control_plane_endpoint.type | eq "kube_vip"
23+
when: .kubernetes.control_plane_endpoint.type | eq "kube-vip"
2424

2525
- name: Stop if unsupported version of Kubernetes
2626
run_once: true

builtin/capkk/roles/uninstall/kubernetes/tasks/network.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
{{- end }}
3434
3535
- name: Delete arp by kube-vip
36-
when: eq .kubernetes.control_plane_endpoint.type "kube_vip"
36+
when: eq .kubernetes.control_plane_endpoint.type "kube-vip"
3737
command: |
3838
ip neigh show | grep {{ .kubernetes.control_plane_endpoint.kube_vip.address }} | awk '{print $1 " dev " $3}' | xargs -r -L1 ip neigh delete
3939
ip -o addr show | grep {{ .kubernetes.control_plane_endpoint.kube_vip.address }} | awk '{system("ip addr del "$4" dev "$2)}'

builtin/core/defaults/config/v1.23.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ spec:
1212
sandbox_image:
1313
tag: "3.6"
1414
control_plane_endpoint:
15-
# Supported HA types: local, kube_vip, haproxy.
15+
# Supported HA types: local, kube-vip, haproxy.
1616
# If set to local, configure local hostname resolution as follows:
1717
# - Control-plane nodes: 127.0.0.1 .kubernetes.control_plane_endpoint.host
1818
# - Worker nodes: .init_kubernetes_node .kubernetes.control_plane_endpoint.host
1919
type: local
20-
# Kube-vip image tag used for static pod deployment (when type is kube_vip).
20+
# Kube-vip image tag used for static pod deployment (when type is kube-vip).
2121
kube_vip:
2222
image:
2323
tag: v0.7.2

builtin/core/defaults/config/v1.24.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ spec:
1212
sandbox_image:
1313
tag: "3.7"
1414
control_plane_endpoint:
15-
# Supported HA types: local, kube_vip, haproxy.
15+
# Supported HA types: local, kube-vip, haproxy.
1616
# If set to local, configure local hostname resolution as follows:
1717
# - Control-plane nodes: 127.0.0.1 .kubernetes.control_plane_endpoint.host
1818
# - Worker nodes: .init_kubernetes_node .kubernetes.control_plane_endpoint.host
1919
type: local
20-
# Kube-vip image tag used for static pod deployment (when type is kube_vip).
20+
# Kube-vip image tag used for static pod deployment (when type is kube-vip).
2121
kube_vip:
2222
image:
2323
tag: v0.7.2

builtin/core/defaults/config/v1.25.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ spec:
1212
sandbox_image:
1313
tag: "3.8"
1414
control_plane_endpoint:
15-
# Supported HA types: local, kube_vip, haproxy.
15+
# Supported HA types: local, kube-vip, haproxy.
1616
# If set to local, configure local hostname resolution as follows:
1717
# - Control-plane nodes: 127.0.0.1 .kubernetes.control_plane_endpoint.host
1818
# - Worker nodes: .init_kubernetes_node .kubernetes.control_plane_endpoint.host
1919
type: local
20-
# Kube-vip image tag used for static pod deployment (when type is kube_vip).
20+
# Kube-vip image tag used for static pod deployment (when type is kube-vip).
2121
kube_vip:
2222
image:
2323
tag: v0.7.2

builtin/core/defaults/config/v1.26.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ spec:
1212
sandbox_image:
1313
tag: "3.9"
1414
control_plane_endpoint:
15-
# Supported HA types: local, kube_vip, haproxy.
15+
# Supported HA types: local, kube-vip, haproxy.
1616
# If set to local, configure local hostname resolution as follows:
1717
# - Control-plane nodes: 127.0.0.1 .kubernetes.control_plane_endpoint.host
1818
# - Worker nodes: .init_kubernetes_node .kubernetes.control_plane_endpoint.host
1919
type: local
20-
# Kube-vip image tag used for static pod deployment (when type is kube_vip).
20+
# Kube-vip image tag used for static pod deployment (when type is kube-vip).
2121
kube_vip:
2222
image:
2323
tag: v0.7.2

builtin/core/defaults/config/v1.27.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ spec:
1212
sandbox_image:
1313
tag: "3.9"
1414
control_plane_endpoint:
15-
# Supported HA types: local, kube_vip, haproxy.
15+
# Supported HA types: local, kube-vip, haproxy.
1616
# If set to local, configure local hostname resolution as follows:
1717
# - Control-plane nodes: 127.0.0.1 .kubernetes.control_plane_endpoint.host
1818
# - Worker nodes: .init_kubernetes_node .kubernetes.control_plane_endpoint.host
1919
type: local
20-
# Kube-vip image tag used for static pod deployment (when type is kube_vip).
20+
# Kube-vip image tag used for static pod deployment (when type is kube-vip).
2121
kube_vip:
2222
image:
2323
tag: v0.7.2

builtin/core/defaults/config/v1.28.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ spec:
1212
sandbox_image:
1313
tag: "3.9"
1414
control_plane_endpoint:
15-
# Supported HA types: local, kube_vip, haproxy.
15+
# Supported HA types: local, kube-vip, haproxy.
1616
# If set to local, configure local hostname resolution as follows:
1717
# - Control-plane nodes: 127.0.0.1 .kubernetes.control_plane_endpoint.host
1818
# - Worker nodes: .init_kubernetes_node .kubernetes.control_plane_endpoint.host
1919
type: local
20-
# Kube-vip image tag used for static pod deployment (when type is kube_vip).
20+
# Kube-vip image tag used for static pod deployment (when type is kube-vip).
2121
kube_vip:
2222
image:
2323
tag: v0.7.2

builtin/core/defaults/config/v1.29.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ spec:
1212
sandbox_image:
1313
tag: "3.9"
1414
control_plane_endpoint:
15-
# Supported HA types: local, kube_vip, haproxy.
15+
# Supported HA types: local, kube-vip, haproxy.
1616
# If set to local, configure local hostname resolution as follows:
1717
# - Control-plane nodes: 127.0.0.1 .kubernetes.control_plane_endpoint.host
1818
# - Worker nodes: .init_kubernetes_node .kubernetes.control_plane_endpoint.host
1919
type: local
20-
# Kube-vip image tag used for static pod deployment (when type is kube_vip).
20+
# Kube-vip image tag used for static pod deployment (when type is kube-vip).
2121
kube_vip:
2222
image:
2323
tag: v0.7.2

builtin/core/defaults/config/v1.30.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ spec:
1212
sandbox_image:
1313
tag: "3.9"
1414
control_plane_endpoint:
15-
# Supported HA types: local, kube_vip, haproxy.
15+
# Supported HA types: local, kube-vip, haproxy.
1616
# If set to local, configure local hostname resolution as follows:
1717
# - Control-plane nodes: 127.0.0.1 .kubernetes.control_plane_endpoint.host
1818
# - Worker nodes: .init_kubernetes_node .kubernetes.control_plane_endpoint.host
1919
type: local
20-
# Kube-vip image tag used for static pod deployment (when type is kube_vip).
20+
# Kube-vip image tag used for static pod deployment (when type is kube-vip).
2121
kube_vip:
2222
image:
2323
tag: v0.7.2

0 commit comments

Comments
 (0)