From 2d64fe67bf60eb9fc782140ba18cfe0400cad200 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 20 Sep 2024 11:18:57 +0800 Subject: [PATCH 1/9] use depguard to prohibitate importing github.com/golang/protobuf --- Makefile | 2 ++ common/config/.golangci.yaml | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Makefile b/Makefile index 806cb2f60..d373fc746 100644 --- a/Makefile +++ b/Makefile @@ -117,6 +117,8 @@ install: $(QUIET) make install -C bpf/deserialization_to_bpf_map $(QUIET) make install -C kernel/ko_src + $(QUIET) go install github.com/OpenPeeDeeP/depguard/cmd/depguard@latest + $(call printlog, INSTALL, $(INSTALL_BIN)/$(APPS1)) $(QUIET) install -Dp -m 0500 $(APPS1) $(INSTALL_BIN) diff --git a/common/config/.golangci.yaml b/common/config/.golangci.yaml index 735c1d228..8ab30bcd7 100644 --- a/common/config/.golangci.yaml +++ b/common/config/.golangci.yaml @@ -31,6 +31,7 @@ linters: - gofmt - goimports - govet + - depguard # linters default enabled by golangci-lint . - errcheck - gosimple @@ -49,6 +50,18 @@ linters-settings: gocyclo: # minimal cyclomatic complexity to report min-complexity: 15 + depguard: + rules: + main: + allow: + - google.golang.org/protobuf + - sigs.k8s.io/yaml + deny: + - pkg: "github.com/golang/protobuf" + desc: "Please use google.golang.org/protobuf instead." + - pkg: 'gopkg.in/yaml.v3' + desc: "Please use sigs.k8s.io/yaml instead." + issues: # List of regexps of issue texts to exclude, empty list by default. # But independently from this option we use default exclude patterns, From 06b86606307c15845e5957fd1a20f4086c3e5c98 Mon Sep 17 00:00:00 2001 From: Adam <100858036+SpongeBob0318@users.noreply.github.com> Date: Fri, 20 Sep 2024 22:06:16 +0800 Subject: [PATCH 2/9] Update .golangci.yaml --- common/config/.golangci.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/config/.golangci.yaml b/common/config/.golangci.yaml index 8ab30bcd7..42148fcc6 100644 --- a/common/config/.golangci.yaml +++ b/common/config/.golangci.yaml @@ -53,9 +53,6 @@ linters-settings: depguard: rules: main: - allow: - - google.golang.org/protobuf - - sigs.k8s.io/yaml deny: - pkg: "github.com/golang/protobuf" desc: "Please use google.golang.org/protobuf instead." From 3f0ef7340572f3f6283efc783b9d3a9caf032aca Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 21 Sep 2024 20:13:57 +0800 Subject: [PATCH 3/9] use depguard to prohibitate importing github.com/golang/protobuf --- Makefile | 2 -- pkg/controller/ads/cache_test.go | 8 ++++---- pkg/controller/ads/convert_filter_test.go | 7 ++++--- pkg/controller/config/config.go | 3 ++- pkg/controller/workload/workload_hash.go | 3 ++- pkg/dns/dns.go | 6 ++++-- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index d373fc746..806cb2f60 100644 --- a/Makefile +++ b/Makefile @@ -117,8 +117,6 @@ install: $(QUIET) make install -C bpf/deserialization_to_bpf_map $(QUIET) make install -C kernel/ko_src - $(QUIET) go install github.com/OpenPeeDeeP/depguard/cmd/depguard@latest - $(call printlog, INSTALL, $(INSTALL_BIN)/$(APPS1)) $(QUIET) install -Dp -m 0500 $(APPS1) $(INSTALL_BIN) diff --git a/pkg/controller/ads/cache_test.go b/pkg/controller/ads/cache_test.go index 10b3c1902..6bc43a71d 100644 --- a/pkg/controller/ads/cache_test.go +++ b/pkg/controller/ads/cache_test.go @@ -26,7 +26,7 @@ import ( filters_network_http "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" filters_network_tcp "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3" pkg_wellknown "github.com/envoyproxy/go-control-plane/pkg/wellknown" - "github.com/golang/protobuf/ptypes/wrappers" + //"github.com/golang/protobuf/ptypes/wrappers" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/durationpb" @@ -429,7 +429,7 @@ func TestCreateApiListenerByLds(t *testing.T) { status := core_v2.ApiStatus_UPDATE typedConfig := &filters_network_tcp.TcpProxy{ StatPrefix: "ut-test", - MaxConnectAttempts: &wrappers.UInt32Value{ + MaxConnectAttempts: &wrapperspb.UInt32Value{ Value: uint32(3), }, ClusterSpecifier: &filters_network_tcp.TcpProxy_Cluster{ @@ -482,7 +482,7 @@ func TestCreateApiListenerByLds(t *testing.T) { status := core_v2.ApiStatus_UPDATE typedConfig := &filters_network_tcp.TcpProxy{ StatPrefix: "ut-test", - MaxConnectAttempts: &wrappers.UInt32Value{ + MaxConnectAttempts: &wrapperspb.UInt32Value{ Value: uint32(3), }, ClusterSpecifier: &filters_network_tcp.TcpProxy_Cluster{ @@ -534,7 +534,7 @@ func TestCreateApiListenerByLds(t *testing.T) { status := core_v2.ApiStatus_UNCHANGED typedConfig := &filters_network_tcp.TcpProxy{ StatPrefix: "ut-test", - MaxConnectAttempts: &wrappers.UInt32Value{ + MaxConnectAttempts: &wrapperspb.UInt32Value{ Value: uint32(3), }, ClusterSpecifier: &filters_network_tcp.TcpProxy_Cluster{ diff --git a/pkg/controller/ads/convert_filter_test.go b/pkg/controller/ads/convert_filter_test.go index de6140e5d..0dc09fe50 100644 --- a/pkg/controller/ads/convert_filter_test.go +++ b/pkg/controller/ads/convert_filter_test.go @@ -20,8 +20,9 @@ import ( "testing" envoy_filters_tcp_proxy "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3" - "github.com/golang/protobuf/ptypes/wrappers" + //"github.com/golang/protobuf/ptypes/wrappers" "github.com/stretchr/testify/require" + "google.golang.org/protobuf/types/known/wrapperspb" "gotest.tools/assert" "kmesh.net/kmesh/api/v2/filter" @@ -31,7 +32,7 @@ func TestNewFilterTcpProxy(t *testing.T) { t.Run("ClusterSpecifier is Cluster", func(t *testing.T) { envoyTcpProxy := &envoy_filters_tcp_proxy.TcpProxy{ StatPrefix: "ut-test", - MaxConnectAttempts: &wrappers.UInt32Value{ + MaxConnectAttempts: &wrapperspb.UInt32Value{ Value: uint32(3), }, ClusterSpecifier: &envoy_filters_tcp_proxy.TcpProxy_Cluster{ @@ -55,7 +56,7 @@ func TestNewFilterTcpProxy(t *testing.T) { } envoyTcpProxy := &envoy_filters_tcp_proxy.TcpProxy{ StatPrefix: "ut-test", - MaxConnectAttempts: &wrappers.UInt32Value{ + MaxConnectAttempts: &wrapperspb.UInt32Value{ Value: uint32(3), }, ClusterSpecifier: &envoy_filters_tcp_proxy.TcpProxy_WeightedClusters{ diff --git a/pkg/controller/config/config.go b/pkg/controller/config/config.go index 466b920cd..c2b3a1fad 100644 --- a/pkg/controller/config/config.go +++ b/pkg/controller/config/config.go @@ -21,7 +21,8 @@ import ( "strings" config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" - structpb "github.com/golang/protobuf/ptypes/struct" + //structpb "github.com/golang/protobuf/ptypes/struct" + "google.golang.org/protobuf/types/known/structpb" "istio.io/istio/pkg/cluster" "istio.io/istio/pkg/model" "istio.io/istio/pkg/util/protomarshal" diff --git a/pkg/controller/workload/workload_hash.go b/pkg/controller/workload/workload_hash.go index 32cf79de5..16613bad4 100644 --- a/pkg/controller/workload/workload_hash.go +++ b/pkg/controller/workload/workload_hash.go @@ -23,7 +23,8 @@ import ( "math" "os" - "gopkg.in/yaml.v3" + //"gopkg.in/yaml.v3" + "sigs.k8s.io/yaml" ) const ( diff --git a/pkg/dns/dns.go b/pkg/dns/dns.go index 6dc17018b..26f297e59 100644 --- a/pkg/dns/dns.go +++ b/pkg/dns/dns.go @@ -28,7 +28,9 @@ import ( clusterv3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" endpointv3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" - "github.com/golang/protobuf/ptypes/wrappers" + //"github.com/golang/protobuf/ptypes/wrappers" + "google.golang.org/protobuf/types/known/wrapperspb" + "github.com/miekg/dns" "k8s.io/client-go/util/workqueue" @@ -100,7 +102,7 @@ func overwriteDnsCluster(cluster *clusterv3.Cluster, domain string, addrs []stri }, }, // TODO: support LoadBalancingWeight - LoadBalancingWeight: &wrappers.UInt32Value{ + LoadBalancingWeight: &wrapperspb.UInt32Value{ Value: 1, }, } From 1517daced4f83dd8e5e224694ec4123b6bc2d430 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 21 Sep 2024 20:26:39 +0800 Subject: [PATCH 4/9] use depguard to prohibitate importing github.com/golang/protobuf --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 806cb2f60..d373fc746 100644 --- a/Makefile +++ b/Makefile @@ -117,6 +117,8 @@ install: $(QUIET) make install -C bpf/deserialization_to_bpf_map $(QUIET) make install -C kernel/ko_src + $(QUIET) go install github.com/OpenPeeDeeP/depguard/cmd/depguard@latest + $(call printlog, INSTALL, $(INSTALL_BIN)/$(APPS1)) $(QUIET) install -Dp -m 0500 $(APPS1) $(INSTALL_BIN) From dee42f09debcc6f4f615cfc2b0c4be74e70191fc Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 21 Sep 2024 21:14:10 +0800 Subject: [PATCH 5/9] use depguard to prohibitate importing github.com/golang/protobuf --- go.mod | 18 +++++++++--------- go.sum | 28 ++++++++++++++-------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index 74f71fbb9..b8905ca12 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,6 @@ require ( github.com/containernetworking/plugins v1.5.1 github.com/envoyproxy/go-control-plane v0.12.1-0.20240621013728-1eb8caab5155 github.com/fsnotify/fsnotify v1.7.0 - github.com/golang/protobuf v1.5.4 github.com/miekg/dns v1.1.62 github.com/prometheus/client_golang v1.20.4 github.com/prometheus/common v0.59.1 @@ -27,7 +26,6 @@ require ( google.golang.org/grpc v1.66.2 google.golang.org/protobuf v1.34.2 gopkg.in/natefinch/lumberjack.v2 v2.2.1 - gopkg.in/yaml.v3 v3.0.1 gotest.tools v2.2.0+incompatible istio.io/api v1.22.1 istio.io/istio v0.0.0-20240618015532-5764a24ec23c @@ -91,6 +89,7 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/cel-go v0.17.8 // indirect github.com/google/gnostic-models v0.6.8 // indirect @@ -204,17 +203,17 @@ require ( go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.26.0 // indirect + golang.org/x/crypto v0.27.0 // indirect golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect - golang.org/x/mod v0.20.0 // indirect - golang.org/x/net v0.28.0 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.29.0 // indirect golang.org/x/oauth2 v0.22.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/term v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/term v0.24.0 // indirect + golang.org/x/text v0.18.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.24.0 // indirect + golang.org/x/tools v0.25.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/api v0.174.0 // indirect google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect @@ -223,6 +222,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect helm.sh/helm/v3 v3.15.1 // indirect istio.io/client-go v1.22.0-alpha.1.0.20240612141229-fd83cdce6c7d // indirect k8s.io/apiextensions-apiserver v0.30.1 // indirect diff --git a/go.sum b/go.sum index 543f96041..670112262 100644 --- a/go.sum +++ b/go.sum @@ -768,8 +768,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= @@ -782,8 +782,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -814,8 +814,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -877,8 +877,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= @@ -886,8 +886,8 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -899,8 +899,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -926,8 +926,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= +golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From b472e9574b316e5a2aceeacb4a9b42a76a5d3440 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 21 Sep 2024 21:29:05 +0800 Subject: [PATCH 6/9] use depguard to prohibitate importing github.com/golang/protobuf --- pkg/controller/ads/cache_test.go | 1 - pkg/dns/dns.go | 1 - 2 files changed, 2 deletions(-) diff --git a/pkg/controller/ads/cache_test.go b/pkg/controller/ads/cache_test.go index 6bc43a71d..2c4df8b23 100644 --- a/pkg/controller/ads/cache_test.go +++ b/pkg/controller/ads/cache_test.go @@ -26,7 +26,6 @@ import ( filters_network_http "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" filters_network_tcp "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3" pkg_wellknown "github.com/envoyproxy/go-control-plane/pkg/wellknown" - //"github.com/golang/protobuf/ptypes/wrappers" "github.com/stretchr/testify/assert" "google.golang.org/protobuf/types/known/anypb" "google.golang.org/protobuf/types/known/durationpb" diff --git a/pkg/dns/dns.go b/pkg/dns/dns.go index 26f297e59..f6cce5a49 100644 --- a/pkg/dns/dns.go +++ b/pkg/dns/dns.go @@ -28,7 +28,6 @@ import ( clusterv3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" endpointv3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" - //"github.com/golang/protobuf/ptypes/wrappers" "google.golang.org/protobuf/types/known/wrapperspb" "github.com/miekg/dns" From d90e2a35d68e69f862fc3963503d037fdb1fa217 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 21 Sep 2024 21:42:00 +0800 Subject: [PATCH 7/9] use depguard to prohibitate importing github.com/golang/protobuf --- common/config/.golangci.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/config/.golangci.yaml b/common/config/.golangci.yaml index 42148fcc6..28ba74414 100644 --- a/common/config/.golangci.yaml +++ b/common/config/.golangci.yaml @@ -58,6 +58,11 @@ linters-settings: desc: "Please use google.golang.org/protobuf instead." - pkg: 'gopkg.in/yaml.v3' desc: "Please use sigs.k8s.io/yaml instead." + - pkg: "gopkg.in/yaml.v2" + desc: "Please use sigs.k8s.io/yaml instead." + - pkg: "github.com/ghodss/yaml" + desc: "Please use sigs.k8s.io/yaml instead." + issues: # List of regexps of issue texts to exclude, empty list by default. From 8e8c2f4ee98a2c4965111b3cae78f3a499e9a8b5 Mon Sep 17 00:00:00 2001 From: Wang Jiabao <100858036+SpongeBob0318@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:58:38 +0800 Subject: [PATCH 8/9] Update workload_hash.go --- pkg/controller/workload/workload_hash.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/controller/workload/workload_hash.go b/pkg/controller/workload/workload_hash.go index 16613bad4..a81fe6271 100644 --- a/pkg/controller/workload/workload_hash.go +++ b/pkg/controller/workload/workload_hash.go @@ -23,7 +23,6 @@ import ( "math" "os" - //"gopkg.in/yaml.v3" "sigs.k8s.io/yaml" ) From da6f62a97345c148d0b68ceec86f789abb609e29 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 26 Sep 2024 13:46:49 +0800 Subject: [PATCH 9/9] make build supports selectively compiling some of the binaries --- Makefile | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f40a0fbec..8a044a159 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,12 @@ APPS2 := mdacore APPS3 := kmesh-cni APPS4 := kmeshctl +APPS := kmesh-daemon mdacore kmesh-cni kmeshctl + +ifeq ($(BINARIES),) + BINARIES := $(APPS) +endif + # If the hub is not explicitly set, use default to kmesh-net. HUB ?= ghcr.io/kmesh-net @@ -79,13 +85,13 @@ all: $(QUIET) make -C api/v2-c $(QUIET) make -C bpf/deserialization_to_bpf_map - + $(QUIET) $(GO) generate bpf/kmesh/bpf2go/bpf2go.go - + $(call printlog, BUILD, $(APPS1)) $(QUIET) (export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(ROOT_DIR)mk; \ $(GO) build -ldflags $(LDFLAGS) -tags $(ENHANCED_KERNEL) -o $(APPS1) $(GOFLAGS) ./daemon/main.go) - + $(call printlog, BUILD, "kernel") $(QUIET) make -C kernel/ko_src @@ -153,6 +159,33 @@ uninstall: build: VERSION=$(VERSION) ./kmesh_compile.sh + # Build kmesh-daemon if included in BINARIES + $(QUIET) ifneq ($(filter kmesh-daemon,$(BINARIES)),) + $(call printlog, BUILD, $(APPS1)) + $(QUIET) (export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(ROOT_DIR)mk; \ + $(GO) build -ldflags $(LDFLAGS) -tags $(ENHANCED_KERNEL) -o $(APPS1) $(GOFLAGS) ./daemon/main.go) + $(QUIET) endif + + # Build mdacore if included in BINARIES + $(QUIET) ifneq ($(filter mdacore,$(BINARIES)),) + $(call printlog, BUILD, $(APPS2)) + $(QUIET) cd oncn-mda && cmake . -B build && make -C build + $(QUIET) endif + + # Build kmesh-cni if included in BINARIES + $(QUIET) ifneq ($(filter kmesh-cni,$(BINARIES)),) + $(call printlog, BUILD, $(APPS3)) + $(QUIET) (export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(ROOT_DIR)mk; \ + $(GO) build -ldflags $(LDFLAGS) -tags $(ENHANCED_KERNEL) -o $(APPS3) $(GOFLAGS) ./cniplugin/main.go) + $(QUIET) endif + + # Build kmeshctl if included in BINARIES + $(QUIET) ifneq ($(filter kmeshctl,$(BINARIES)),) + $(call printlog, BUILD, $(APPS4)) + $(QUIET) (export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(ROOT_DIR)mk; \ + $(GO) build -ldflags $(LDFLAGS) -o $(APPS4) $(GOFLAGS) ./ctl/main.go) + $(QUIET) endif + .PHONY: docker docker: build docker build -f build/docker/dockerfile -t $(HUB)/$(TARGET):$(TAG) .