From 0e9c717d05ebc26a01c2c6c3961a17316c675260 Mon Sep 17 00:00:00 2001 From: Mengxin Liu Date: Mon, 22 Feb 2021 16:58:14 +0800 Subject: [PATCH 1/2] chore: move build dependency from alauda to kubeovn --- README.md | 8 ++++---- dist/images/Dockerfile | 12 ++++++------ dist/images/build.sh | 4 ++-- hack/update-codegen-docker.sh | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 9e0dd8ad359..7317b4b904e 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ kube_ovn_logo -[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/alauda/kube-ovn/blob/master/LICENSE) -[![Build Tag](https://img.shields.io/github/tag/alauda/kube-ovn.svg)](https://github.com/alauda/kube-ovn/releases) -[![Go Report Card](https://goreportcard.com/badge/github.com/alauda/kube-ovn)](https://goreportcard.com/report/github.com/alauda/kube-ovn) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/kubeovn/kube-ovn/blob/master/LICENSE) +[![Build Tag](https://img.shields.io/github/tag/kubeovn/kube-ovn.svg)](https://github.com/kubeovn/kube-ovn/releases) +[![Go Report Card](https://goreportcard.com/badge/github.com/kubeovn/kube-ovn)](https://goreportcard.com/report/github.com/kubeovn/kube-ovn) [![Slack Card](https://kube-ovn-slackin.herokuapp.com/badge.svg)](https://kube-ovn-slackin.herokuapp.com) [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Falauda%2Fkube-ovn.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Falauda%2Fkube-ovn?ref=badge_shield) -[中文教程](https://github.com/alauda/kube-ovn/wiki) +[中文教程](https://github.com/kubeovn/kube-ovn/wiki) Kube-OVN integrates the OVN-based Network Virtualization with Kubernetes. It offers an advanced Container Network Fabric for Enterprises with the most functions and the easiest operation. diff --git a/dist/images/Dockerfile b/dist/images/Dockerfile index 6c2da85c69c..178dcdbb991 100644 --- a/dist/images/Dockerfile +++ b/dist/images/Dockerfile @@ -14,8 +14,8 @@ RUN apt update && apt install build-essential git libnuma-dev autoconf curl \ RUN cd /usr/src/ && \ git clone -b branch-2.15 --depth=1 https://github.com/openvswitch/ovs.git && \ cd ovs && \ - curl https://github.com/alauda/ovs/commit/df1c802f568be2af84aa81372fec46f5b09b4366.patch | git apply && \ - curl https://github.com/alauda/ovs/commit/8dd4973bba021ce92eb9f42446d6c1c0e3474e25.patch | git apply && \ + curl https://github.com/kubeovn/ovs/commit/df1c802f568be2af84aa81372fec46f5b09b4366.patch | git apply && \ + curl https://github.com/kubeovn/ovs/commit/8dd4973bba021ce92eb9f42446d6c1c0e3474e25.patch | git apply && \ ./boot.sh && \ rm -rf .git && \ @@ -23,10 +23,10 @@ RUN cd /usr/src/ && \ RUN cd /usr/src/ && git clone -b branch-20.12 --depth=1 https://github.com/ovn-org/ovn.git && \ cd ovn && \ - curl https://github.com/alauda/ovn/commit/d8253981485e499979cc47c9453b6be8eebe5f0e.patch | git apply --exclude debian/changelog && \ - curl https://github.com/alauda/ovn/commit/e19ff25f2464e67127c7eb1edef44803aa4a5462.patch | git apply && \ - curl https://github.com/alauda/ovn/commit/289c62e3fcd05901dac4b727aa59f6cba058905f.patch | git apply && \ - curl https://github.com/alauda/ovn/commit/e24734913d25c0bffdf1cfd79e14ef43d01e1019.patch | git apply && \ + curl https://github.com/kubeovn/ovn/commit/d8253981485e499979cc47c9453b6be8eebe5f0e.patch | git apply --exclude debian/changelog && \ + curl https://github.com/kubeovn/ovn/commit/e19ff25f2464e67127c7eb1edef44803aa4a5462.patch | git apply && \ + curl https://github.com/kubeovn/ovn/commit/289c62e3fcd05901dac4b727aa59f6cba058905f.patch | git apply && \ + curl https://github.com/kubeovn/ovn/commit/e24734913d25c0bffdf1cfd79e14ef43d01e1019.patch | git apply && \ sed -i 's/OVN/ovn/g' debian/changelog && \ rm -rf .git && \ ./boot.sh && \ diff --git a/dist/images/build.sh b/dist/images/build.sh index f8a81682a20..76dbd4d7dfd 100644 --- a/dist/images/build.sh +++ b/dist/images/build.sh @@ -14,7 +14,7 @@ cd .. git clone -b branch-2.14 --depth=1 https://github.com/openvswitch/ovs.git cd ovs # change compact interval to reduce resource usage -curl https://github.com/alauda/ovs/commit/df1c802f568be2af84aa81372fec46f5b09b4366.patch | git apply +curl https://github.com/kubeovn/ovs/commit/df1c802f568be2af84aa81372fec46f5b09b4366.patch | git apply sed -i 's/2.14.1/2.14.0/g' configure.ac sed -i 's/sphinx-build-3/sphinx-build/g' rhel/openvswitch-fedora.spec.in ./boot.sh @@ -30,7 +30,7 @@ git clone -b branch-20.06 --depth=1 https://github.com/ovn-org/ovn.git cd ovn # kube-ovn related patches -curl https://github.com/alauda/ovn/commit/f2db72af17f8ad1ea721b1d02e005ed84620fde2.patch | git apply +curl https://github.com/kubeovn/ovn/commit/f2db72af17f8ad1ea721b1d02e005ed84620fde2.patch | git apply sed -i 's/20.06.3/20.06.2/g' configure.ac ./boot.sh diff --git a/hack/update-codegen-docker.sh b/hack/update-codegen-docker.sh index 950c36f8bc2..97dac8b42cb 100644 --- a/hack/update-codegen-docker.sh +++ b/hack/update-codegen-docker.sh @@ -4,7 +4,7 @@ # set GOPROXY you like GOPROXY="https://goproxy.cn" -PROJECT_PACKAGE=github.com/alauda/kube-ovn +PROJECT_PACKAGE=github.com/kubeovn/kube-ovn docker run -it --rm \ -v ${PWD}:/go/src/${PROJECT_PACKAGE}\ -e PROJECT_PACKAGE=${PROJECT_PACKAGE} \ From ac294669c7c7e2a24d2af6910494b6b8d175091b Mon Sep 17 00:00:00 2001 From: Mengxin Liu Date: Mon, 22 Feb 2021 18:14:03 +0800 Subject: [PATCH 2/2] chore: update go version --- .github/workflows/build-arm64-image.yaml | 2 +- .github/workflows/build-x86-image.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-arm64-image.yaml b/.github/workflows/build-arm64-image.yaml index faf0023ecaa..9790c270b55 100644 --- a/.github/workflows/build-arm64-image.yaml +++ b/.github/workflows/build-arm64-image.yaml @@ -20,7 +20,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: ^1.15 + go-version: ^1.16 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/build-x86-image.yaml b/.github/workflows/build-x86-image.yaml index 1bdc542357e..444ffcc51ad 100644 --- a/.github/workflows/build-x86-image.yaml +++ b/.github/workflows/build-x86-image.yaml @@ -21,7 +21,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: ^1.15 + go-version: ^1.16 id: go - name: Check out code into the Go module directory @@ -109,7 +109,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: ^1.15 + go-version: ^1.16 id: go - name: Run E2E