Upstream merge 2020-04-15

.github/workflows/test.yml

@@ -6,8 +6,8 @@ on:
     branches: [ master ]
 
 env:
-  GO_VERSION: 1.12
-  K8S_VERSION: v1.16.4
+  GO_VERSION: 1.13.4
+  K8S_VERSION: v1.17.2
   KIND_CLUSTER_NAME: ovn
   KIND_INSTALL_INGRESS: true
 
@@ -168,11 +168,11 @@ jobs:
       if: always()
       run: |
         mkdir -p /tmp/kind/logs 
-        kind export logs --name ${KIND_CLUSTER_NAME} /tmp/kind/logs
+        kind export logs --name ${KIND_CLUSTER_NAME} --loglevel=debug /tmp/kind/logs
 
     - name: Upload logs
       if: always()
       uses: actions/upload-artifact@v1
       with:
-        name: kind-logs-${{ github.run_id }}-${{ env.JOB_NAME }}
+        name: kind-logs-${{ env.JOB_NAME }}-${{ github.run_id }}
         path: /tmp/kind/logs

contrib/kind.sh

@@ -2,7 +2,26 @@
 
 set -euxo pipefail
 
-K8S_VERSION=${K8S_VERSION:-v1.16.4}
+run_kubectl() {
+  local retries=0
+  local attempts=10
+  while true; do
+    kubectl $@
+    if [[ $? == 0 ]]; then
+      break
+    fi
+
+    ((retries += 1))
+    if [[ "${retries}" -gt ${attempts} ]]; then
+      echo "error: 'kubectl $@' did not succeed, failing"
+      exit 1
+    fi
+    echo "info: waiting for 'kubectl $@' to succeed..."
+    sleep 1
+  done
+}
+
+K8S_VERSION=${K8S_VERSION:-v1.17.2}
 KIND_INSTALL_INGRESS=${KIND_INSTALL_INGRESS:-false}
 KIND_HA=${KIND_HA:-false}
 if [ "$KIND_HA" == true ]; then
@@ -23,9 +42,10 @@ fi
 sed -i "s/apiServerAddress.*/apiServerAddress: ${API_IP}/" ${KIND_CONFIG}
 
 # Create KIND cluster
-CLUSTER_NAME=${CLUSTER_NAME:-ovn}
-kind create cluster --name ${CLUSTER_NAME} --kubeconfig ${HOME}/admin.conf --image kindest/node:${K8S_VERSION} --config=${KIND_CONFIG}
+KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-ovn}
+kind create cluster --name ${KIND_CLUSTER_NAME} --kubeconfig ${HOME}/admin.conf --image kindest/node:${K8S_VERSION} --config=${KIND_CONFIG}
 export KUBECONFIG=${HOME}/admin.conf
+cat ${KUBECONFIG}
 mkdir -p /tmp/kind
 sudo chmod 777 /tmp/kind
 count=0
@@ -50,28 +70,28 @@ echo "ref: $(git rev-parse  --symbolic-full-name HEAD)  commit: $(git rev-parse
 docker build -t ovn-daemonset-f:dev -f Dockerfile.fedora .
 ./daemonset.sh --image=docker.io/library/ovn-daemonset-f:dev --net-cidr=10.244.0.0/16 --svc-cidr=10.96.0.0/12 --gateway-mode="local" --k8s-apiserver=https://${API_IP}:11337 --kind --master-loglevel=5
 popd
-kind load docker-image ovn-daemonset-f:dev --name ${CLUSTER_NAME}
+kind load docker-image ovn-daemonset-f:dev --name ${KIND_CLUSTER_NAME}
 pushd ../dist/yaml
-kubectl create -f ovn-setup.yaml
+run_kubectl create -f ovn-setup.yaml
 CONTROL_NODES=$(docker ps -f name=ovn-control | grep -v NAMES | awk '{ print $NF }')
 for n in $CONTROL_NODES; do
-  kubectl label node $n k8s.ovn.org/ovnkube-db=true
+  run_kubectl label node $n k8s.ovn.org/ovnkube-db=true
   if [ "$KIND_REMOVE_TAINT" == true ]; then
-    kubectl taint node $n node-role.kubernetes.io/master:NoSchedule-
+    run_kubectl taint node $n node-role.kubernetes.io/master:NoSchedule-
   fi
 done
 if [ "$KIND_HA" == true ]; then
-  kubectl create -f ovnkube-db-raft.yaml
+  run_kubectl create -f ovnkube-db-raft.yaml
 else
-  kubectl create -f ovnkube-db.yaml
+  run_kubectl create -f ovnkube-db.yaml
 fi
-kubectl create -f ovnkube-master.yaml
-kubectl create -f ovnkube-node.yaml
+run_kubectl create -f ovnkube-master.yaml
+run_kubectl create -f ovnkube-node.yaml
 popd
-kubectl -n kube-system delete ds kube-proxy
+run_kubectl -n kube-system delete ds kube-proxy
 kind get clusters
-kind get nodes --name ${CLUSTER_NAME}
+kind get nodes --name ${KIND_CLUSTER_NAME}
 kind export kubeconfig --name ovn
 if [ "$KIND_INSTALL_INGRESS" == true ]; then
-  kubectl create -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/mandatory.yaml
+  run_kubectl create -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/mandatory.yaml
 fi

dist/images/daemonset.sh

@@ -202,10 +202,9 @@ echo "svc_cidr: ${svc_cidr}"
 echo "k8s_apiserver: ${k8s_apiserver}"
 echo "mtu: ${mtu}"
 
