Fix k8s route definition.
route resource changed to post-up command because of bug in salt linux state.
Change-Id: I79756ad4f218ce8bf7da38aa6b33bdf5c62a0916
diff --git a/classes/cluster/k8s-compact/kubernetes/compute.yml b/classes/cluster/k8s-compact/kubernetes/compute.yml
index 13b308d..4537d07 100644
--- a/classes/cluster/k8s-compact/kubernetes/compute.yml
+++ b/classes/cluster/k8s-compact/kubernetes/compute.yml
@@ -47,7 +47,7 @@
dns:
- 172.18.208.44
- 172.18.176.4
- - ${_param:kubernetes_internal_dns_address
+ - ${_param:kubernetes_internal_dns_address}
interface:
ens3:
enabled: true
@@ -57,8 +57,5 @@
address: ${_param:single_address}
netmask: 255.255.255.0
gateway: 192.168.122.1
- route:
- kubernetes_services:
- address: 10.201.0.0
- netmask: 255.255.0.0
- gateway: ${_param:single_address}
+ post_up_cmds:
+ - ip r rep 10.254.0.0/16 via ${_param:deploy_address}
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
index fd3b379..29a179b 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/compute.yml
@@ -62,14 +62,13 @@
address: ${_param:deploy_address}
netmask: 255.255.255.0
gateway: 192.168.10.1
- route:
- kubernetes_services:
- address: 10.254.0.0
- netmask: 255.255.0.0
- gateway: ${_param:deploy_address}
+ post_up_cmds:
+ - ip r rep 10.254.0.0/16 via ${_param:deploy_address}
ens4:
enabled: true
type: eth
proto: static
address: ${_param:single_address}
netmask: '255.255.255.0'
+ ipflush_onchange: true
+ restart_on_ipflush: true
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
index c7bbc73..646db96 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -56,14 +56,13 @@
address: ${_param:deploy_address}
netmask: 255.255.255.0
gateway: 192.168.10.1
- route:
- kubernetes_services:
- address: 10.254.0.0
- netmask: 255.255.0.0
- gateway: ${_param:deploy_address}
+ post_up_cmds:
+ - ip r rep 10.254.0.0/16 via ${_param:deploy_address}
ens4:
enabled: true
type: eth
proto: static
address: ${_param:single_address}
netmask: '255.255.255.0'
+ ipflush_onchange: true
+ restart_on_ipflush: true