*: add dcr01s{22,24}
Change-Id: I072e825e2e1d199d9da50b9d38a9ffba68e61182
diff --git a/cluster/kube/lib/calico.libsonnet b/cluster/kube/lib/calico.libsonnet
index 0e00ff7..28435ad 100644
--- a/cluster/kube/lib/calico.libsonnet
+++ b/cluster/kube/lib/calico.libsonnet
@@ -213,8 +213,8 @@
hostNetwork: true,
tolerations: [
{ key: "CriticalAddonsOnly", operator: "Exists" },
- { key: "NoExecute", operator: "Exists" },
- { key: "NoSchedule", operator: "Exists" },
+ { effect: "NoExecute", operator: "Exists" },
+ { effect: "NoSchedule", operator: "Exists" },
],
serviceAccountName: env.saNode.metadata.name,
terminationGracePeriodSeconds: 0,
@@ -261,7 +261,7 @@
CALICO_NETWORK_BACKEND: kube.ConfigMapRef(env.cm, "calico_backend"),
CLUSTER_TYPE: "k8s,bgp",
IP: "autodetect",
- IP_AUTODETECTION_METHOD: "interface=eno.*",
+ IP_AUTODETECTION_METHOD: "can-reach=185.236.240.1",
CALICO_IPV4POOL_IPIP: "Always",
FELIX_IPINIPMTU: kube.ConfigMapRef(env.cm, "veth_mtu"),
CALICO_IPV4POOL_CIDR: "10.10.24.0/21",
@@ -270,6 +270,7 @@
FELIX_IPV6SUPPORT: "false",
FELIX_LOGSEVERITYSCREEN: "info",
FELIX_HEALTHENABLED: "true",
+ FELIX_HEALTHHOST: "127.0.0.1",
CALICO_ADVERTISE_CLUSTER_IPS: "10.10.12.0/24",
},
securityContext: {
@@ -282,7 +283,7 @@
httpGet: {
path: "/liveness",
port: 9099,
- host: "localhost",
+ host: "127.0.0.1",
},
periodSeconds: 10,
initialDelaySeconds: 10,