From 047af4a21607125b43b15a6f8ea6b213b931b1bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jul 2023 01:38:50 +0000 Subject: [PATCH 01/13] build(deps): bump helm/kind-action from 1.7.0 to 1.8.0 (#3029) Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.7.0 to 1.8.0. - [Release notes](https://github.com/helm/kind-action/releases) - [Commits](https://github.com/helm/kind-action/compare/v1.7.0...v1.8.0) --- updated-dependencies: - dependency-name: helm/kind-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build-x86-image.yaml | 38 ++++++++++++------------ .github/workflows/scheduled-e2e.yaml | 40 +++++++++++++------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index af97507b7f4..717e18a9498 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.github/workflows/build-x86-image.yaml @@ -329,7 +329,7 @@ jobs: restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86- - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -478,7 +478,7 @@ jobs: restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86- - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -623,7 +623,7 @@ jobs: restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86- - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -744,7 +744,7 @@ jobs: fi - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -883,7 +883,7 @@ jobs: restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86- - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1026,7 +1026,7 @@ jobs: restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86- - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1080,7 +1080,7 @@ jobs: - uses: actions/checkout@v3 - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1116,7 +1116,7 @@ jobs: - uses: actions/checkout@v3 - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1152,7 +1152,7 @@ jobs: - uses: actions/checkout@v3 - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1190,7 +1190,7 @@ jobs: - uses: actions/checkout@v3 - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1269,7 +1269,7 @@ jobs: restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86- - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1357,7 +1357,7 @@ jobs: restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86- - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1439,7 +1439,7 @@ jobs: restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86- - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1494,7 +1494,7 @@ jobs: - uses: actions/checkout@v3 - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1591,7 +1591,7 @@ jobs: restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86- - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1703,7 +1703,7 @@ jobs: restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86- - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1879,7 +1879,7 @@ jobs: fi - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1979,7 +1979,7 @@ jobs: restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86- - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -2070,7 +2070,7 @@ jobs: restore-keys: ${{ runner.os }}-e2e-${{ env.GO_FULL_VER }}-x86- - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true diff --git a/.github/workflows/scheduled-e2e.yaml b/.github/workflows/scheduled-e2e.yaml index 9ece56aa616..e7d1bcf12b1 100644 --- a/.github/workflows/scheduled-e2e.yaml +++ b/.github/workflows/scheduled-e2e.yaml @@ -71,7 +71,7 @@ jobs: path: test/e2e/k8s-network/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -157,7 +157,7 @@ jobs: path: test/e2e/k8s-network/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -239,7 +239,7 @@ jobs: path: test/e2e/k8s-network/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -303,7 +303,7 @@ jobs: path: test/e2e/k8s-network/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -378,7 +378,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -453,7 +453,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -506,7 +506,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -557,7 +557,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -609,7 +609,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -663,7 +663,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -732,7 +732,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -802,7 +802,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -871,7 +871,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -926,7 +926,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1003,7 +1003,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1090,7 +1090,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1184,7 +1184,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ env.VERSION_TO }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1256,7 +1256,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1330,7 +1330,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true @@ -1401,7 +1401,7 @@ jobs: path: test/e2e/kube-ovn/branches/${{ matrix.branch }} - name: Install kind - uses: helm/kind-action@v1.7.0 + uses: helm/kind-action@v1.8.0 with: version: v0.20.0 install_only: true From 62f332897a26f014031f7dbab1a8566f6d28fd22 Mon Sep 17 00:00:00 2001 From: bobz965 Date: Wed, 12 Jul 2023 10:40:37 +0800 Subject: [PATCH 02/13] fix lrp eip not clean (#3026) --- pkg/controller/vpc.go | 58 ++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/pkg/controller/vpc.go b/pkg/controller/vpc.go index 3c7268b8182..6dc2779b910 100644 --- a/pkg/controller/vpc.go +++ b/pkg/controller/vpc.go @@ -103,21 +103,14 @@ func (c *Controller) handleDelVpc(vpc *kubeovnv1.Vpc) error { return err } - err := c.deleteVpcRouter(vpc.Status.Router) - if err != nil { - return err - } - if err := c.handleDelVpcExternal(vpc.Name); err != nil { klog.Errorf("failed to delete external connection for vpc %s, error %v", vpc.Name, err) return err } - if vpc.Spec.EnableBfd || vpc.Status.EnableBfd { - lrpEipName := fmt.Sprintf("%s-%s", vpc.Name, c.config.ExternalGatewaySwitch) - if err := c.ovnClient.DeleteBFD(lrpEipName, ""); err != nil { - klog.Error(err) - return err - } + + err := c.deleteVpcRouter(vpc.Status.Router) + if err != nil { + return err } return nil } @@ -897,43 +890,46 @@ func (c *Controller) handleDeleteVpcStaticRoute(key string) error { } func (c *Controller) handleDelVpcExternal(key string) error { - cachedVpc, err := c.vpcsLister.Get(key) - if err != nil { - if k8serrors.IsNotFound(err) { - return nil - } - return err - } - lspName := fmt.Sprintf("%s-%s", c.config.ExternalGatewaySwitch, key) lrpName := fmt.Sprintf("%s-%s", key, c.config.ExternalGatewaySwitch) klog.V(3).Infof("delete vpc lrp %s", lrpName) - if err := c.ovnClient.RemoveLogicalPatchPort(lspName, lrpName); err != nil { klog.Errorf("failed to disconnect router '%s' to external, %v", key, err) return err } + if err := c.config.KubeOvnClient.KubeovnV1().OvnEips().Delete(context.Background(), lrpName, metav1.DeleteOptions{}); err != nil { + if !k8serrors.IsNotFound(err) { + klog.Errorf("failed to delete ovn eip %s, %v", lrpName, err) + return err + } + } + if err := c.ovnClient.DeleteBFD(lrpName, ""); err != nil { + klog.Error(err) + return err + } + cachedVpc, err := c.vpcsLister.Get(key) + if err != nil { + if k8serrors.IsNotFound(err) { + return nil + } + klog.Errorf("failed to get vpc %s, %v", key, err) + return err + } vpc := cachedVpc.DeepCopy() vpc.Status.EnableExternal = cachedVpc.Spec.EnableExternal + vpc.Status.EnableBfd = cachedVpc.Spec.EnableBfd bytes, err := vpc.Status.Bytes() if err != nil { + klog.Errorf("failed to marshal vpc status: %v", err) return err } if _, err = c.config.KubeOvnClient.KubeovnV1().Vpcs().Patch(context.Background(), vpc.Name, types.MergePatchType, bytes, metav1.PatchOptions{}, "status"); err != nil { - return err - } - if err = c.config.KubeOvnClient.KubeovnV1().OvnEips().Delete(context.Background(), lrpName, metav1.DeleteOptions{}); err != nil { - if !k8serrors.IsNotFound(err) { - klog.Errorf("failed to delete ovn eip %s, %v", lrpName, err) - return err + if k8serrors.IsNotFound(err) { + return nil } - } - - // del all vpc bfds - if err := c.ovnClient.DeleteBFD(lrpName, ""); err != nil { - klog.Error(err) + klog.Errorf("failed to patch vpc %s, %v", key, err) return err } return nil From f3833f91b42d46692f618ec0b3f4976e95b85739 Mon Sep 17 00:00:00 2001 From: wujixin <599230270@qq.com> Date: Wed, 12 Jul 2023 11:06:05 +0800 Subject: [PATCH 03/13] feat: suport kubevirt nic hotplug (#3013) Signed-off-by: wujixin Co-authored-by: wujixin --- pkg/controller/pod.go | 15 +++++++++++++++ pkg/daemon/ovs_linux.go | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go index 04c39e002fb..ef4c672de25 100644 --- a/pkg/controller/pod.go +++ b/pkg/controller/pod.go @@ -1069,6 +1069,7 @@ func (c *Controller) syncKubeOvnNet(pod *v1.Pod, podNets []*kubeovnNet) error { key := fmt.Sprintf("%s/%s", pod.Namespace, podName) targetPortNameList := strset.NewWithSize(len(podNets)) portsNeedToDel := []string{} + annotationsNeedToDel := []string{} subnetUsedByPort := make(map[string]string) for _, podNet := range podNets { @@ -1086,6 +1087,12 @@ func (c *Controller) syncKubeOvnNet(pod *v1.Pod, podNets []*kubeovnNet) error { if !targetPortNameList.Has(port.Name) { portsNeedToDel = append(portsNeedToDel, port.Name) subnetUsedByPort[port.Name] = port.ExternalIDs["ls"] + portNameSlice := strings.Split(port.Name, ".") + providerName := strings.Join(portNameSlice[2:], ".") + if providerName == util.OvnProvider { + continue + } + annotationsNeedToDel = append(annotationsNeedToDel, providerName) } } @@ -1111,6 +1118,14 @@ func (c *Controller) syncKubeOvnNet(pod *v1.Pod, podNets []*kubeovnNet) error { } } + for _, providerName := range annotationsNeedToDel { + for annotationKey := range pod.Annotations { + if strings.HasPrefix(key, providerName) { + delete(pod.Annotations, annotationKey) + } + } + } + return nil } diff --git a/pkg/daemon/ovs_linux.go b/pkg/daemon/ovs_linux.go index aec58949d8e..059cc5846c2 100644 --- a/pkg/daemon/ovs_linux.go +++ b/pkg/daemon/ovs_linux.go @@ -191,6 +191,11 @@ func generateNicName(containerID, ifname string) (string, string) { if ifname == "eth0" { return fmt.Sprintf("%s_h", containerID[0:12]), fmt.Sprintf("%s_c", containerID[0:12]) } + // The nic name is 14 length and have prefix pod in the Kubevirt v1.0.0 + if strings.HasPrefix(ifname, "pod") && len(ifname) == 14 { + ifname = ifname[3 : len(ifname)-4] + return fmt.Sprintf("%s_%s_h", containerID[0:12-len(ifname)], ifname), fmt.Sprintf("%s_%s_c", containerID[0:12-len(ifname)], ifname) + } return fmt.Sprintf("%s_%s_h", containerID[0:12-len(ifname)], ifname), fmt.Sprintf("%s_%s_c", containerID[0:12-len(ifname)], ifname) } From 9d88e4970718cc377914470d9059a63c548ed900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Wed, 12 Jul 2023 16:44:22 +0800 Subject: [PATCH 04/13] pinger: use fully qualified domain name (#3032) --- charts/values.yaml | 6 +++--- dist/images/install.sh | 6 +++--- yamls/kube-ovn-dual-stack.yaml | 2 +- yamls/kube-ovn-ipv6.yaml | 2 +- yamls/kube-ovn.yaml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/values.yaml b/charts/values.yaml index 21ad153a8c3..c8d5b720f86 100644 --- a/charts/values.yaml +++ b/charts/values.yaml @@ -68,7 +68,7 @@ ipv4: SVC_CIDR: "10.96.0.0/12" JOIN_CIDR: "100.64.0.0/16" PINGER_EXTERNAL_ADDRESS: "114.114.114.114" - PINGER_EXTERNAL_DOMAIN: "alauda.cn" + PINGER_EXTERNAL_DOMAIN: "alauda.cn." ipv6: POD_CIDR: "fd00:10:16::/112" @@ -76,7 +76,7 @@ ipv6: SVC_CIDR: "fd00:10:96::/112" JOIN_CIDR: "fd00:100:64::/112" PINGER_EXTERNAL_ADDRESS: "2400:3200::1" - PINGER_EXTERNAL_DOMAIN: "google.com" + PINGER_EXTERNAL_DOMAIN: "google.com." dual_stack: POD_CIDR: "10.16.0.0/16,fd00:10:16::/112" @@ -84,7 +84,7 @@ dual_stack: SVC_CIDR: "10.96.0.0/12,fd00:10:96::/112" JOIN_CIDR: "100.64.0.0/16,fd00:100:64::/112" PINGER_EXTERNAL_ADDRESS: "114.114.114.114,2400:3200::1" - PINGER_EXTERNAL_DOMAIN: "google.com" + PINGER_EXTERNAL_DOMAIN: "google.com." performance: MODULES: "kube_ovn_fastpath.ko" diff --git a/dist/images/install.sh b/dist/images/install.sh index 4af8cb39e83..7bafb65eb58 100755 --- a/dist/images/install.sh +++ b/dist/images/install.sh @@ -50,7 +50,7 @@ POD_GATEWAY="10.16.0.1" SVC_CIDR="10.96.0.0/12" # Do NOT overlap with NODE/POD/JOIN CIDR JOIN_CIDR="100.64.0.0/16" # Do NOT overlap with NODE/POD/SVC CIDR PINGER_EXTERNAL_ADDRESS="114.114.114.114" # Pinger check external ip probe -PINGER_EXTERNAL_DOMAIN="alauda.cn" # Pinger check external domain probe +PINGER_EXTERNAL_DOMAIN="alauda.cn." # Pinger check external domain probe SVC_YAML_IPFAMILYPOLICY="" if [ "$IPV6" = "true" ]; then POD_CIDR="fd00:10:16::/112" # Do NOT overlap with NODE/SVC/JOIN CIDR @@ -58,7 +58,7 @@ if [ "$IPV6" = "true" ]; then SVC_CIDR="fd00:10:96::/112" # Do NOT overlap with NODE/POD/JOIN CIDR JOIN_CIDR="fd00:100:64::/112" # Do NOT overlap with NODE/POD/SVC CIDR PINGER_EXTERNAL_ADDRESS="2400:3200::1" - PINGER_EXTERNAL_DOMAIN="google.com" + PINGER_EXTERNAL_DOMAIN="google.com." fi if [ "$DUAL_STACK" = "true" ]; then POD_CIDR="10.16.0.0/16,fd00:10:16::/112" # Do NOT overlap with NODE/SVC/JOIN CIDR @@ -66,7 +66,7 @@ if [ "$DUAL_STACK" = "true" ]; then SVC_CIDR="10.96.0.0/12,fd00:10:96::/112" # Do NOT overlap with NODE/POD/JOIN CIDR JOIN_CIDR="100.64.0.0/16,fd00:100:64::/112" # Do NOT overlap with NODE/POD/SVC CIDR PINGER_EXTERNAL_ADDRESS="114.114.114.114,2400:3200::1" - PINGER_EXTERNAL_DOMAIN="google.com" + PINGER_EXTERNAL_DOMAIN="google.com." SVC_YAML_IPFAMILYPOLICY="ipFamilyPolicy: PreferDualStack" fi diff --git a/yamls/kube-ovn-dual-stack.yaml b/yamls/kube-ovn-dual-stack.yaml index 17028019305..0b765d77054 100644 --- a/yamls/kube-ovn-dual-stack.yaml +++ b/yamls/kube-ovn-dual-stack.yaml @@ -362,7 +362,7 @@ spec: - /kube-ovn/kube-ovn-pinger args: - --external-address=114.114.114.114,2400:3200::1 - - --external-dns=alauda.cn + - --external-dns=google.com. - --logtostderr=false - --alsologtostderr=true - --log_file=/var/log/kube-ovn/kube-ovn-pinger.log diff --git a/yamls/kube-ovn-ipv6.yaml b/yamls/kube-ovn-ipv6.yaml index 74b76b88cd1..dec0dac2b9b 100644 --- a/yamls/kube-ovn-ipv6.yaml +++ b/yamls/kube-ovn-ipv6.yaml @@ -362,7 +362,7 @@ spec: - /kube-ovn/kube-ovn-pinger args: - --external-address=2400:3200::1 - - --external-dns=alauda.cn + - --external-dns=google.com. - --logtostderr=false - --alsologtostderr=true - --log_file=/var/log/kube-ovn/kube-ovn-pinger.log diff --git a/yamls/kube-ovn.yaml b/yamls/kube-ovn.yaml index 8761d010626..9fa8a1e217b 100644 --- a/yamls/kube-ovn.yaml +++ b/yamls/kube-ovn.yaml @@ -364,7 +364,7 @@ spec: - /kube-ovn/kube-ovn-pinger args: - --external-address=114.114.114.114 - - --external-dns=alauda.cn + - --external-dns=alauda.cn. - --logtostderr=false - --alsologtostderr=true - --log_file=/var/log/kube-ovn/kube-ovn-pinger.log From 97a3e1bc9b192a76a11e338b609876d2d8c77165 Mon Sep 17 00:00:00 2001 From: hzma Date: Wed, 12 Jul 2023 17:41:39 +0800 Subject: [PATCH 05/13] static ip in exclude-ips can be allocated normally when subnet's availableIPs is 0 (#3031) --- pkg/controller/pod.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go index ef4c672de25..5c566fa8171 100644 --- a/pkg/controller/pod.go +++ b/pkg/controller/pod.go @@ -1788,6 +1788,7 @@ func (c *Controller) getNameByPod(pod *v1.Pod) string { return pod.Name } +// When subnet's v4availableIPs is 0 but still there's available ip in exclude-ips, the static ip in exclude-ips can be allocated normal. func (c *Controller) getNsAvailableSubnets(pod *v1.Pod, podNet *kubeovnNet) ([]*kubeovnNet, error) { var result []*kubeovnNet // keep the annotation subnet of the pod in first position @@ -1813,19 +1814,6 @@ func (c *Controller) getNsAvailableSubnets(pod *v1.Pod, podNet *kubeovnNet) ([]* return nil, err } - switch subnet.Spec.Protocol { - case kubeovnv1.ProtocolIPv4: - fallthrough - case kubeovnv1.ProtocolDual: - if subnet.Status.V4AvailableIPs == 0 { - continue - } - case kubeovnv1.ProtocolIPv6: - if subnet.Status.V6AvailableIPs == 0 { - continue - } - } - result = append(result, &kubeovnNet{ Type: providerTypeOriginal, ProviderName: subnet.Spec.Provider, From e3b7439d40c41b88525d87fb66a7cf1c03d2881a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Thu, 13 Jul 2023 13:26:49 +0800 Subject: [PATCH 06/13] ci: pin go version to 1.20.5 (#3034) --- .github/workflows/build-arm64-image.yaml | 4 ++++ .github/workflows/build-kube-ovn-test.yaml | 4 ++++ .github/workflows/build-windows.yaml | 3 +++ .github/workflows/build-x86-image.yaml | 16 ++++++++++++++++ .github/workflows/codeql-analysis.yml | 4 ++++ .github/workflows/lint.yaml | 4 ++++ .github/workflows/scheduled-e2e.yaml | 14 ++++++++++++++ 7 files changed, 49 insertions(+) diff --git a/.github/workflows/build-arm64-image.yaml b/.github/workflows/build-arm64-image.yaml index edecd38932d..380709faa36 100644 --- a/.github/workflows/build-arm64-image.yaml +++ b/.github/workflows/build-arm64-image.yaml @@ -18,6 +18,9 @@ concurrency: group: "${{ github.workflow }}-${{ github.ref }}" cancel-in-progress: true +env: + GO_VERSION: '1.20.5' + jobs: build: name: Build arm64 @@ -31,6 +34,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false diff --git a/.github/workflows/build-kube-ovn-test.yaml b/.github/workflows/build-kube-ovn-test.yaml index 6ce88046442..e310e9abb2f 100644 --- a/.github/workflows/build-kube-ovn-test.yaml +++ b/.github/workflows/build-kube-ovn-test.yaml @@ -1,6 +1,9 @@ name: Build Test on: workflow_dispatch +env: + GO_VERSION: '' + jobs: build: name: Build Test @@ -10,6 +13,7 @@ jobs: - uses: docker/setup-buildx-action@v2 - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml index d80fd92b43e..8d89b4e49ea 100644 --- a/.github/workflows/build-windows.yaml +++ b/.github/workflows/build-windows.yaml @@ -22,6 +22,7 @@ concurrency: cancel-in-progress: true env: + GO_VERSION: '1.20.5' GOSEC_VERSION: '2.15.0' jobs: @@ -35,6 +36,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -177,6 +179,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index 717e18a9498..8e79597ad39 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.github/workflows/build-x86-image.yaml @@ -21,6 +21,7 @@ concurrency: cancel-in-progress: true env: + GO_VERSION: '1.20.5' GOSEC_VERSION: '2.15.0' HELM_VERSION: v3.11.3 SUBMARINER_VERSION: '0.14.3' @@ -77,6 +78,7 @@ jobs: - uses: docker/setup-buildx-action@v2 - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -208,6 +210,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false @@ -241,6 +244,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -312,6 +316,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false @@ -461,6 +466,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false @@ -606,6 +612,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false @@ -866,6 +873,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false @@ -1009,6 +1017,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false @@ -1252,6 +1261,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false @@ -1340,6 +1350,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false @@ -1422,6 +1433,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false @@ -1574,6 +1586,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false @@ -1686,6 +1699,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false @@ -1962,6 +1976,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false @@ -2053,6 +2068,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: ${{ env.E2E_DIR }}/go.mod check-latest: true cache: false diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8a717a59cb0..0380365be2c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -18,6 +18,9 @@ concurrency: group: "${{ github.workflow }}-${{ github.ref }}" cancel-in-progress: true +env: + GO_VERSION: '' + jobs: analyze: name: Analyze @@ -42,6 +45,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 0e1438d8e3e..69e014c8307 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -12,6 +12,9 @@ concurrency: group: "${{ github.workflow }}-${{ github.ref }}" cancel-in-progress: true +env: + GO_VERSION: '' + jobs: golangci: name: lint @@ -20,6 +23,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false diff --git a/.github/workflows/scheduled-e2e.yaml b/.github/workflows/scheduled-e2e.yaml index e7d1bcf12b1..b1137cfc4a8 100644 --- a/.github/workflows/scheduled-e2e.yaml +++ b/.github/workflows/scheduled-e2e.yaml @@ -10,6 +10,7 @@ concurrency: cancel-in-progress: true env: + GO_VERSION: '1.20.5' HELM_VERSION: v3.11.3 SUBMARINER_VERSION: '0.14.3' @@ -44,6 +45,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -130,6 +132,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -212,6 +215,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -351,6 +355,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -426,6 +431,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -705,6 +711,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -775,6 +782,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -844,6 +852,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -976,6 +985,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -1063,6 +1073,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -1145,6 +1156,7 @@ jobs: - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -1303,6 +1315,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false @@ -1374,6 +1387,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: + go-version: ${{ env.GO_VERSION || '' }} go-version-file: go.mod check-latest: true cache: false From 5a0686b2700070d04fd31d50ffea1e3367202b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Thu, 13 Jul 2023 15:13:32 +0800 Subject: [PATCH 07/13] windows: fix ovn patches (#3035) --- .github/workflows/build-windows.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml index 8d89b4e49ea..07f911a692e 100644 --- a/.github/workflows/build-windows.yaml +++ b/.github/workflows/build-windows.yaml @@ -109,14 +109,17 @@ jobs: working-directory: ovn run: | # change hash type from dp_hash to hash with field src_ip - Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/ae04d5e75d443500d537084d7db466513f63a7af.patch" -OutFile ..\ovn-01.patch + Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/5a04402c01df1463b9e1edcbc1c5634793687140.patch" -OutFile ..\ovn-01.patch # add support for windows - Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/05e57b322758461c54d5cad030486c3d25942c73.patch" -OutFile ..\ovn-02.patch + Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/2c85af7097e4c39d225c98dc68b55a964d0197d7.patch" -OutFile ..\ovn-02.patch # set br-int controller to TCP 127.0.0.1:6653 - Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/0181b68be18e96bc4ca68a0c3e5082da34c9dcdd.patch" -OutFile ..\ovn-03.patch + Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/24dcd9485ebb0f6c962250684fae512850cd9210.patch" -OutFile ..\ovn-03.patch + # ovn-controller: do not send GARP on localnet for Kube-OVN ports + Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/30ff0ba51745f5ea1b38ed63e8cd8e0479d0f916.patch" -OutFile ..\ovn-04.patch git apply ..\ovn-01.patch git apply ..\ovn-02.patch git apply ..\ovn-03.patch + git apply ..\ovn-04.patch - name: Build PTHREADS4W working-directory: pthreads4w\code From b40c35b8c4076622886f63c6dae344764cc2a05d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Fri, 14 Jul 2023 17:01:32 +0800 Subject: [PATCH 08/13] Makefile: add deepflow and kwok installation (#3036) --- .github/workflows/build-windows.yaml | 2 +- .github/workflows/build-x86-image.yaml | 6 +-- .github/workflows/scheduled-e2e.yaml | 4 +- .gitignore | 3 ++ Makefile | 72 +++++++++++++++++++++----- yamls/kind.yaml.j2 | 13 +++++ yamls/kwok-kustomization.yaml.j2 | 7 +++ yamls/kwok-node.yaml.j2 | 42 +++++++++++++++ 8 files changed, 131 insertions(+), 18 deletions(-) create mode 100644 yamls/kwok-kustomization.yaml.j2 create mode 100644 yamls/kwok-node.yaml.j2 diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml index 07f911a692e..3eaefeb9f99 100644 --- a/.github/workflows/build-windows.yaml +++ b/.github/workflows/build-windows.yaml @@ -23,7 +23,7 @@ concurrency: env: GO_VERSION: '1.20.5' - GOSEC_VERSION: '2.15.0' + GOSEC_VERSION: '2.16.0' jobs: filter: diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index 8e79597ad39..1a6db36c537 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.github/workflows/build-x86-image.yaml @@ -22,9 +22,9 @@ concurrency: env: GO_VERSION: '1.20.5' - GOSEC_VERSION: '2.15.0' - HELM_VERSION: v3.11.3 - SUBMARINER_VERSION: '0.14.3' + GOSEC_VERSION: '2.16.0' + HELM_VERSION: v3.12.2 + SUBMARINER_VERSION: '0.14.6' jobs: build-kube-ovn-base: diff --git a/.github/workflows/scheduled-e2e.yaml b/.github/workflows/scheduled-e2e.yaml index b1137cfc4a8..5ea55c32328 100644 --- a/.github/workflows/scheduled-e2e.yaml +++ b/.github/workflows/scheduled-e2e.yaml @@ -11,8 +11,8 @@ concurrency: env: GO_VERSION: '1.20.5' - HELM_VERSION: v3.11.3 - SUBMARINER_VERSION: '0.14.3' + HELM_VERSION: v3.12.2 + SUBMARINER_VERSION: '0.14.6' jobs: k8s-conformance-e2e: diff --git a/.gitignore b/.gitignore index 7c6c2c07d91..f1e3c517a58 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,9 @@ ovn.yaml ovn-ic-0.yaml ovn-ic-1.yaml kind.yaml +kustomization.yaml +kwok.yaml +kwok-node.yaml broker-info.subm broker-info.subm.* broker-info-internal.subm diff --git a/Makefile b/Makefile index 336d16d1b0e..058eb04b4f0 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ CHART_UPGRADE_RESTART_OVS=$(shell echo $${CHART_UPGRADE_RESTART_OVS:-false}) MULTUS_IMAGE = ghcr.io/k8snetworkplumbingwg/multus-cni:snapshot-thick MULTUS_YAML = https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/master/deployments/multus-daemonset-thick.yml -KUBEVIRT_VERSION = v0.58.1 +KUBEVIRT_VERSION = v0.59.2 KUBEVIRT_OPERATOR_IMAGE = quay.io/kubevirt/virt-operator:$(KUBEVIRT_VERSION) KUBEVIRT_API_IMAGE = quay.io/kubevirt/virt-api:$(KUBEVIRT_VERSION) KUBEVIRT_CONTROLLER_IMAGE = quay.io/kubevirt/virt-controller:$(KUBEVIRT_VERSION) @@ -36,16 +36,16 @@ KUBEVIRT_OPERATOR_YAML = https://github.com/kubevirt/kubevirt/releases/download/ KUBEVIRT_CR_YAML = https://github.com/kubevirt/kubevirt/releases/download/$(KUBEVIRT_VERSION)/kubevirt-cr.yaml KUBEVIRT_TEST_YAML = https://kubevirt.io/labs/manifests/vm.yaml -CILIUM_VERSION = 1.12.9 +CILIUM_VERSION = 1.13.4 CILIUM_IMAGE_REPO = quay.io/cilium/cilium -CERT_MANAGER_VERSION = v1.11.1 +CERT_MANAGER_VERSION = v1.12.2 CERT_MANAGER_CONTROLLER = quay.io/jetstack/cert-manager-controller:$(CERT_MANAGER_VERSION) CERT_MANAGER_CAINJECTOR = quay.io/jetstack/cert-manager-cainjector:$(CERT_MANAGER_VERSION) CERT_MANAGER_WEBHOOK = quay.io/jetstack/cert-manager-webhook:$(CERT_MANAGER_VERSION) CERT_MANAGER_YAML = https://github.com/cert-manager/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cert-manager.yaml -SUBMARINER_VERSION = $(shell echo $${SUBMARINER_VERSION:-0.14.3}) +SUBMARINER_VERSION = $(shell echo $${SUBMARINER_VERSION:-0.14.6}) SUBMARINER_OPERATOR = quay.io/submariner/submariner-operator:$(SUBMARINER_VERSION) SUBMARINER_GATEWAY = quay.io/submariner/submariner-gateway:$(SUBMARINER_VERSION) SUBMARINER_LIGHTHOUSE_AGENT = quay.io/submariner/lighthouse-agent:$(SUBMARINER_VERSION) @@ -53,6 +53,14 @@ SUBMARINER_LIGHTHOUSE_COREDNS = quay.io/submariner/lighthouse-coredns:$(SUBMARIN SUBMARINER_ROUTE_AGENT = quay.io/submariner/submariner-route-agent:$(SUBMARINER_VERSION) SUBMARINER_NETTEST = quay.io/submariner/nettest:$(SUBMARINER_VERSION) +DEEPFLOW_CHART_VERSION = 6.2.6 +DEEPFLOW_CHART_REPO = https://deepflow-ce.oss-cn-beijing.aliyuncs.com/chart/stable +DEEPFLOW_IMAGE_REPO = registry.cn-beijing.aliyuncs.com/deepflow-ce +DEEPFLOW_GRAFANA_PORT = 30080 + +KWOK_VERSION = v0.3.0 +KWOK_IMAGE = registry.k8s.io/kwok/kwok:$(KWOK_VERSION) + VPC_NAT_GW_IMG = $(REGISTRY)/vpc-nat-gateway:$(VERSION) E2E_NETWORK = bridge @@ -245,8 +253,10 @@ endef define kind_create_cluster kind create cluster --config $(1) --name $(2) - kubectl delete --ignore-not-found sc standard - kubectl delete --ignore-not-found -n local-path-storage deploy local-path-provisioner + @if [ "x$(3)" = "x1" ]; then \ + kubectl delete --ignore-not-found sc standard; \ + kubectl delete --ignore-not-found -n local-path-storage deploy local-path-provisioner; \ + fi kubectl describe no endef @@ -266,6 +276,10 @@ define kind_load_submariner_images $(call kind_load_image,$(1),$(SUBMARINER_NETTEST),1) endef +define kind_load_kwok_image + $(call kind_load_image,$(1),$(KWOK_IMAGE),1) +endef + define kubectl_wait_exist_and_ready @echo "Waiting for $(2) $(1)/$(3) to exist..." @n=0; while ! kubectl -n $(1) get $(2) -o name | awk -F / '{print $$2}' | grep -q ^$(3)$$; do \ @@ -317,7 +331,7 @@ kind-enable-hairpin: .PHONY: kind-create kind-create: - $(call kind_create_cluster,yamls/kind.yaml,kube-ovn) + $(call kind_create_cluster,yamls/kind.yaml,kube-ovn,1) .PHONY: kind-init kind-init: kind-init-ipv4 @@ -333,22 +347,27 @@ kind-init-ovn-ic: kind-init-ovn-ic-ipv4 .PHONY: kind-init-ovn-ic-ipv4 kind-init-ovn-ic-ipv4: kind-clean-ovn-ic kind-init @$(MAKE) kind-generate-config - $(call kind_create_cluster,yamls/kind.yaml,kube-ovn1) + $(call kind_create_cluster,yamls/kind.yaml,kube-ovn1,1) .PHONY: kind-init-ovn-ic-ipv6 kind-init-ovn-ic-ipv6: kind-clean-ovn-ic kind-init-ipv6 @ip_family=ipv6 $(MAKE) kind-generate-config - $(call kind_create_cluster,yamls/kind.yaml,kube-ovn1) + $(call kind_create_cluster,yamls/kind.yaml,kube-ovn1,1) .PHONY: kind-init-ovn-ic-dual kind-init-ovn-ic-dual: kind-clean-ovn-ic kind-init-dual @ip_family=dual $(MAKE) kind-generate-config - $(call kind_create_cluster,yamls/kind.yaml,kube-ovn1) + $(call kind_create_cluster,yamls/kind.yaml,kube-ovn1,1) .PHONY: kind-init-ovn-submariner kind-init-ovn-submariner: kind-clean-ovn-submariner kind-init @pod_cidr_v4=10.18.0.0/16 svc_cidr_v4=10.112.0.0/12 $(MAKE) kind-generate-config - $(call kind_create_cluster,yamls/kind.yaml,kube-ovn1) + $(call kind_create_cluster,yamls/kind.yaml,kube-ovn1,1) + +.PHONY: kind-init-deepflow +kind-init-deepflow: kind-clean + @port_mapping=$(DEEPFLOW_GRAFANA_PORT):$(DEEPFLOW_GRAFANA_PORT) $(MAKE) kind-generate-config + $(call kind_create_cluster,yamls/kind.yaml,kube-ovn,0) .PHONY: kind-init-iptables kind-init-iptables: @@ -510,7 +529,7 @@ kind-install-ovn-ic-dual: kind-install-dual sed -e 's/10.16.0/10.18.0/g' \ -e 's/10.96.0/10.98.0/g' \ -e 's/100.64.0/100.68.0/g' \ - -e 's/fd00:10:16:/fd00:10:18:/g' \ + -e 's/fd00:10:16:/fd00:10:18:/g' \ -e 's/fd00:10:96:/fd00:10:98:/g' \ -e 's/fd00:100:64:/fd00:100:68:/g' \ -e 's/VERSION=.*/VERSION=$(VERSION)/' \ @@ -745,6 +764,34 @@ kind-install-cilium-chaining: kind-load-image kind-untaint-control-plane ENABLE_LB=false ENABLE_NP=false CNI_CONFIG_PRIORITY=10 bash kubectl describe no +.PHONY: kind-install-deepflow +kind-install-deepflow: kind-install + helm repo add deepflow $(DEEPFLOW_CHART_REPO) + helm repo update deepflow + $(eval CLICKHOUSE_PERSISTENCE = $(shell helm show values --version $(DEEPFLOW_CHART_VERSION) --jsonpath '{.clickhouse.storageConfig.persistence}' deepflow/deepflow | sed 's/0Gi/Gi/g')) + helm install deepflow -n deepflow deepflow/deepflow \ + --create-namespace --version $(DEEPFLOW_CHART_VERSION) \ + --set global.image.repository=$(DEEPFLOW_IMAGE_REPO) \ + --set grafana.image.repository=$(DEEPFLOW_IMAGE_REPO)/grafana \ + --set deepflow-agent.sysctlInitContainer.enabled=false \ + --set 'mysql.storageConfig.persistence.size=5Gi' \ + --set-json 'clickhouse.storageConfig.persistence=$(CLICKHOUSE_PERSISTENCE)' + kubectl -n deepflow patch svc deepflow-grafana --type=json \ + -p '[{"op": "replace", "path": "/spec/ports/0/nodePort", "value": $(DEEPFLOW_GRAFANA_PORT)}]' + echo -e "\nGrafana URL: http://127.0.0.1:$(DEEPFLOW_GRAFANA_PORT)\nGrafana auth: admin:deepflow\n" + +.PHONY: kind-install-kwok +kind-install-kwok: kind-install-underlay + kwok_version=$(KWOK_VERSION) j2 yamls/kwok-kustomization.yaml.j2 -o kustomization.yaml + kubectl kustomize ./ > kwok.yaml + $(call kind_load_kwok_image,kube-ovn) + kubectl apply -f kwok.yaml + kubectl -n kube-system rollout status deploy kwok-controller --timeout 60s + for i in {1..20}; do \ + kwok_node_name=fake-node-$$i j2 yamls/kwok-node.yaml.j2 -o kwok-node.yaml; \ + kubectl apply -f kwok-node.yaml; \ + done + .PHONY: kind-reload kind-reload: kind-reload-ovs kubectl delete pod -n kube-system -l app=kube-ovn-controller @@ -809,6 +856,7 @@ clean: $(RM) yamls/kind.yaml $(RM) ovn.yaml kube-ovn.yaml kube-ovn-crd.yaml $(RM) ovn-ic-0.yaml ovn-ic-1.yaml + $(RM) kustomization.yaml kwok.yaml kwok-node.yaml $(RM) kube-ovn.tar vpc-nat-gateway.tar image-amd64.tar image-arm64.tar .PHONY: changelog diff --git a/yamls/kind.yaml.j2 b/yamls/kind.yaml.j2 index d36c5d03066..f54173023ea 100644 --- a/yamls/kind.yaml.j2 +++ b/yamls/kind.yaml.j2 @@ -55,6 +55,19 @@ kubeadmConfigPatches: nodes: - role: control-plane image: kindest/node:{{ k8s_version }} +{%- if port_mapping is defined %} + {%- set container_port = port_mapping.split(':')[0] %} + {%- set host_port = port_mapping.split(':')[1] %} + extraPortMappings: + - containerPort: {{ container_port }} + hostPort: {{ host_port }} + # optional: set the bind address on the host + # 0.0.0.0 is the current default + listenAddress: "127.0.0.1" + # optional: set the protocol to one of TCP, UDP, SCTP. + # TCP is the default + protocol: TCP +{%- endif %} {%- if single is equalto "false" %} - role: worker image: kindest/node:{{ k8s_version }} diff --git a/yamls/kwok-kustomization.yaml.j2 b/yamls/kwok-kustomization.yaml.j2 new file mode 100644 index 00000000000..6dbee0cb4ec --- /dev/null +++ b/yamls/kwok-kustomization.yaml.j2 @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +images: +- name: registry.k8s.io/kwok/kwok + newTag: "{{ kwok_version }}" +resources: +- "https://github.com/kubernetes-sigs/kwok/kustomize/kwok?ref={{ kwok_version }}" diff --git a/yamls/kwok-node.yaml.j2 b/yamls/kwok-node.yaml.j2 new file mode 100644 index 00000000000..31756a20597 --- /dev/null +++ b/yamls/kwok-node.yaml.j2 @@ -0,0 +1,42 @@ +apiVersion: v1 +kind: Node +metadata: + annotations: + node.alpha.kubernetes.io/ttl: "0" + kwok.x-k8s.io/node: fake + labels: + beta.kubernetes.io/arch: amd64 + beta.kubernetes.io/os: linux + kubernetes.io/arch: amd64 + kubernetes.io/hostname: "{{ kwok_node_name }}" + kubernetes.io/os: linux + kubernetes.io/role: agent + node-role.kubernetes.io/agent: "" + type: kwok + name: "{{ kwok_node_name }}" +spec: + taints: # Avoid scheduling actual running pods to fake Node + - effect: NoSchedule + key: kwok.x-k8s.io/node + value: fake +status: + allocatable: + cpu: 32 + memory: 256Gi + pods: 110 + capacity: + cpu: 32 + memory: 256Gi + pods: 110 + nodeInfo: + architecture: amd64 + bootID: "" + containerRuntimeVersion: "" + kernelVersion: "" + kubeProxyVersion: fake + kubeletVersion: fake + machineID: "" + operatingSystem: linux + osImage: "" + systemUUID: "" + phase: Running From 494209d3cf3e9177c2d311d6b7c063e67810393a Mon Sep 17 00:00:00 2001 From: KillMaster9 Date: Mon, 17 Jul 2023 12:51:54 +0800 Subject: [PATCH 09/13] change log (#3042) * change log * check param for argEbgpMultihopTtl --- pkg/speaker/config.go | 3 +++ pkg/speaker/subnet.go | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/speaker/config.go b/pkg/speaker/config.go index 7c50d451f87..354f1fa6fd0 100644 --- a/pkg/speaker/config.go +++ b/pkg/speaker/config.go @@ -110,6 +110,9 @@ func ParseFlags() (*Configuration, error) { if *argNeighborIPv6Address != "" && net.ParseIP(*argNeighborIPv6Address).To16() == nil { return nil, fmt.Errorf("invalid neighbor-ipv6-address format: %s", *argNeighborIPv6Address) } + if *argEbgpMultihopTtl < 1 || *argEbgpMultihopTtl > 255 { + return nil, errors.New("the bgp MultihopTtl must be in the range 1 to 255") + } config := &Configuration{ AnnounceClusterIP: *argAnnounceClusterIP, diff --git a/pkg/speaker/subnet.go b/pkg/speaker/subnet.go index 1c885022e89..aa908b975c8 100644 --- a/pkg/speaker/subnet.go +++ b/pkg/speaker/subnet.go @@ -44,7 +44,6 @@ func isClusterIPService(svc *v1.Service) bool { len(svc.Spec.ClusterIP) != 0 } -// TODO: ipv4 only, need ipv6/dual-stack support later func (c *Controller) syncSubnetRoutes() { maskMap := map[string]int{kubeovnv1.ProtocolIPv4: 32, kubeovnv1.ProtocolIPv6: 128} bgpExpected, bgpExists := make(map[string][]string), make(map[string][]string) From f4f80415a06fa73d030e1becfb1a9d479eafdca6 Mon Sep 17 00:00:00 2001 From: changluyi <47097611+changluyi@users.noreply.github.com> Date: Tue, 18 Jul 2023 16:19:08 +0800 Subject: [PATCH 10/13] custom vpc pod support tcp http probe with tproxy method (#3024) * custom vpc pod support tcp http probe with tproxy method --- charts/templates/ovncni-ds.yaml | 1 + charts/values.yaml | 1 + cmd/daemon/cniserver.go | 15 +- dist/images/install.sh | 2 + dist/images/uninstall.sh | 12 + pkg/daemon/config.go | 3 + pkg/daemon/controller.go | 11 + pkg/daemon/gateway.go | 42 +++ pkg/daemon/gateway_linux.go | 132 ++++++++ pkg/daemon/tproxy_linux.go | 381 ++++++++++++++++++++++++ pkg/daemon/tproxy_windows.go | 13 + pkg/ovs/ovs-vsctl.go | 22 ++ pkg/tproxy/tproxy_tcp_linux.go | 229 ++++++++++++++ pkg/util/const.go | 3 + pkg/util/net.go | 18 ++ test/e2e/framework/daemonset.go | 67 +++++ test/e2e/framework/image.go | 1 + test/e2e/framework/iptables/iptables.go | 50 ++++ test/e2e/framework/pod.go | 6 + test/e2e/kube-ovn/pod/vpc_pod_probe.go | 235 +++++++++++++++ test/e2e/kube-ovn/subnet/subnet.go | 47 +-- yamls/kube-ovn-dual-stack.yaml | 1 + yamls/kube-ovn-ipv6.yaml | 1 + yamls/kube-ovn.yaml | 1 + 24 files changed, 1242 insertions(+), 52 deletions(-) create mode 100644 pkg/daemon/tproxy_linux.go create mode 100644 pkg/daemon/tproxy_windows.go create mode 100644 pkg/tproxy/tproxy_tcp_linux.go create mode 100644 test/e2e/framework/iptables/iptables.go create mode 100644 test/e2e/kube-ovn/pod/vpc_pod_probe.go diff --git a/charts/templates/ovncni-ds.yaml b/charts/templates/ovncni-ds.yaml index 50e429a55bb..25cb4ddddad 100644 --- a/charts/templates/ovncni-ds.yaml +++ b/charts/templates/ovncni-ds.yaml @@ -78,6 +78,7 @@ spec: - --log_file_max_size=0 - --enable-metrics={{- .Values.networking.ENABLE_METRICS }} - --kubelet-dir={{ .Values.kubelet_conf.KUBELET_DIR }} + - --enable-tproxy={{ .Values.func.ENABLE_TPROXY }} securityContext: runAsUser: 0 privileged: true diff --git a/charts/values.yaml b/charts/values.yaml index c8d5b720f86..dc88a8e52df 100644 --- a/charts/values.yaml +++ b/charts/values.yaml @@ -61,6 +61,7 @@ func: LOGICAL_GATEWAY: false ENABLE_BIND_LOCAL_IP: true U2O_INTERCONNECTION: false + ENABLE_TPROXY: false ipv4: POD_CIDR: "10.16.0.0/16" diff --git a/cmd/daemon/cniserver.go b/cmd/daemon/cniserver.go index 6bb72fbb804..413f4fb1cdb 100644 --- a/cmd/daemon/cniserver.go +++ b/cmd/daemon/cniserver.go @@ -18,7 +18,6 @@ import ( "k8s.io/klog/v2" "k8s.io/sample-controller/pkg/signals" - kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1" kubeovninformer "github.com/kubeovn/kube-ovn/pkg/client/informers/externalversions" "github.com/kubeovn/kube-ovn/pkg/daemon" "github.com/kubeovn/kube-ovn/pkg/util" @@ -96,19 +95,7 @@ func CmdMain() { mux.HandleFunc("/debug/pprof/trace", pprof.Trace) } - addr := "0.0.0.0" - if os.Getenv("ENABLE_BIND_LOCAL_IP") == "true" { - podIpsEnv := os.Getenv("POD_IPS") - podIps := strings.Split(podIpsEnv, ",") - // when pod in dual mode, golang can't support bind v4 and v6 address in the same time, - // so not support bind local ip when in dual mode - if len(podIps) == 1 { - addr = podIps[0] - if util.CheckProtocol(podIps[0]) == kubeovnv1.ProtocolIPv6 { - addr = fmt.Sprintf("[%s]", podIps[0]) - } - } - } + addr := util.GetDefaultListenAddr() if config.EnableVerboseConnCheck { go func() { diff --git a/dist/images/install.sh b/dist/images/install.sh index 7bafb65eb58..3b6a13b6c3c 100755 --- a/dist/images/install.sh +++ b/dist/images/install.sh @@ -32,6 +32,7 @@ IFACE=${IFACE:-} # Note that the dpdk tunnel iface and tunnel ip cidr should be diffierent with Kubernetes api cidr, otherwise the route will be a problem. DPDK_TUNNEL_IFACE=${DPDK_TUNNEL_IFACE:-br-phy} ENABLE_BIND_LOCAL_IP=${ENABLE_BIND_LOCAL_IP:-true} +ENABLE_TPROXY=${ENABLE_TPROXY:-false} # debug DEBUG_WRAPPER=${DEBUG_WRAPPER:-} @@ -4037,6 +4038,7 @@ spec: - --log_file=/var/log/kube-ovn/kube-ovn-cni.log - --log_file_max_size=0 - --kubelet-dir=$KUBELET_DIR + - --enable-tproxy=$ENABLE_TPROXY securityContext: runAsUser: 0 privileged: true diff --git a/dist/images/uninstall.sh b/dist/images/uninstall.sh index 75b8040918f..86516b25405 100644 --- a/dist/images/uninstall.sh +++ b/dist/images/uninstall.sh @@ -21,6 +21,12 @@ iptables -t filter -D FORWARD -m set --match-set ovn40subnets src -j ACCEPT iptables -t filter -D FORWARD -m set --match-set ovn40services dst -j ACCEPT iptables -t filter -D FORWARD -m set --match-set ovn40services src -j ACCEPT iptables -t filter -D OUTPUT -p udp -m udp --dport 6081 -j MARK --set-xmark 0x0 +iptables -t mangle -D PREROUTING -m comment --comment "kube-ovn prerouting rules" -j OVN-PREROUTING +iptables -t mangle -D OUTPUT -m comment --comment "kube-ovn output rules" -j OVN-OUTPUT +iptables -t mangle -F OVN-PREROUTING +iptables -t mangle -X OVN-PREROUTING +iptables -t mangle -F OVN-OUTPUT +iptables -t mangle -X OVN-OUTPUT sleep 1 @@ -51,6 +57,12 @@ ip6tables -t filter -D FORWARD -m set --match-set ovn60subnets src -j ACCEPT ip6tables -t filter -D FORWARD -m set --match-set ovn60services dst -j ACCEPT ip6tables -t filter -D FORWARD -m set --match-set ovn60services src -j ACCEPT ip6tables -t filter -D OUTPUT -p udp -m udp --dport 6081 -j MARK --set-xmark 0x0 +ip6tables -t mangle -D PREROUTING -m comment --comment "kube-ovn prerouting rules" -j OVN-PREROUTING +ip6tables -t mangle -D OUTPUT -m comment --comment "kube-ovn output rules" -j OVN-OUTPUT +ip6tables -t mangle -F OVN-PREROUTING +ip6tables -t mangle -X OVN-PREROUTING +ip6tables -t mangle -F OVN-OUTPUT +ip6tables -t mangle -X OVN-OUTPUT sleep 1 diff --git a/pkg/daemon/config.go b/pkg/daemon/config.go index 982df611696..ca694dd6f1a 100644 --- a/pkg/daemon/config.go +++ b/pkg/daemon/config.go @@ -63,6 +63,7 @@ type Configuration struct { EnableVerboseConnCheck bool TCPConnCheckPort int UDPConnCheckPort int + EnableTProxy bool } // ParseFlags will parse cmd args then init kubeClient and configuration @@ -100,6 +101,7 @@ func ParseFlags() *Configuration { argEnableVerboseConnCheck = pflag.Bool("enable-verbose-conn-check", false, "enable TCP/UDP connectivity check listen port") argTCPConnectivityCheckPort = pflag.Int("tcp-conn-check-port", 8100, "TCP connectivity Check Port") argUDPConnectivityCheckPort = pflag.Int("udp-conn-check-port", 8101, "UDP connectivity Check Port") + argEnableTProxy = pflag.Bool("enable-tproxy", false, "enable tproxy for vpc pod liveness or readiness probe") ) // mute info log for ipset lib @@ -154,6 +156,7 @@ func ParseFlags() *Configuration { EnableVerboseConnCheck: *argEnableVerboseConnCheck, TCPConnCheckPort: *argTCPConnectivityCheckPort, UDPConnCheckPort: *argUDPConnectivityCheckPort, + EnableTProxy: *argEnableTProxy, } return config } diff --git a/pkg/daemon/controller.go b/pkg/daemon/controller.go index a141bb1f032..97f4d714fd9 100644 --- a/pkg/daemon/controller.go +++ b/pkg/daemon/controller.go @@ -625,6 +625,17 @@ func (c *Controller) Run(stopCh <-chan struct{}) { } }, 5*time.Minute, stopCh) + if c.config.EnableTProxy { + go c.StartTProxyForwarding() + go wait.Until(c.runTProxyConfigWorker, 3*time.Second, stopCh) + // Using the tproxy method, kubelet's TCP probe packets cannot reach the namespace of the pod of the custom VPC, + // so tproxy itself probes the pod of the custom VPC, if probe failed remove the iptable rules from + // kubelet to tproxy, if probe success recover the iptable rules + go wait.Until(c.StartTProxyTCPPortProbe, 1*time.Second, stopCh) + } else { + c.cleanTProxyConfig() + } + <-stopCh klog.Info("Shutting down workers") } diff --git a/pkg/daemon/gateway.go b/pkg/daemon/gateway.go index 9409c078cde..7ecca9ce755 100644 --- a/pkg/daemon/gateway.go +++ b/pkg/daemon/gateway.go @@ -3,6 +3,7 @@ package daemon import ( "fmt" "os/exec" + "sort" "strings" v1 "k8s.io/api/core/v1" @@ -246,3 +247,44 @@ func (c *Controller) getEgressNatIpByNode(nodeName string) (map[string]string, e } return subnetsNatIp, nil } + +func (c *Controller) getTProxyConditionPod(needSort bool) ([]*v1.Pod, error) { + + var filteredPods []*v1.Pod + pods, err := c.podsLister.List(labels.Everything()) + if err != nil { + klog.Errorf("list pods failed, %v", err) + return nil, err + } + + for _, pod := range pods { + if pod.Spec.NodeName != c.config.NodeName { + continue + } + + subnetName, ok := pod.Annotations[fmt.Sprintf(util.LogicalSwitchAnnotationTemplate, util.OvnProvider)] + if !ok { + continue + } + + subnet, err := c.subnetsLister.Get(subnetName) + if err != nil { + err = fmt.Errorf("failed to get subnet '%s', err: %v", subnetName, err) + return nil, err + } + + if subnet.Spec.Vpc == c.config.ClusterRouter { + continue + } + + filteredPods = append(filteredPods, pod) + } + + if needSort { + sort.Slice(filteredPods, func(i, j int) bool { + return filteredPods[i].Namespace+"/"+filteredPods[i].Name < filteredPods[j].Namespace+"/"+filteredPods[j].Name + }) + } + + return filteredPods, nil +} diff --git a/pkg/daemon/gateway_linux.go b/pkg/daemon/gateway_linux.go index 1a59f67da98..45dc72a4ba7 100644 --- a/pkg/daemon/gateway_linux.go +++ b/pkg/daemon/gateway_linux.go @@ -40,10 +40,13 @@ const ( const ( NAT = "nat" + MANGLE = "mangle" Prerouting = "PREROUTING" Postrouting = "POSTROUTING" + Output = "OUTPUT" OvnPrerouting = "OVN-PREROUTING" OvnPostrouting = "OVN-POSTROUTING" + OvnOutput = "OVN-OUTPUT" OvnMasquerade = "OVN-MASQUERADE" OvnNatOutGoingPolicy = "OVN-NAT-POLICY" OvnNatOutGoingPolicySubnet = "OVN-NAT-PSUBNET-" @@ -52,6 +55,10 @@ const ( const ( OnOutGoingNatMark = "0x90001/0x90001" OnOutGoingForwardMark = "0x90002/0x90002" + TProxyOutputMark = 0x90003 + TProxyOutputMask = 0x90003 + TProxyPreroutingMark = 0x90004 + TProxyPreroutingMask = 0x90004 ) type policyRouteMeta struct { @@ -584,9 +591,11 @@ func (c *Controller) setIptables() error { } ) protocols := make([]string, 2) + isDual := false if c.protocol == kubeovnv1.ProtocolDual { protocols[0] = kubeovnv1.ProtocolIPv4 protocols[1] = kubeovnv1.ProtocolIPv6 + isDual = true } else { protocols[0] = c.protocol } @@ -733,6 +742,10 @@ func (c *Controller) setIptables() error { return err } + if err = c.reconcileTProxyIPTableRules(protocol, isDual); err != nil { + return err + } + if err = c.updateIptablesChain(ipt, NAT, OvnPrerouting, Prerouting, natPreroutingRules); err != nil { klog.Errorf("failed to update chain %s/%s: %v", NAT, OvnPrerouting) return err @@ -754,6 +767,125 @@ func (c *Controller) setIptables() error { return nil } +func (c *Controller) reconcileTProxyIPTableRules(protocol string, isDual bool) error { + if !c.config.EnableTProxy { + return nil + } + + ipt := c.iptables[protocol] + tproxyPreRoutingRules := make([]util.IPTableRule, 0) + tproxyOutputRules := make([]util.IPTableRule, 0) + probePorts := strset.New() + + pods, err := c.getTProxyConditionPod(true) + if err != nil { + return err + } + + for _, pod := range pods { + var podIP string + for _, ip := range pod.Status.PodIPs { + if util.CheckProtocol(ip.IP) == protocol { + podIP = ip.IP + break + } + } + + if podIP == "" { + continue + } + + for _, container := range pod.Spec.Containers { + if container.ReadinessProbe != nil { + if httpGet := container.ReadinessProbe.HTTPGet; httpGet != nil { + if port := httpGet.Port.String(); port != "" { + probePorts.Add(port) + } + } + + if tcpSocket := container.ReadinessProbe.TCPSocket; tcpSocket != nil { + if port := tcpSocket.Port.String(); port != "" { + if isTCPProbePortReachable, ok := customVPCPodTCPProbeIPPort.Load(getIPPortString(podIP, port)); ok { + if isTCPProbePortReachable.(bool) { + probePorts.Add(port) + } + } + } + } + } + + if container.LivenessProbe != nil { + if httpGet := container.LivenessProbe.HTTPGet; httpGet != nil { + if port := httpGet.Port.String(); port != "" { + probePorts.Add(port) + } + } + + if tcpSocket := container.LivenessProbe.TCPSocket; tcpSocket != nil { + if port := tcpSocket.Port.String(); port != "" { + if isTCPProbePortReachable, ok := customVPCPodTCPProbeIPPort.Load(getIPPortString(podIP, port)); ok { + if isTCPProbePortReachable.(bool) { + probePorts.Add(port) + } + } + } + } + } + } + + if probePorts.IsEmpty() { + continue + } + + probePortList := probePorts.List() + sort.Strings(probePortList) + for _, probePort := range probePortList { + tProxyOutputMarkMask := fmt.Sprintf("%#x/%#x", TProxyOutputMark, TProxyOutputMask) + tProxyPreRoutingMarkMask := fmt.Sprintf("%#x/%#x", TProxyPreroutingMark, TProxyPreroutingMask) + + hostIP := pod.Status.HostIP + prefixLen := 32 + if protocol == kubeovnv1.ProtocolIPv6 { + prefixLen = 128 + } + + if isDual || os.Getenv("ENABLE_BIND_LOCAL_IP") == "false" { + if protocol == kubeovnv1.ProtocolIPv4 { + hostIP = "0.0.0.0" + } else if protocol == kubeovnv1.ProtocolIPv6 { + hostIP = "::" + } + } + tproxyOutputRules = append(tproxyOutputRules, util.IPTableRule{Table: MANGLE, Chain: OvnOutput, Rule: strings.Fields(fmt.Sprintf(`-d %s/%d -p tcp -m tcp --dport %s -j MARK --set-xmark %s`, podIP, prefixLen, probePort, tProxyOutputMarkMask))}) + tproxyPreRoutingRules = append(tproxyPreRoutingRules, util.IPTableRule{Table: MANGLE, Chain: OvnPrerouting, Rule: strings.Fields(fmt.Sprintf(`-d %s/%d -p tcp -m tcp --dport %s -j TPROXY --on-port %d --on-ip %s --tproxy-mark %s`, podIP, prefixLen, probePort, util.TProxyListenPort, hostIP, tProxyPreRoutingMarkMask))}) + } + } + + if err := c.updateIptablesChain(ipt, MANGLE, OvnPrerouting, Prerouting, tproxyPreRoutingRules); err != nil { + klog.Errorf("failed to update chain %s with rules %v: %v", OvnPrerouting, tproxyPreRoutingRules, err) + return err + } + + if err := c.updateIptablesChain(ipt, MANGLE, OvnOutput, Output, tproxyOutputRules); err != nil { + klog.Errorf("failed to update chain %s with rules %v: %v", OvnOutput, tproxyOutputRules, err) + return err + } + return nil +} + +func (c *Controller) cleanTProxyIPTableRules(protocol string) { + ipt := c.iptables[protocol] + if ipt == nil { + return + } + for _, chain := range [2]string{OvnPrerouting, OvnOutput} { + if err := ipt.ClearChain(MANGLE, chain); err != nil { + klog.Errorf("failed to clear iptables chain %v in table %v, %+v", chain, MANGLE, err) + return + } + } +} + func (c *Controller) reconcileNatOutgoingPolicyIptablesChain(protocol string) error { ipt := c.iptables[protocol] diff --git a/pkg/daemon/tproxy_linux.go b/pkg/daemon/tproxy_linux.go new file mode 100644 index 00000000000..d392bf1391b --- /dev/null +++ b/pkg/daemon/tproxy_linux.go @@ -0,0 +1,381 @@ +package daemon + +import ( + "errors" + "fmt" + "io" + "net" + "strconv" + "strings" + "sync" + "syscall" + + "github.com/containernetworking/plugins/pkg/ns" + "github.com/vishvananda/netlink" + "golang.org/x/sys/unix" + "k8s.io/klog/v2" + + kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1" + "github.com/kubeovn/kube-ovn/pkg/ovs" + goTProxy "github.com/kubeovn/kube-ovn/pkg/tproxy" + "github.com/kubeovn/kube-ovn/pkg/util" + "github.com/scylladb/go-set/strset" +) + +var ( + tcpListener net.Listener + + customVPCPodIPToNs sync.Map + customVPCPodTCPProbeIPPort sync.Map +) + +func (c *Controller) StartTProxyForwarding() { + var err error + addr := util.GetDefaultListenAddr() + + protocol := "tcp" + if strings.HasPrefix(addr, "[") && strings.HasSuffix(addr, "]") { + addr = addr[1 : len(addr)-1] + protocol = "tcp6" + } + + tcpListener, err = goTProxy.ListenTCP(protocol, &net.TCPAddr{IP: net.ParseIP(addr), Port: util.TProxyListenPort}) + if err != nil { + klog.Fatalf("Encountered error while binding listener: %s", err) + return + } + + defer func() { + if err := tcpListener.Close(); err != nil { + klog.Errorf("Error tcpListener Close err: %v ", err) + } + }() + + for { + conn, err := tcpListener.Accept() + if err != nil { + klog.Fatalf("Unrecoverable error while accepting connection: %s", err) + return + } + go handleRedirectFlow(conn) + } +} + +func (c *Controller) StartTProxyTCPPortProbe() { + + probePorts := strset.New() + + pods, err := c.getTProxyConditionPod(false) + if err != nil { + return + } + + for _, pod := range pods { + iface := ovs.PodNameToPortName(pod.Name, pod.Namespace, util.OvnProvider) + nsName, err := ovs.GetInterfacePodNs(iface) + if err != nil || nsName == "" { + klog.Infof("iface %s's namespace not found", iface) + continue + } + + for _, podIP := range pod.Status.PodIPs { + customVPCPodIPToNs.Store(podIP.IP, nsName) + for _, container := range pod.Spec.Containers { + if container.ReadinessProbe != nil { + if tcpSocket := container.ReadinessProbe.TCPSocket; tcpSocket != nil { + if port := tcpSocket.Port.String(); port != "" { + probePorts.Add(port) + } + } + } + + if container.LivenessProbe != nil { + if tcpSocket := container.LivenessProbe.TCPSocket; tcpSocket != nil { + if port := tcpSocket.Port.String(); port != "" { + probePorts.Add(port) + } + } + } + } + + probePortsList := probePorts.List() + for _, port := range probePortsList { + probePortInNs(podIP.IP, port, true, nil) + } + } + } +} + +func (c *Controller) runTProxyConfigWorker() { + protocols := getProtocols(c.protocol) + for _, protocol := range protocols { + c.reconcileTProxyRoutes(protocol) + } +} + +func (c *Controller) reconcileTProxyRoutes(protocol string) { + family, err := util.ProtocolToFamily(protocol) + if err != nil { + klog.Errorf("get Protocol %s family failed", protocol) + return + } + + if err := addRuleIfNotExist(family, TProxyOutputMark, TProxyOutputMask, util.TProxyRouteTable); err != nil { + klog.Error("add output rule failed err:%v ", err) + return + } + + if err := addRuleIfNotExist(family, TProxyPreroutingMark, TProxyPreroutingMask, util.TProxyRouteTable); err != nil { + klog.Error("add prerouting rule failed err:%v ", err) + return + } + + dst := GetDefaultRouteDst(protocol) + if err := addRouteIfNotExist(family, util.TProxyRouteTable, &dst); err != nil { + klog.Error("add tproxy route failed err:%v ", err) + return + } +} + +func (c *Controller) cleanTProxyConfig() { + protocols := getProtocols(c.protocol) + for _, protocol := range protocols { + c.cleanTProxyRoutes(protocol) + c.cleanTProxyIPTableRules(protocol) + } +} + +func (c *Controller) cleanTProxyRoutes(protocol string) { + family, err := util.ProtocolToFamily(protocol) + if err != nil { + klog.Errorf("get Protocol %s family failed", protocol) + return + } + + if err := deleteRuleIfExists(family, TProxyOutputMark); err != nil { + klog.Errorf("delete tproxy route rule mark %v failed err: %v ", TProxyOutputMark, err) + } + + if err := deleteRuleIfExists(family, TProxyPreroutingMark); err != nil { + klog.Errorf("delete tproxy route rule mark %v failed err: %v ", TProxyPreroutingMark, err) + } + + dst := GetDefaultRouteDst(protocol) + if err := delRouteIfExist(family, util.TProxyRouteTable, &dst); err != nil { + klog.Errorf("delete tproxy route rule mark %v failed err: %v ", TProxyPreroutingMark, err) + } +} + +func addRuleIfNotExist(family, mark, mask, table int) error { + curRules, err := netlink.RuleListFiltered(family, &netlink.Rule{Mark: mark}, netlink.RT_FILTER_MARK) + if err != nil { + return fmt.Errorf("list rules with mark %x failed err: %v", mark, err) + } + + if len(curRules) != 0 { + return nil + } + + rule := netlink.NewRule() + rule.Mark = mark + rule.Mask = mask + rule.Table = table + rule.Family = family + + if err = netlink.RuleAdd(rule); err != nil && !errors.Is(err, syscall.EEXIST) { + klog.Errorf("add rule %v failed with err %v ", rule, err) + return err + } + + return nil +} + +func deleteRuleIfExists(family, mark int) error { + curRules, err := netlink.RuleListFiltered(family, &netlink.Rule{Mark: mark}, netlink.RT_FILTER_MARK) + if err != nil { + return fmt.Errorf("list rules with mark %x failed err: %v", mark, err) + } + + if len(curRules) != 0 { + for _, r := range curRules { + if err := netlink.RuleDel(&r); err != nil && !errors.Is(err, syscall.ENOENT) { + return fmt.Errorf("delete rule %v failed with err: %v", r, err) + } + } + } + return nil +} + +func addRouteIfNotExist(family, table int, dst *net.IPNet) error { + curRoutes, err := netlink.RouteListFiltered(family, &netlink.Route{Table: table, Dst: dst}, netlink.RT_FILTER_TABLE|netlink.RT_FILTER_DST) + if err != nil { + return fmt.Errorf("list routes with table %d failed with err: %v", table, err) + } + + if len(curRoutes) != 0 { + return nil + } + + link, err := netlink.LinkByName("lo") + if err != nil { + return fmt.Errorf("can't find device lo") + } + + route := netlink.Route{ + LinkIndex: link.Attrs().Index, + Dst: dst, + Table: table, + Scope: unix.RT_SCOPE_HOST, + Type: unix.RTN_LOCAL, + } + + if err = netlink.RouteReplace(&route); err != nil && !errors.Is(err, syscall.EEXIST) { + klog.Errorf("add route %v failed with err %v ", route, err) + return err + } + + return nil +} + +func delRouteIfExist(family, table int, dst *net.IPNet) error { + curRoutes, err := netlink.RouteListFiltered(family, &netlink.Route{Table: table}, netlink.RT_FILTER_TABLE) + if err != nil { + klog.Error("list routes with table %d failed with err: %v", table, err) + return err + } + + if len(curRoutes) == 0 { + return nil + } + + link, err := netlink.LinkByName("lo") + if err != nil { + return fmt.Errorf("can't find device lo") + } + + route := netlink.Route{ + LinkIndex: link.Attrs().Index, + Dst: dst, + Table: table, + Scope: unix.RT_SCOPE_HOST, + Type: unix.RTN_LOCAL, + } + + if err = netlink.RouteDel(&route); err != nil && !errors.Is(err, syscall.ENOENT) { + klog.Errorf("del route %v failed with err %v ", route, err) + return err + } + + return nil +} + +func handleRedirectFlow(conn net.Conn) { + + klog.V(5).Infof("Accepting TCP connection from %v with destination of %v", conn.RemoteAddr().String(), conn.LocalAddr().String()) + defer func() { + if err := conn.Close(); err != nil { + klog.Errorf("conn Close err: %v ", err) + } + }() + + podIPPort := conn.LocalAddr().String() + podIP, probePort, err := net.SplitHostPort(podIPPort) + if err != nil { + klog.Errorf("Get %s Pod IP and Port failed err: %v", podIPPort, err) + return + } + + probePortInNs(podIP, probePort, false, conn) +} + +func probePortInNs(podIP, probePort string, isTProxyProbe bool, conn net.Conn) { + podNs, ok := customVPCPodIPToNs.Load(podIP) + if !ok { + return + } + + iprobePort, err := strconv.Atoi(probePort) + if err != nil { + return + } + + podNS, err := ns.GetNS(podNs.(string)) + if err != nil { + customVPCPodIPToNs.Delete(podIP) + klog.Infof("ns %s already deleted", podNs) + return + } + + _ = ns.WithNetNSPath(podNS.Path(), func(_ ns.NetNS) error { + // Packet's src and dst IP are both PodIP in netns + localpodTcpAddr := net.TCPAddr{IP: net.ParseIP(podIP)} + remotepodTcpAddr := net.TCPAddr{IP: net.ParseIP(podIP), Port: iprobePort} + + remoteConn, err := goTProxy.DialTCP(&localpodTcpAddr, &remotepodTcpAddr, !isTProxyProbe) + if err != nil { + if isTProxyProbe { + customVPCPodTCPProbeIPPort.Store(getIPPortString(podIP, probePort), false) + } + return nil + } + + if isTProxyProbe { + customVPCPodTCPProbeIPPort.Store(getIPPortString(podIP, probePort), true) + return nil + } + + defer func() { + if err := remoteConn.Close(); err != nil { + klog.Errorf("remoteConn %v Close err: %v ", remoteConn, err) + } + }() + + var streamWait sync.WaitGroup + streamWait.Add(2) + + streamConn := func(dst io.Writer, src io.Reader) { + if _, err := io.Copy(dst, src); err != nil { + klog.Errorf("copy stream from dst %v to src %v failed err: %v ", dst, src, err) + } + + streamWait.Done() + } + + go streamConn(remoteConn, conn) + go streamConn(conn, remoteConn) + + streamWait.Wait() + return nil + }) +} + +func getIPPortString(podIP, port string) string { + return fmt.Sprintf("%s|%s", podIP, port) +} + +func getProtocols(protocol string) []string { + var protocols []string + if protocol == kubeovnv1.ProtocolDual { + protocols = append(protocols, kubeovnv1.ProtocolIPv4) + protocols = append(protocols, kubeovnv1.ProtocolIPv6) + } else { + protocols = append(protocols, protocol) + } + return protocols +} + +func GetDefaultRouteDst(protocol string) net.IPNet { + var dst net.IPNet + if protocol == kubeovnv1.ProtocolIPv4 { + dst = net.IPNet{ + IP: net.IPv4zero, + Mask: net.CIDRMask(0, 0), + } + } else if protocol == kubeovnv1.ProtocolIPv6 { + dst = net.IPNet{ + IP: net.IPv6zero, + Mask: net.CIDRMask(0, 0), + } + } + return dst +} diff --git a/pkg/daemon/tproxy_windows.go b/pkg/daemon/tproxy_windows.go new file mode 100644 index 00000000000..639b80e8305 --- /dev/null +++ b/pkg/daemon/tproxy_windows.go @@ -0,0 +1,13 @@ +package daemon + +func (c *Controller) StartTProxyForwarding() { +} + +func (c *Controller) StartTProxyTCPPortProbe() { +} + +func (c *Controller) runTProxyConfigWorker() { +} + +func (c *Controller) cleanTProxyConfig() { +} diff --git a/pkg/ovs/ovs-vsctl.go b/pkg/ovs/ovs-vsctl.go index d8cfb813267..7fe9f9dd19d 100644 --- a/pkg/ovs/ovs-vsctl.go +++ b/pkg/ovs/ovs-vsctl.go @@ -3,6 +3,7 @@ package ovs import ( "fmt" "os/exec" + "regexp" "strconv" "strings" "time" @@ -15,6 +16,8 @@ import ( // Glory belongs to openvswitch/ovn-kubernetes // https://github.com/openvswitch/ovn-kubernetes/blob/master/go-controller/pkg/util/ovs.go +var podNetNsRegexp = regexp.MustCompile(`pod_netns="([^"]+)"`) + func Exec(args ...string) (string, error) { start := time.Now() args = append([]string{"--timeout=30"}, args...) @@ -249,6 +252,25 @@ func ValidatePortVendor(port string) (bool, error) { return util.ContainsString(output, port), err } +func GetInterfacePodNs(iface string) (string, error) { + ret, err := ovsFind("interface", "external-ids", fmt.Sprintf("external-ids:iface-id=%s", iface)) + if err != nil { + return "", err + } + + if len(ret) == 0 { + return "", nil + } + + podNetNs := "" + match := podNetNsRegexp.FindStringSubmatch(ret[0]) + if len(match) > 1 { + podNetNs = match[1] + } + + return podNetNs, nil +} + // config mirror for interface by pod annotations and install param func ConfigInterfaceMirror(globalMirror bool, open string, iface string) error { if globalMirror { diff --git a/pkg/tproxy/tproxy_tcp_linux.go b/pkg/tproxy/tproxy_tcp_linux.go new file mode 100644 index 00000000000..101b57ca31b --- /dev/null +++ b/pkg/tproxy/tproxy_tcp_linux.go @@ -0,0 +1,229 @@ +// This code below is referenced at https://github.com/Asphaltt/go-tproxy/blob/master/tproxy_tcp.go +// Because the code needs to be customized somewhere, the project is not directly imported +package tproxy + +import ( + "fmt" + "net" + "os" + "strings" + "syscall" + + "k8s.io/klog/v2" +) + +// Listener describes a TCP Listener +// with the Linux IP_TRANSPARENT option defined +// on the listening socket +type Listener struct { + base net.Listener +} + +// Accept waits for and returns +// the next connection to the listener. +// +// This command wraps the AcceptTProxy +// method of the Listener +func (listener *Listener) Accept() (net.Conn, error) { + return listener.AcceptTProxy() +} + +// AcceptTProxy will accept a TCP connection +// and wrap it to a TProxy connection to provide +// TProxy functionality +func (listener *Listener) AcceptTProxy() (*Conn, error) { + tcpConn, err := listener.base.(*net.TCPListener).AcceptTCP() + if err != nil { + return nil, err + } + + return &Conn{TCPConn: tcpConn}, nil +} + +// Addr returns the network address +// the listener is accepting connections +// from +func (listener *Listener) Addr() net.Addr { + return listener.base.Addr() +} + +// Close will close the listener from accepting +// any more connections. Any blocked connections +// will unblock and close +func (listener *Listener) Close() error { + return listener.base.Close() +} + +// ListenTCP will construct a new TCP listener +// socket with the Linux IP_TRANSPARENT option +// set on the underlying socket +func ListenTCP(network string, laddr *net.TCPAddr) (net.Listener, error) { + return listenTCP("", network, laddr) +} + +func listenTCP(device, network string, laddr *net.TCPAddr) (net.Listener, error) { + listener, err := net.ListenTCP(network, laddr) + if err != nil { + return nil, err + } + + fileDescriptorSource, err := listener.File() + if err != nil { + return nil, &net.OpError{Op: "listen", Net: network, Source: nil, Addr: laddr, Err: fmt.Errorf("get file descriptor: %s", err)} + } + + defer func() { + if err := fileDescriptorSource.Close(); err != nil { + klog.Errorf("fileDescriptorSource %v Close err: %v ", fileDescriptorSource, err) + } + }() + + if device != "" { + if err = syscall.BindToDevice(int(fileDescriptorSource.Fd()), device); err != nil { + return nil, &net.OpError{Op: "listen", Net: network, Source: nil, Addr: laddr, Err: fmt.Errorf("set socket option: SO_BINDTODEVICE(%s): %s", device, err)} + } + } + + if err = syscall.SetsockoptInt(int(fileDescriptorSource.Fd()), syscall.SOL_IP, syscall.IP_TRANSPARENT, 1); err != nil { + return nil, &net.OpError{Op: "listen", Net: network, Source: nil, Addr: laddr, Err: fmt.Errorf("set socket option: IP_TRANSPARENT: %s", err)} + } + + return &Listener{listener}, nil +} + +// Conn describes a connection +// accepted by the TProxy listener. +// +// It is simply a TCP connection with +// the ability to dial a connection to +// the original destination while assuming +// the IP address of the client +type Conn struct { + *net.TCPConn +} + +// tcpAddToSockerAddr will convert a TCPAddr +// into a Sockaddr that may be used when +// connecting and binding sockets +func tcpAddrToSocketAddr(addr *net.TCPAddr) (syscall.Sockaddr, error) { + switch { + case addr.IP.To4() != nil: + ip := [4]byte{} + copy(ip[:], addr.IP.To4()) + + return &syscall.SockaddrInet4{Addr: ip, Port: addr.Port}, nil + + default: + ip := [16]byte{} + copy(ip[:], addr.IP.To16()) + + return &syscall.SockaddrInet6{Addr: ip, Port: addr.Port}, nil + } +} + +// tcpAddrFamily will attempt to work +// out the address family based on the +// network and TCP addresses +func tcpAddrFamily(net string, laddr, raddr *net.TCPAddr) int { + switch net[len(net)-1] { + case '4': + return syscall.AF_INET + case '6': + return syscall.AF_INET6 + } + + if (laddr == nil || laddr.IP.To4() != nil) && + (raddr == nil || laddr.IP.To4() != nil) { + return syscall.AF_INET + } + return syscall.AF_INET6 +} + +// DialTCP will open a +// TCP connection to the specified destination +// with the specified local address. +func DialTCP(laddr, raddr *net.TCPAddr, isnonblocking bool) (*net.TCPConn, error) { + return dialTCP("", laddr, raddr, false, isnonblocking) +} + +func dialTCP(device string, laddr, raddr *net.TCPAddr, dontAssumeRemote bool, isnonblocking bool) (*net.TCPConn, error) { + if laddr == nil || raddr == nil { + return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("empty local address or remote address")} + } + + remoteSocketAddress, err := tcpAddrToSocketAddr(raddr) + if err != nil { + return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("build destination socket address: %s", err)} + } + + localSocketAddress, err := tcpAddrToSocketAddr(laddr) + if err != nil { + return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("build local socket address: %s", err)} + } + + fileDescriptor, err := syscall.Socket(tcpAddrFamily("tcp", raddr, laddr), syscall.SOCK_STREAM, syscall.IPPROTO_TCP) + if err != nil { + return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("socket open: %s", err)} + } + + if device != "" { + if err = syscall.BindToDevice(int(fileDescriptor), device); err != nil { + return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("set socket option: SO_BINDTODEVICE(%s): %s", device, err)} + } + } + + if err = syscall.SetsockoptInt(fileDescriptor, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1); err != nil { + if err := syscall.Close(fileDescriptor); err != nil { + klog.Errorf("fileDescriptor %v Close err: %v ", fileDescriptor, err) + } + return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("set socket option: SO_REUSEADDR: %s", err)} + } + + if err = syscall.SetsockoptInt(fileDescriptor, syscall.SOL_IP, syscall.IP_TRANSPARENT, 1); err != nil { + if err := syscall.Close(fileDescriptor); err != nil { + klog.Errorf("fileDescriptor %v Close err: %v ", fileDescriptor, err) + } + return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("set socket option: IP_TRANSPARENT: %s", err)} + } + + if err = syscall.SetNonblock(fileDescriptor, isnonblocking); err != nil { + if err := syscall.Close(fileDescriptor); err != nil { + klog.Errorf("fileDescriptor %v Close err: %v ", fileDescriptor, err) + } + return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("set socket option: SO_NONBLOCK: %s", err)} + } + + if !dontAssumeRemote { + if err = syscall.Bind(fileDescriptor, localSocketAddress); err != nil { + if err := syscall.Close(fileDescriptor); err != nil { + klog.Errorf("fileDescriptor %v Close err: %v ", fileDescriptor, err) + } + return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("socket bind: %s", err)} + } + } + + if err = syscall.Connect(fileDescriptor, remoteSocketAddress); err != nil && !strings.Contains(err.Error(), "operation now in progress") { + if err := syscall.Close(fileDescriptor); err != nil { + klog.Errorf("fileDescriptor %v Close err: %v ", fileDescriptor, err) + } + return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("socket connect: %s", err)} + } + + fdFile := os.NewFile(uintptr(fileDescriptor), fmt.Sprintf("net-tcp-dial-%s", raddr.String())) + defer func() { + if err := fdFile.Close(); err != nil { + klog.Errorf("fdFile %v Close err: %v ", fdFile, err) + } + }() + + remoteConn, err := net.FileConn(fdFile) + if err != nil { + if err := syscall.Close(fileDescriptor); err != nil { + klog.Errorf("fileDescriptor %v Close err: %v ", fileDescriptor, err) + } + + return nil, &net.OpError{Op: "dial", Err: fmt.Errorf("convert file descriptor to connection: %s", err)} + } + + return remoteConn.(*net.TCPConn), nil +} diff --git a/pkg/util/const.go b/pkg/util/const.go index a38198b3516..091b14e7442 100644 --- a/pkg/util/const.go +++ b/pkg/util/const.go @@ -254,4 +254,7 @@ const ( NatPolicyRuleActionNat = "nat" NatPolicyRuleActionForward = "forward" NatPolicyRuleIDLength = 12 + + TProxyListenPort = 8102 + TProxyRouteTable = 10001 ) diff --git a/pkg/util/net.go b/pkg/util/net.go index 27d0fa53e9c..fdca4239c8d 100644 --- a/pkg/util/net.go +++ b/pkg/util/net.go @@ -7,6 +7,7 @@ import ( "math" "math/big" "net" + "os" "strconv" "strings" "time" @@ -621,3 +622,20 @@ func UDPConnectivityListen(address string) error { } } } + +func GetDefaultListenAddr() string { + addr := "0.0.0.0" + if os.Getenv("ENABLE_BIND_LOCAL_IP") == "true" { + podIpsEnv := os.Getenv("POD_IPS") + podIps := strings.Split(podIpsEnv, ",") + // when pod in dual mode, golang can't support bind v4 and v6 address in the same time, + // so not support bind local ip when in dual mode + if len(podIps) == 1 { + addr = podIps[0] + if CheckProtocol(podIps[0]) == kubeovnv1.ProtocolIPv6 { + addr = fmt.Sprintf("[%s]", podIps[0]) + } + } + } + return addr +} diff --git a/test/e2e/framework/daemonset.go b/test/e2e/framework/daemonset.go index ed7a5b3368f..182926af7b5 100644 --- a/test/e2e/framework/daemonset.go +++ b/test/e2e/framework/daemonset.go @@ -2,12 +2,21 @@ package framework import ( "context" + "encoding/json" + "errors" "fmt" + "strings" + "time" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/wait" v1apps "k8s.io/client-go/kubernetes/typed/apps/v1" + "k8s.io/kubectl/pkg/polymorphichelpers" ) type DaemonSetClient struct { @@ -67,3 +76,61 @@ func (c *DaemonSetClient) GetPodOnNode(ds *appsv1.DaemonSet, node string) (*core return nil, fmt.Errorf("pod for daemonset %s/%s on node %s not found", ds.Namespace, ds.Name, node) } + +func (c *DaemonSetClient) Patch(daemonset *appsv1.DaemonSet) *appsv1.DaemonSet { + modifiedBytes, err := json.Marshal(daemonset) + if err != nil { + Failf("failed to marshal modified DaemonSet: %v", err) + } + ExpectNoError(err) + var patchedDaemonSet *appsv1.DaemonSet + err = wait.PollUntilContextTimeout(context.Background(), 2*time.Second, timeout, true, func(ctx context.Context) (bool, error) { + daemonSet, err := c.DaemonSetInterface.Patch(ctx, daemonset.Name, types.MergePatchType, modifiedBytes, metav1.PatchOptions{}, "") + if err != nil { + return handleWaitingAPIError(err, false, "patch daemonset %s/%s", daemonset.Namespace, daemonset.Name) + } + patchedDaemonSet = daemonSet + return true, nil + }) + if err == nil { + return patchedDaemonSet.DeepCopy() + } + + if errors.Is(err, context.DeadlineExceeded) { + Failf("timed out while retrying to patch daemonset %s/%s", daemonset.Namespace, daemonset.Name) + } + Failf("error occurred while retrying to patch daemonset %s/%s: %v", daemonset.Namespace, daemonset.Name, err) + + return nil +} + +func (c *DaemonSetClient) PatchSync(modifiedDaemonset *appsv1.DaemonSet) *appsv1.DaemonSet { + daemonSet := c.Patch(modifiedDaemonset) + return c.RolloutStatus(daemonSet.Name) +} + +func (c *DaemonSetClient) RolloutStatus(name string) *appsv1.DaemonSet { + var daemonSet *appsv1.DaemonSet + WaitUntil(2*time.Second, timeout, func(_ context.Context) (bool, error) { + var err error + daemonSet = c.Get(name) + unstructured := &unstructured.Unstructured{} + if unstructured.Object, err = runtime.DefaultUnstructuredConverter.ToUnstructured(daemonSet); err != nil { + return false, err + } + + dsv := &polymorphichelpers.DaemonSetStatusViewer{} + msg, done, err := dsv.Status(unstructured, 0) + if err != nil { + return false, err + } + if done { + return true, nil + } + + Logf(strings.TrimSpace(msg)) + return false, nil + }, "") + + return daemonSet +} diff --git a/test/e2e/framework/image.go b/test/e2e/framework/image.go index 67c4e367ae4..b02381a2789 100644 --- a/test/e2e/framework/image.go +++ b/test/e2e/framework/image.go @@ -4,4 +4,5 @@ const ( PauseImage = "kubeovn/pause:3.2" BusyBoxImage = "busybox:stable" AgnhostImage = "kubeovn/agnhost:2.43" + NginxImage = "nginx:latest" ) diff --git a/test/e2e/framework/iptables/iptables.go b/test/e2e/framework/iptables/iptables.go new file mode 100644 index 00000000000..911115c03e9 --- /dev/null +++ b/test/e2e/framework/iptables/iptables.go @@ -0,0 +1,50 @@ +package iptables + +import ( + "context" + "fmt" + "strings" + "time" + + "github.com/onsi/gomega" + + apiv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1" + "github.com/kubeovn/kube-ovn/test/e2e/framework" + corev1 "k8s.io/api/core/v1" + e2epodoutput "k8s.io/kubernetes/test/e2e/framework/pod/output" +) + +func CheckIptablesRulesOnNode(f *framework.Framework, node, table, chain, protocol string, expectedRules []string, shouldExist bool) { + + ovsPod := getOvsPodOnNode(f, node) + + iptBin := "iptables" + if protocol == apiv1.ProtocolIPv6 { + iptBin = "ip6tables" + } + + cmd := fmt.Sprintf(`%s -t %s -S `, iptBin, table) + if chain != "" { + cmd += chain + } + framework.WaitUntil(2*time.Second, time.Minute, func(_ context.Context) (bool, error) { + output := e2epodoutput.RunHostCmdOrDie(ovsPod.Namespace, ovsPod.Name, cmd) + rules := strings.Split(output, "\n") + for _, r := range expectedRules { + framework.Logf("checking rule %s ", r) + ok, err := gomega.ContainElement(gomega.HavePrefix(r)).Match(rules) + if err != nil || ok != shouldExist { + return false, err + } + } + return true, nil + }, "") +} + +func getOvsPodOnNode(f *framework.Framework, node string) *corev1.Pod { + daemonSetClient := f.DaemonSetClientNS(framework.KubeOvnNamespace) + ds := daemonSetClient.Get("ovs-ovn") + pod, err := daemonSetClient.GetPodOnNode(ds, node) + framework.ExpectNoError(err) + return pod +} diff --git a/test/e2e/framework/pod.go b/test/e2e/framework/pod.go index bd74ea98ae2..8f3921ba0bb 100644 --- a/test/e2e/framework/pod.go +++ b/test/e2e/framework/pod.go @@ -27,6 +27,12 @@ func (f *Framework) PodClientNS(namespace string) *PodClient { return &PodClient{f, e2epod.PodClientNS(f.Framework, namespace)} } +func (c *PodClient) GetPod(name string) *corev1.Pod { + pod, err := c.PodInterface.Get(context.TODO(), name, metav1.GetOptions{}) + ExpectNoError(err) + return pod +} + func (c *PodClient) Create(pod *corev1.Pod) *corev1.Pod { return c.PodClient.Create(context.Background(), pod) } diff --git a/test/e2e/kube-ovn/pod/vpc_pod_probe.go b/test/e2e/kube-ovn/pod/vpc_pod_probe.go new file mode 100644 index 00000000000..1f9fe629cf7 --- /dev/null +++ b/test/e2e/kube-ovn/pod/vpc_pod_probe.go @@ -0,0 +1,235 @@ +package pod + +import ( + "fmt" + "time" + + "github.com/onsi/ginkgo/v2" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/util/intstr" + clientset "k8s.io/client-go/kubernetes" + + apiv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1" + "github.com/kubeovn/kube-ovn/pkg/daemon" + "github.com/kubeovn/kube-ovn/pkg/util" + "github.com/kubeovn/kube-ovn/test/e2e/framework" + "github.com/kubeovn/kube-ovn/test/e2e/framework/iptables" +) + +var _ = framework.SerialDescribe("[group:pod]", func() { + f := framework.NewDefaultFramework("vpc-pod-probe") + + var cs clientset.Interface + var podClient *framework.PodClient + var subnetClient *framework.SubnetClient + var vpcClient *framework.VpcClient + var namespaceName, subnetName, podName, vpcName string + var subnet *apiv1.Subnet + var cidr, image string + var extraSubnetNames []string + + ginkgo.BeforeEach(func() { + cs = f.ClientSet + podClient = f.PodClient() + subnetClient = f.SubnetClient() + namespaceName = f.Namespace.Name + subnetName = "subnet-" + framework.RandomSuffix() + podName = "pod-" + framework.RandomSuffix() + cidr = framework.RandomCIDR(f.ClusterIpFamily) + vpcClient = f.VpcClient() + if image == "" { + image = framework.GetKubeOvnImage(cs) + } + + ginkgo.By("Creating subnet " + subnetName) + subnet = framework.MakeSubnet(subnetName, "", cidr, "", "", "", nil, nil, []string{namespaceName}) + subnet = subnetClient.CreateSync(subnet) + }) + ginkgo.AfterEach(func() { + ginkgo.By("Deleting pod " + podName) + podClient.DeleteSync(podName) + + ginkgo.By("Deleting subnet " + subnetName) + subnetClient.DeleteSync(subnetName) + + if vpcName != "" { + ginkgo.By("Deleting custom vpc " + vpcName) + vpcClient.DeleteSync(vpcName) + } + + if len(extraSubnetNames) != 0 { + for _, subnetName := range extraSubnetNames { + subnetClient.DeleteSync(subnetName) + } + } + }) + + framework.ConformanceIt("should support http and tcp liveness probe and readiness probe in custom vpc pod ", func() { + f.SkipVersionPriorTo(1, 12, "This feature was introduced in v1.12") + daemonSetClient := f.DaemonSetClientNS(framework.KubeOvnNamespace) + originDs := daemonSetClient.Get("kube-ovn-cni") + modifyDs := originDs.DeepCopy() + + newArgs := originDs.Spec.Template.Spec.Containers[0].Args + for index, arg := range newArgs { + if arg == "--enable-tproxy=false" { + newArgs = append(newArgs[:index], newArgs[index+1:]...) + } + } + newArgs = append(newArgs, "--enable-tproxy=true") + modifyDs.Spec.Template.Spec.Containers[0].Args = newArgs + + daemonSetClient.PatchSync(modifyDs) + + custVPCSubnetName := "subnet-" + framework.RandomSuffix() + extraSubnetNames = append(extraSubnetNames, custVPCSubnetName) + + ginkgo.By("Create Custom Vpc subnet Pod") + vpcName = "vpc-" + framework.RandomSuffix() + customVPC := framework.MakeVpc(vpcName, "", false, false, nil) + vpcClient.CreateSync(customVPC) + + ginkgo.By("Creating subnet " + custVPCSubnetName) + cidr = framework.RandomCIDR(f.ClusterIpFamily) + subnet := framework.MakeSubnet(custVPCSubnetName, "", cidr, "", vpcName, "", nil, nil, nil) + _ = subnetClient.CreateSync(subnet) + + ginkgo.By("Creating pod with HTTP liveness and readiness probe that port is accessible " + podName) + pod := framework.MakePod(namespaceName, podName, nil, map[string]string{util.LogicalSwitchAnnotation: custVPCSubnetName}, framework.NginxImage, nil, nil) + + pod.Spec.Containers[0].ReadinessProbe = &corev1.Probe{ + ProbeHandler: corev1.ProbeHandler{ + HTTPGet: &corev1.HTTPGetAction{ + Port: intstr.FromInt(80), + }, + }, + } + pod.Spec.Containers[0].LivenessProbe = &corev1.Probe{ + ProbeHandler: corev1.ProbeHandler{ + HTTPGet: &corev1.HTTPGetAction{ + Port: intstr.FromInt(80), + }, + }, + } + + pod = podClient.CreateSync(pod) + framework.ExpectEqual(pod.Status.ContainerStatuses[0].Ready, true) + checkTProxyRules(f, pod, 80, true) + podClient.DeleteSync(podName) + + ginkgo.By("Creating pod with HTTP liveness and readiness probe that port is not accessible " + podName) + pod = framework.MakePod(namespaceName, podName, nil, map[string]string{util.LogicalSwitchAnnotation: custVPCSubnetName}, framework.NginxImage, nil, nil) + pod.Spec.Containers[0].ReadinessProbe = &corev1.Probe{ + ProbeHandler: corev1.ProbeHandler{ + HTTPGet: &corev1.HTTPGetAction{ + Port: intstr.FromInt(81), + }, + }, + } + pod.Spec.Containers[0].LivenessProbe = &corev1.Probe{ + ProbeHandler: corev1.ProbeHandler{ + HTTPGet: &corev1.HTTPGetAction{ + Port: intstr.FromInt(81), + }, + }, + } + + _ = podClient.Create(pod) + time.Sleep(5 * time.Second) + pod = podClient.GetPod(podName) + + framework.ExpectEqual(pod.Status.ContainerStatuses[0].Ready, false) + checkTProxyRules(f, pod, 81, true) + podClient.DeleteSync(podName) + + ginkgo.By("Creating pod with TCP probe liveness and readiness probe that port is accessible " + podName) + pod = framework.MakePod(namespaceName, podName, nil, map[string]string{util.LogicalSwitchAnnotation: custVPCSubnetName}, framework.NginxImage, nil, nil) + pod.Spec.Containers[0].ReadinessProbe = &corev1.Probe{ + ProbeHandler: corev1.ProbeHandler{ + TCPSocket: &corev1.TCPSocketAction{ + Port: intstr.FromInt(80), + }, + }, + } + pod.Spec.Containers[0].LivenessProbe = &corev1.Probe{ + ProbeHandler: corev1.ProbeHandler{ + TCPSocket: &corev1.TCPSocketAction{ + Port: intstr.FromInt(80), + }, + }, + } + + pod = podClient.CreateSync(pod) + framework.ExpectEqual(pod.Status.ContainerStatuses[0].Ready, true) + + checkTProxyRules(f, pod, 80, true) + podClient.DeleteSync(podName) + + ginkgo.By("Creating pod with TCP probe liveness and readiness probe that port is not accessible " + podName) + pod = framework.MakePod(namespaceName, podName, nil, map[string]string{util.LogicalSwitchAnnotation: custVPCSubnetName}, framework.NginxImage, nil, nil) + pod.Spec.Containers[0].ReadinessProbe = &corev1.Probe{ + ProbeHandler: corev1.ProbeHandler{ + TCPSocket: &corev1.TCPSocketAction{ + Port: intstr.FromInt(81), + }, + }, + } + pod.Spec.Containers[0].LivenessProbe = &corev1.Probe{ + ProbeHandler: corev1.ProbeHandler{ + TCPSocket: &corev1.TCPSocketAction{ + Port: intstr.FromInt(81), + }, + }, + } + + _ = podClient.Create(pod) + time.Sleep(5 * time.Second) + + pod = podClient.GetPod(podName) + framework.ExpectEqual(pod.Status.ContainerStatuses[0].Ready, false) + checkTProxyRules(f, pod, 81, false) + }) +}) + +func checkTProxyRules(f *framework.Framework, pod *corev1.Pod, probePort int, exist bool) { + + nodeName := pod.Spec.NodeName + tProxyOutputMarkMask := fmt.Sprintf("%#x/%#x", daemon.TProxyOutputMark, daemon.TProxyOutputMask) + tProxyPreRoutingMarkMask := fmt.Sprintf("%#x/%#x", daemon.TProxyPreroutingMark, daemon.TProxyPreroutingMask) + + isZeroIP := false + if len(pod.Status.PodIPs) == 2 { + isZeroIP = true + } + + for _, podIP := range pod.Status.PodIPs { + if util.CheckProtocol(podIP.IP) == apiv1.ProtocolIPv4 { + expectedRules := []string{ + fmt.Sprintf(`-A OVN-OUTPUT -d %s/32 -p tcp -m tcp --dport %d -j MARK --set-xmark %s`, podIP.IP, probePort, tProxyOutputMarkMask), + } + iptables.CheckIptablesRulesOnNode(f, nodeName, daemon.MANGLE, daemon.OvnOutput, apiv1.ProtocolIPv4, expectedRules, exist) + hostIP := pod.Status.HostIP + if isZeroIP { + hostIP = "0.0.0.0" + } + expectedRules = []string{ + fmt.Sprintf(`-A OVN-PREROUTING -d %s/32 -p tcp -m tcp --dport %d -j TPROXY --on-port %d --on-ip %s --tproxy-mark %s`, podIP.IP, probePort, util.TProxyListenPort, hostIP, tProxyPreRoutingMarkMask), + } + iptables.CheckIptablesRulesOnNode(f, nodeName, daemon.MANGLE, daemon.OvnPrerouting, apiv1.ProtocolIPv4, expectedRules, exist) + } else if util.CheckProtocol(podIP.IP) == apiv1.ProtocolIPv6 { + expectedRules := []string{ + fmt.Sprintf(`-A OVN-OUTPUT -d %s/128 -p tcp -m tcp --dport %d -j MARK --set-xmark %s`, podIP.IP, probePort, tProxyOutputMarkMask), + } + iptables.CheckIptablesRulesOnNode(f, nodeName, daemon.MANGLE, daemon.OvnOutput, apiv1.ProtocolIPv6, expectedRules, exist) + + hostIP := pod.Status.HostIP + if isZeroIP { + hostIP = "::" + } + expectedRules = []string{ + fmt.Sprintf(`-A OVN-PREROUTING -d %s/128 -p tcp -m tcp --dport %d -j TPROXY --on-port %d --on-ip %s --tproxy-mark %s`, podIP.IP, probePort, util.TProxyListenPort, hostIP, tProxyPreRoutingMarkMask), + } + iptables.CheckIptablesRulesOnNode(f, nodeName, daemon.MANGLE, daemon.OvnPrerouting, apiv1.ProtocolIPv6, expectedRules, exist) + } + } +} diff --git a/test/e2e/kube-ovn/subnet/subnet.go b/test/e2e/kube-ovn/subnet/subnet.go index 860adad33f8..4bae84280eb 100644 --- a/test/e2e/kube-ovn/subnet/subnet.go +++ b/test/e2e/kube-ovn/subnet/subnet.go @@ -24,6 +24,7 @@ import ( "github.com/kubeovn/kube-ovn/test/e2e/framework" "github.com/kubeovn/kube-ovn/test/e2e/framework/docker" "github.com/kubeovn/kube-ovn/test/e2e/framework/iproute" + "github.com/kubeovn/kube-ovn/test/e2e/framework/iptables" "github.com/kubeovn/kube-ovn/test/e2e/framework/kind" ) @@ -72,36 +73,6 @@ func checkIPSetOnNode(f *framework.Framework, node string, expectetIPsets []stri }, "") } -func checkIptablesRulesOnNode(f *framework.Framework, node, table, chain, cidr string, expectedRules []string, shouldExist bool) { - if cidr == "" { - return - } - - ovsPod := getOvsPodOnNode(f, node) - - iptBin := "iptables" - if util.CheckProtocol(cidr) == apiv1.ProtocolIPv6 { - iptBin = "ip6tables" - } - - cmd := fmt.Sprintf(`%s -t %s -S`, iptBin, table) - if chain != "" { - cmd += chain - } - framework.WaitUntil(3*time.Second, 10*time.Second, func(_ context.Context) (bool, error) { - output := e2epodoutput.RunHostCmdOrDie(ovsPod.Namespace, ovsPod.Name, cmd) - rules := strings.Split(output, "\n") - for _, r := range expectedRules { - framework.Logf("checking iptables rule %q in table %q chain %q: %v", r, table, chain, shouldExist) - ok, err := gomega.ContainElement(gomega.HavePrefix(r)).Match(rules) - if err != nil || ok != shouldExist { - return false, err - } - } - return true, nil - }, "") -} - var _ = framework.Describe("[group:subnet]", func() { f := framework.NewDefaultFramework("subnet") @@ -1036,14 +1007,14 @@ var _ = framework.Describe("[group:subnet]", func() { fmt.Sprintf(`-A %s -s %s -m comment --comment "%s,%s"`, "FORWARD", cidrV4, util.OvnSubnetGatewayIptables, subnetName), } - checkIptablesRulesOnNode(f, node.Name, "filter", "FORWARD", cidrV4, expectedRules, true) + iptables.CheckIptablesRulesOnNode(f, node.Name, "filter", "FORWARD", apiv1.ProtocolIPv4, expectedRules, true) } if cidrV6 != "" { expectedRules := []string{ fmt.Sprintf(`-A %s -d %s -m comment --comment "%s,%s"`, "FORWARD", cidrV6, util.OvnSubnetGatewayIptables, subnetName), fmt.Sprintf(`-A %s -s %s -m comment --comment "%s,%s"`, "FORWARD", cidrV6, util.OvnSubnetGatewayIptables, subnetName), } - checkIptablesRulesOnNode(f, node.Name, "filter", "FORWARD", cidrV6, expectedRules, true) + iptables.CheckIptablesRulesOnNode(f, node.Name, "filter", "FORWARD", apiv1.ProtocolIPv6, expectedRules, true) } } @@ -1091,14 +1062,14 @@ var _ = framework.Describe("[group:subnet]", func() { fmt.Sprintf(`-A %s -s %s -m comment --comment "%s,%s"`, "FORWARD", cidrV4, util.OvnSubnetGatewayIptables, subnetName), } - checkIptablesRulesOnNode(f, node.Name, "filter", "FORWARD", cidrV4, expectedRules, false) + iptables.CheckIptablesRulesOnNode(f, node.Name, "filter", "FORWARD", apiv1.ProtocolIPv4, expectedRules, false) } if cidrV6 != "" { expectedRules := []string{ fmt.Sprintf(`-A %s -d %s -m comment --comment "%s,%s"`, "FORWARD", cidrV6, util.OvnSubnetGatewayIptables, subnetName), fmt.Sprintf(`-A %s -s %s -m comment --comment "%s,%s"`, "FORWARD", cidrV6, util.OvnSubnetGatewayIptables, subnetName), } - checkIptablesRulesOnNode(f, node.Name, "filter", "FORWARD", cidrV6, expectedRules, false) + iptables.CheckIptablesRulesOnNode(f, node.Name, "filter", "FORWARD", apiv1.ProtocolIPv6, expectedRules, false) } } }) @@ -1378,12 +1349,12 @@ func checkNatPolicyRules(f *framework.Framework, cs clientset.Interface, subnet } if cidrV4 != "" { - checkIptablesRulesOnNode(f, node.Name, "nat", "", cidrV4, staticV4Rules, true) - checkIptablesRulesOnNode(f, node.Name, "nat", "", cidrV4, expectV4Rules, shouldExist) + iptables.CheckIptablesRulesOnNode(f, node.Name, "nat", "", apiv1.ProtocolIPv4, staticV4Rules, true) + iptables.CheckIptablesRulesOnNode(f, node.Name, "nat", "", apiv1.ProtocolIPv4, expectV4Rules, shouldExist) } if cidrV6 != "" { - checkIptablesRulesOnNode(f, node.Name, "nat", "", cidrV6, staticV6Rules, true) - checkIptablesRulesOnNode(f, node.Name, "nat", "", cidrV6, expectV6Rules, shouldExist) + iptables.CheckIptablesRulesOnNode(f, node.Name, "nat", "", apiv1.ProtocolIPv6, staticV6Rules, true) + iptables.CheckIptablesRulesOnNode(f, node.Name, "nat", "", apiv1.ProtocolIPv6, expectV6Rules, shouldExist) } } } diff --git a/yamls/kube-ovn-dual-stack.yaml b/yamls/kube-ovn-dual-stack.yaml index 0b765d77054..fe12c92c52e 100644 --- a/yamls/kube-ovn-dual-stack.yaml +++ b/yamls/kube-ovn-dual-stack.yaml @@ -200,6 +200,7 @@ spec: - --alsologtostderr=true - --log_file=/var/log/kube-ovn/kube-ovn-cni.log - --log_file_max_size=0 + - --enable-tproxy=false securityContext: runAsUser: 0 privileged: true diff --git a/yamls/kube-ovn-ipv6.yaml b/yamls/kube-ovn-ipv6.yaml index dec0dac2b9b..ac02e856d0f 100644 --- a/yamls/kube-ovn-ipv6.yaml +++ b/yamls/kube-ovn-ipv6.yaml @@ -200,6 +200,7 @@ spec: - --alsologtostderr=true - --log_file=/var/log/kube-ovn/kube-ovn-cni.log - --log_file_max_size=0 + - --enable-tproxy=false securityContext: runAsUser: 0 privileged: true diff --git a/yamls/kube-ovn.yaml b/yamls/kube-ovn.yaml index 9fa8a1e217b..dcaab848565 100644 --- a/yamls/kube-ovn.yaml +++ b/yamls/kube-ovn.yaml @@ -202,6 +202,7 @@ spec: - --alsologtostderr=true - --log_file=/var/log/kube-ovn/kube-ovn-cni.log - --log_file_max_size=0 + - --enable-tproxy=false securityContext: runAsUser: 0 privileged: true From 4e761156c1ede9e44e85dbf2a03aca4f816a8712 Mon Sep 17 00:00:00 2001 From: bobz965 Date: Tue, 18 Jul 2023 17:27:03 +0800 Subject: [PATCH 11/13] fix vpc lb init (#3046) --- pkg/controller/vpc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/vpc.go b/pkg/controller/vpc.go index 6dc2779b910..2b747e1bc8b 100644 --- a/pkg/controller/vpc.go +++ b/pkg/controller/vpc.go @@ -204,7 +204,7 @@ func (c *Controller) addLoadBalancer(vpc string) (*VpcLoadBalancer, error) { if err := c.initLB(vpcLbConfig.TcpLoadBalancer, string(v1.ProtocolTCP), false); err != nil { return nil, err } - if err := c.initLB(vpcLbConfig.TcpSessLoadBalancer, string(v1.ProtocolTCP), false); err != nil { + if err := c.initLB(vpcLbConfig.TcpSessLoadBalancer, string(v1.ProtocolTCP), true); err != nil { return nil, err } if err := c.initLB(vpcLbConfig.UdpLoadBalancer, string(v1.ProtocolUDP), false); err != nil { From 3be1e84c2142dd89412d13a4896b40a7f91c0296 Mon Sep 17 00:00:00 2001 From: hzma Date: Tue, 18 Jul 2023 18:39:08 +0800 Subject: [PATCH 12/13] set genev_sys_6081 tx checksum off (#3045) --- cmd/daemon/init.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/cmd/daemon/init.go b/cmd/daemon/init.go index aa7822db7b1..bf094065afd 100644 --- a/cmd/daemon/init.go +++ b/cmd/daemon/init.go @@ -3,7 +3,20 @@ package daemon +import ( + "fmt" + "os/exec" + + "k8s.io/klog/v2" +) + func initForOS() error { - // nothing to do on Linux + // disable checksum for genev_sys_6081 as default + cmd := exec.Command("sh", "-c", "ethtool -K genev_sys_6081 tx off") + if err := cmd.Run(); err != nil { + err := fmt.Errorf("failed to set checksum off for genev_sys_6081, %v", err) + // should not affect cni pod running if failed, just record err log + klog.Error(err) + } return nil } From ed58b210302269f2d09b27087001b74fe50cd131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Tue, 18 Jul 2023 19:52:12 +0800 Subject: [PATCH 13/13] cni: reduce memory usage (#3047) --- .github/workflows/build-windows.yaml | 4 ++++ Makefile | 4 +++- cmd/cmdmain.go | 4 ---- cmd/cni/cni.go | 4 ++-- cmd/cni/netconf.go | 2 +- cmd/cni/netconf_windows.go | 2 +- cmd/windows/cni/main_windows.go | 7 ------- dist/images/Dockerfile | 4 ++-- 8 files changed, 13 insertions(+), 18 deletions(-) delete mode 100644 cmd/windows/cni/main_windows.go diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml index 3eaefeb9f99..46275dc74df 100644 --- a/.github/workflows/build-windows.yaml +++ b/.github/workflows/build-windows.yaml @@ -56,6 +56,10 @@ jobs: - go.sum EOF + sh hack/go-list.sh cmd/cni | while read f; do + echo "- $f" | tee -a $filter + done + sh hack/go-list.sh cmd/windows | while read f; do echo "- $f" | tee -a $filter done diff --git a/Makefile b/Makefile index 058eb04b4f0..48de41df51b 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,7 @@ ARCH = amd64 .PHONY: build-go build-go: go mod tidy + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn -ldflags $(GOLDFLAGS) -v ./cmd/cni CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-cmd -ldflags $(GOLDFLAGS) -v ./cmd CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-webhook -ldflags $(GOLDFLAGS) -v ./cmd/webhook CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o $(CURDIR)/dist/images/test-server -ldflags $(GOLDFLAGS) -v ./test/server @@ -81,11 +82,12 @@ build-go: .PHONY: build-go-windows build-go-windows: go mod tidy - CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -buildmode=pie -o $(CURDIR)/dist/windows/kube-ovn.exe -ldflags $(GOLDFLAGS) -v ./cmd/windows/cni + CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -buildmode=pie -o $(CURDIR)/dist/windows/kube-ovn.exe -ldflags $(GOLDFLAGS) -v ./cmd/cni CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -buildmode=pie -o $(CURDIR)/dist/windows/kube-ovn-daemon.exe -ldflags $(GOLDFLAGS) -v ./cmd/windows/daemon .PHONY: build-go-arm build-go-arm: + CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn -ldflags $(GOLDFLAGS) -v ./cmd/cni CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-cmd -ldflags $(GOLDFLAGS) -v ./cmd CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -buildmode=pie -o $(CURDIR)/dist/images/kube-ovn-webhook -ldflags $(GOLDFLAGS) -v ./cmd/webhook diff --git a/cmd/cmdmain.go b/cmd/cmdmain.go index 0b6514daffc..90ba28cd155 100644 --- a/cmd/cmdmain.go +++ b/cmd/cmdmain.go @@ -4,7 +4,6 @@ import ( "os" "path/filepath" - "github.com/kubeovn/kube-ovn/cmd/cni" "github.com/kubeovn/kube-ovn/cmd/controller" "github.com/kubeovn/kube-ovn/cmd/controller_health_check" "github.com/kubeovn/kube-ovn/cmd/daemon" @@ -16,7 +15,6 @@ import ( ) const ( - CmdCNI = "kube-ovn" CmdController = "kube-ovn-controller" CmdDaemon = "kube-ovn-daemon" CmdMonitor = "kube-ovn-monitor" @@ -29,8 +27,6 @@ const ( func main() { cmd := filepath.Base(os.Args[0]) switch cmd { - case CmdCNI: - cni.CmdMain() case CmdController: controller.CmdMain() case CmdDaemon: diff --git a/cmd/cni/cni.go b/cmd/cni/cni.go index 312adab8399..bb658474c49 100644 --- a/cmd/cni/cni.go +++ b/cmd/cni/cni.go @@ -1,4 +1,4 @@ -package cni +package main import ( "encoding/json" @@ -18,7 +18,7 @@ import ( "github.com/kubeovn/kube-ovn/versions" ) -func CmdMain() { +func main() { // this ensures that main runs only on main thread (thread group leader). // since namespace ops (unshare, setns) are done for a single thread, we // must ensure that the goroutine does not jump from OS thread to thread diff --git a/cmd/cni/netconf.go b/cmd/cni/netconf.go index 1a2cc52bc8c..91e45701a3a 100644 --- a/cmd/cni/netconf.go +++ b/cmd/cni/netconf.go @@ -1,7 +1,7 @@ //go:build !windows // +build !windows -package cni +package main import ( "github.com/containernetworking/cni/pkg/types" diff --git a/cmd/cni/netconf_windows.go b/cmd/cni/netconf_windows.go index 27d7ba8826f..ddcd2b557e7 100644 --- a/cmd/cni/netconf_windows.go +++ b/cmd/cni/netconf_windows.go @@ -1,4 +1,4 @@ -package cni +package main import ( "github.com/containernetworking/plugins/pkg/hns" diff --git a/cmd/windows/cni/main_windows.go b/cmd/windows/cni/main_windows.go deleted file mode 100644 index 5f9b7ff1232..00000000000 --- a/cmd/windows/cni/main_windows.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "github.com/kubeovn/kube-ovn/cmd/cni" - -func main() { - cni.CmdMain() -} diff --git a/dist/images/Dockerfile b/dist/images/Dockerfile index 9bc83bea9f4..34a323797ee 100644 --- a/dist/images/Dockerfile +++ b/dist/images/Dockerfile @@ -16,10 +16,10 @@ RUN rm -f /usr/bin/nc &&\ rm -f /usr/bin/netcat RUN deluser sync +COPY kube-ovn /kube-ovn/kube-ovn COPY kube-ovn-cmd /kube-ovn/kube-ovn-cmd COPY kube-ovn-webhook /kube-ovn/kube-ovn-webhook -RUN ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn && \ - ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-controller && \ +RUN ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-controller && \ ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-daemon && \ ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-monitor && \ ln -s /kube-ovn/kube-ovn-cmd /kube-ovn/kube-ovn-pinger && \