Merge branch 'improvement/calico-config' into q/2.0

Author: bert-e

salt/metalk8s/calico/deployed.sls

@@ -74,8 +74,10 @@ Deploy calico-node (DaemonSet):
                     value: "k8s,bgp"
                   - name: IP
                     value: "autodetect"
+                  - name: IP_AUTODETECTION_METHOD
+                    value: can-reach={{ networks.workload_plane.split('/')[0] }}
                   - name: CALICO_IPV4POOL_IPIP
-                    value: "Always"
+                    value: "CrossSubnet"
                   - name: FELIX_IPINIPMTU
                     valueFrom:
                       configMapKeyRef: