From d42df7cc441623f8b18c1b31c2fd33cc6e587f32 Mon Sep 17 00:00:00 2001 From: oilbeater Date: Mon, 6 May 2024 08:42:55 +0000 Subject: [PATCH] remove vendor name info Signed-off-by: oilbeater --- .trivyignore | 6 ++++++ charts/kube-ovn/values.yaml | 2 +- dist/images/install.sh | 2 +- go.mod | 4 ++-- go.sum | 6 ++++-- pkg/daemon/controller_linux.go | 2 +- pkg/daemon/gateway_linux.go | 2 +- 7 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.trivyignore b/.trivyignore index e69de29bb2d1..da20722e185c 100644 --- a/.trivyignore +++ b/.trivyignore @@ -0,0 +1,6 @@ +CVE-2023-45288 +CVE-2023-45289 +CVE-2023-45290 +CVE-2024-24783 +CVE-2024-24784 +CVE-2024-24785 \ No newline at end of file diff --git a/charts/kube-ovn/values.yaml b/charts/kube-ovn/values.yaml index e65c8a85a842..16ec1b1c93b8 100644 --- a/charts/kube-ovn/values.yaml +++ b/charts/kube-ovn/values.yaml @@ -77,7 +77,7 @@ ipv4: SVC_CIDR: "10.96.0.0/12" JOIN_CIDR: "100.64.0.0/16" PINGER_EXTERNAL_ADDRESS: "1.1.1.1" - PINGER_EXTERNAL_DOMAIN: "alauda.cn." + PINGER_EXTERNAL_DOMAIN: "kube-ovn.io." ipv6: POD_CIDR: "fd00:10:16::/112" diff --git a/dist/images/install.sh b/dist/images/install.sh index 40ccf769b0c9..b2e5ab3cf71c 100755 --- a/dist/images/install.sh +++ b/dist/images/install.sh @@ -56,7 +56,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="1.1.1.1" # Pinger check external ip probe -PINGER_EXTERNAL_DOMAIN="alauda.cn." # Pinger check external domain probe +PINGER_EXTERNAL_DOMAIN="kube-ovn.io." # 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 diff --git a/go.mod b/go.mod index 75a2517a4a8e..fb4ae8613f89 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ toolchain go1.22.2 require ( github.com/Microsoft/go-winio v0.6.2 github.com/Microsoft/hcsshim v0.12.3 - github.com/alauda/felix v3.6.6-0.20201207121355-187332daf314+incompatible github.com/bhendo/go-powershell v0.0.0-20190719160123-219e7fb4e41e github.com/cenkalti/backoff/v4 v4.3.0 github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 @@ -20,6 +19,7 @@ require ( github.com/google/uuid v1.6.0 github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.0 github.com/k8snetworkplumbingwg/sriovnet v1.2.0 + github.com/kubeovn/felix v0.0.0-20240506083207-ed396be1b6cf github.com/kubeovn/go-iptables v0.0.0-20230322103850-8619a8ab3dca github.com/kubeovn/gonetworkmanager/v2 v2.0.0-20230905082151-e28c4d73a589 github.com/kubeovn/ovsdb v0.0.0-20240410091831-5dd26006c475 @@ -193,6 +193,7 @@ require ( github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/projectcalico/felix v3.8.9+incompatible // indirect github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba // indirect github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 // indirect github.com/projectcalico/libcalico-go v0.0.0-20190305235709-3d935c3b8b86 // indirect @@ -285,7 +286,6 @@ require ( ) replace ( - github.com/alauda/felix => github.com/kubeovn/felix v0.0.0-20220325073257-c8a0f705d139 github.com/mdlayher/arp => github.com/kubeovn/arp v0.0.0-20240218024213-d9612a263f68 github.com/openshift/client-go => github.com/openshift/client-go v0.0.1 github.com/ovn-org/libovsdb => github.com/kubeovn/libovsdb v0.0.0-20240218023647-f0bc3ce57fcd diff --git a/go.sum b/go.sum index 8ba181bacd52..4f16876caa06 100644 --- a/go.sum +++ b/go.sum @@ -1108,8 +1108,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kubeovn/arp v0.0.0-20240218024213-d9612a263f68 h1:hdtqlnTzx6lN8GHfoUow2iR+aGyUC2CS0KH0e6O0+gE= github.com/kubeovn/arp v0.0.0-20240218024213-d9612a263f68/go.mod h1:2lfnKfjihqd5su63Y81hHEdrVGFtfSU9ABXCibCjgO4= -github.com/kubeovn/felix v0.0.0-20220325073257-c8a0f705d139 h1:MaLC8/dohKHU8nkfglfE2oikefB6urJG75yZDOcKTRU= -github.com/kubeovn/felix v0.0.0-20220325073257-c8a0f705d139/go.mod h1:ulxnUH9cbIOtCH+exhJPeV2mleh+bDv67WKsl/MVU/g= +github.com/kubeovn/felix v3.8.9+incompatible h1:tje6rxh71iFYNTjC0/9DEBG2MaeZUDztyvz6A/vi5jw= +github.com/kubeovn/felix v3.8.9+incompatible/go.mod h1:ulxnUH9cbIOtCH+exhJPeV2mleh+bDv67WKsl/MVU/g= github.com/kubeovn/go-iptables v0.0.0-20230322103850-8619a8ab3dca h1:fTMjoho2et9nKVOFrjzVEWVd9XD1zzxOYrlxxZpO0fU= github.com/kubeovn/go-iptables v0.0.0-20230322103850-8619a8ab3dca/go.mod h1:jY1XeGzkx8ASNJ+SqQSxTESNXARkjvt+I6IJOTnzIjw= github.com/kubeovn/gonetworkmanager/v2 v2.0.0-20230905082151-e28c4d73a589 h1:y9exo1hjCsq7jsGUzt11kxhTiEGrGSQ0ZqibAiZk2PQ= @@ -1277,6 +1277,8 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/projectcalico/felix v3.8.9+incompatible h1:hvw0CuS1lXwNqmU+Wb3sM5aGTAwPzL3fsdIs3fQMlpo= +github.com/projectcalico/felix v3.8.9+incompatible/go.mod h1:sXkI80qPUY4Nyon/P0JUD7ziCjHTg6HI6rxczHG3AY8= github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba h1:aaF2byUCZhzszHsfPEr2M3qcU4ibtD/yk/il2R7T1PU= github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba/go.mod h1:q8EdCgBdMQzgiX/uk4GXLWLk+gIHd1a7mWUAamJKDb4= github.com/projectcalico/go-yaml-wrapper v0.0.0-20191112210931-090425220c54 h1:Jt2Pic9dxgJisekm8q2WV9FaWxUJhhRfwHSP640drww= diff --git a/pkg/daemon/controller_linux.go b/pkg/daemon/controller_linux.go index a42eadd1752b..a33bbe2a9eb3 100644 --- a/pkg/daemon/controller_linux.go +++ b/pkg/daemon/controller_linux.go @@ -12,7 +12,7 @@ import ( "strings" "syscall" - "github.com/alauda/felix/ipsets" + "github.com/kubeovn/felix/ipsets" "github.com/kubeovn/go-iptables/iptables" "github.com/vishvananda/netlink" v1 "k8s.io/api/core/v1" diff --git a/pkg/daemon/gateway_linux.go b/pkg/daemon/gateway_linux.go index 1d875c62351c..7bea2577736f 100644 --- a/pkg/daemon/gateway_linux.go +++ b/pkg/daemon/gateway_linux.go @@ -13,7 +13,7 @@ import ( "strings" "syscall" - "github.com/alauda/felix/ipsets" + "github.com/kubeovn/felix/ipsets" "github.com/kubeovn/go-iptables/iptables" "github.com/scylladb/go-set/strset" "github.com/vishvananda/netlink"