-sed "s,{{ net_cidr }},${net_cidr},
-s,{{ svc_cidr }},${svc_cidr},
-s,{{ mtu_value }},${mtu},
-s,{{ k8s_apiserver }},${k8s_apiserver}," ../templates/ovn-setup.yaml.j2 >../yaml/ovn-setup.yaml
+net_cidr=${net_cidr} svc_cidr=${svc_cidr} \
+  mtu_value=${mtu} k8s_apiserver=${k8s_apiserver} \
+  j2 ../templates/ovn-setup.yaml.j2 -o ../yaml/ovn-setup.yaml
 
 cp ../templates/ovnkube-monitor.yaml.j2 ../yaml/ovnkube-monitor.yaml
 

go-controller/go.mod

@@ -1,6 +1,6 @@
 module github.com/ovn-org/ovn-kubernetes/go-controller
 
-go 1.12
+go 1.13
 
 require (
 	github.com/Mellanox/sriovnet v0.0.0-20190516174650-73402dc8fcaa

go-controller/pkg/cni/helper_linux.go

@@ -335,7 +335,7 @@ func (pr *PodRequest) ConfigureInterface(namespace string, podName string, ifInf
 		if err != nil {
 			return false, nil
 		}
-		return strings.Contains(stdout, ifInfo.IP.IP.String()), nil
+		return strings.Contains(stdout, ifInfo.IPs[0].IP.String()), nil
 	})
 	if err != nil {
 		return nil, fmt.Errorf("timed out dumping br-int flow entries for sandbox: %v", err)

go-controller/pkg/node/gateway_init.go

@@ -105,7 +105,9 @@ func (n *OvnNode) initGateway(subnet *net.IPNet, nodeAnnotator kube.Annotator,
 		}
 		prFn, err = n.initSharedGateway(subnet, gatewayNextHop, gatewayIntf, nodeAnnotator)
 	case config.GatewayModeDisabled:
-		err = util.SetDisabledL3GatewayConfig(nodeAnnotator)
+		err = util.SetL3GatewayConfig(nodeAnnotator, &util.L3GatewayConfig{
+			Mode: config.GatewayModeDisabled,
+		})
 	}
 	if err != nil {
 		return err

go-controller/pkg/node/gateway_localnet.go

@@ -178,8 +178,20 @@ func initLocalnetGateway(nodeName string, subnet *net.IPNet, wf *factory.WatchFa
 		return err
 	}
 
-	err = util.SetLocalL3GatewayConfig(nodeAnnotator, ifaceID, macAddress,
-		gatewayIPCIDR, gatewayNextHop, config.Gateway.NodeportEnable)
+	chassisID, err := util.GetNodeChassisID()
+	if err != nil {
+		return err
+	}
+
+	err = util.SetL3GatewayConfig(nodeAnnotator, &util.L3GatewayConfig{
+		Mode:           config.GatewayModeLocal,
+		ChassisID:      chassisID,
+		InterfaceID:    ifaceID,
+		MACAddress:     macAddress,
+		IPAddresses:    []*net.IPNet{gatewayIPCIDR},
+		NextHops:       []net.IP{gatewayNextHop},
+		NodePortEnable: config.Gateway.NodeportEnable,
+	})
 	if err != nil {
 		return err
 	}

go-controller/pkg/node/gateway_shared_intf.go

@@ -334,8 +334,21 @@ func (n *OvnNode) initSharedGateway(subnet *net.IPNet, gwNextHop net.IP, gwIntf
 		return nil, fmt.Errorf("failed to set up shared interface gateway: %v", err)
 	}
 
-	err = util.SetSharedL3GatewayConfig(nodeAnnotator, ifaceID, macAddress, ipAddress, gwNextHop,
-		config.Gateway.NodeportEnable, config.Gateway.VLANID)
+	chassisID, err := util.GetNodeChassisID()
+	if err != nil {
+		return nil, err
+	}
+
+	err = util.SetL3GatewayConfig(nodeAnnotator, &util.L3GatewayConfig{
+		Mode:           config.GatewayModeShared,
+		ChassisID:      chassisID,
+		InterfaceID:    ifaceID,
+		MACAddress:     macAddress,
+		IPAddresses:    []*net.IPNet{ipAddress},
+		NextHops:       []net.IP{gwNextHop},
+		NodePortEnable: config.Gateway.NodeportEnable,
+		VLANID:         &config.Gateway.VLANID,
+	})
 	if err != nil {
 		return nil, err
 	}

go-controller/pkg/node/management-port.go

@@ -11,12 +11,8 @@ import (
 	"k8s.io/klog"
 )
 
-func (n *OvnNode) createManagementPort(localSubnet *net.IPNet, nodeAnnotator kube.Annotator,
+func (n *OvnNode) createManagementPort(hostSubnets []*net.IPNet, nodeAnnotator kube.Annotator,
 	waiter *startupWaiter) error {
-	// Retrieve the routerIP and mangementPortIP for a given localSubnet
-	routerIP, portIP := util.GetNodeWellKnownAddresses(localSubnet)
-	routerMAC := util.IPAddrToHWAddr(routerIP.IP)
-
 	// Kubernetes emits events when pods are created. The event will contain
 	// only lowercase letters of the hostname even though the kubelet is
 	// started with a hostname that contains lowercase and uppercase letters.
@@ -60,7 +56,7 @@ func (n *OvnNode) createManagementPort(localSubnet *net.IPNet, nodeAnnotator kub
 		return err
 	}
 
-	err = createPlatformManagementPort(util.K8sMgmtIntfName, portIP, routerIP.IP, routerMAC, n.stopChan)
+	err = createPlatformManagementPort(util.K8sMgmtIntfName, hostSubnets, n.stopChan)
 	if err != nil {
 		return err
 	}