diff --git a/api/dubbo/v1alpha1/dubbo_authorization_policy.pb.go b/api/dubbo/v1alpha1/dubbo_authorization_policy.pb.go index 1336a1083..277638f72 100644 --- a/api/dubbo/v1alpha1/dubbo_authorization_policy.pb.go +++ b/api/dubbo/v1alpha1/dubbo_authorization_policy.pb.go @@ -12,11 +12,12 @@ package v1alpha1 import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" io "io" - _ "istio.io/gogo-genproto/googleapis/google/api" math "math" math_bits "math/bits" + + proto "github.com/gogo/protobuf/proto" + _ "istio.io/gogo-genproto/googleapis/google/api" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/dubbo/v1alpha1/dubbo_authorization_policy_deepcopy.gen.go b/api/dubbo/v1alpha1/dubbo_authorization_policy_deepcopy.gen.go index 3326b6c10..61d05581b 100644 --- a/api/dubbo/v1alpha1/dubbo_authorization_policy_deepcopy.gen.go +++ b/api/dubbo/v1alpha1/dubbo_authorization_policy_deepcopy.gen.go @@ -12,9 +12,10 @@ package v1alpha1 import ( fmt "fmt" + math "math" + proto "github.com/gogo/protobuf/proto" _ "istio.io/gogo-genproto/googleapis/google/api" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/dubbo/v1alpha1/dubbo_authorization_policy_json.gen.go b/api/dubbo/v1alpha1/dubbo_authorization_policy_json.gen.go index d9cc07409..75cbe3139 100644 --- a/api/dubbo/v1alpha1/dubbo_authorization_policy_json.gen.go +++ b/api/dubbo/v1alpha1/dubbo_authorization_policy_json.gen.go @@ -13,10 +13,11 @@ package v1alpha1 import ( bytes "bytes" fmt "fmt" + math "math" + github_com_gogo_protobuf_jsonpb "github.com/gogo/protobuf/jsonpb" proto "github.com/gogo/protobuf/proto" _ "istio.io/gogo-genproto/googleapis/google/api" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/metaprotocol/v1alpha1/metaprotocol_application_protocol.pb.go b/api/metaprotocol/v1alpha1/metaprotocol_application_protocol.pb.go index ea3a080bc..0871596e4 100644 --- a/api/metaprotocol/v1alpha1/metaprotocol_application_protocol.pb.go +++ b/api/metaprotocol/v1alpha1/metaprotocol_application_protocol.pb.go @@ -22,10 +22,11 @@ package v1alpha1 import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" + + proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/metaprotocol/v1alpha1/metaprotocol_application_protocol_deepcopy.gen.go b/api/metaprotocol/v1alpha1/metaprotocol_application_protocol_deepcopy.gen.go index d5771ec11..f652010b5 100644 --- a/api/metaprotocol/v1alpha1/metaprotocol_application_protocol_deepcopy.gen.go +++ b/api/metaprotocol/v1alpha1/metaprotocol_application_protocol_deepcopy.gen.go @@ -22,8 +22,9 @@ package v1alpha1 import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" math "math" + + proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/metaprotocol/v1alpha1/metaprotocol_application_protocol_json.gen.go b/api/metaprotocol/v1alpha1/metaprotocol_application_protocol_json.gen.go index 67b3568b6..8194afa12 100644 --- a/api/metaprotocol/v1alpha1/metaprotocol_application_protocol_json.gen.go +++ b/api/metaprotocol/v1alpha1/metaprotocol_application_protocol_json.gen.go @@ -23,9 +23,10 @@ package v1alpha1 import ( bytes "bytes" fmt "fmt" + math "math" + github_com_gogo_protobuf_jsonpb "github.com/gogo/protobuf/jsonpb" proto "github.com/gogo/protobuf/proto" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/metaprotocol/v1alpha1/metaprotocol_metarouter.pb.go b/api/metaprotocol/v1alpha1/metaprotocol_metarouter.pb.go index 11d4ef5f2..c760bd876 100644 --- a/api/metaprotocol/v1alpha1/metaprotocol_metarouter.pb.go +++ b/api/metaprotocol/v1alpha1/metaprotocol_metarouter.pb.go @@ -62,12 +62,13 @@ package v1alpha1 import ( encoding_binary "encoding/binary" fmt "fmt" - proto "github.com/gogo/protobuf/proto" - types "github.com/gogo/protobuf/types" io "io" - _ "istio.io/gogo-genproto/googleapis/google/api" math "math" math_bits "math/bits" + + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + _ "istio.io/gogo-genproto/googleapis/google/api" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/metaprotocol/v1alpha1/metaprotocol_metarouter_deepcopy.gen.go b/api/metaprotocol/v1alpha1/metaprotocol_metarouter_deepcopy.gen.go index b32c4ffe2..2a2be7f1a 100644 --- a/api/metaprotocol/v1alpha1/metaprotocol_metarouter_deepcopy.gen.go +++ b/api/metaprotocol/v1alpha1/metaprotocol_metarouter_deepcopy.gen.go @@ -61,10 +61,11 @@ package v1alpha1 import ( fmt "fmt" + math "math" + proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" _ "istio.io/gogo-genproto/googleapis/google/api" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/metaprotocol/v1alpha1/metaprotocol_metarouter_json.gen.go b/api/metaprotocol/v1alpha1/metaprotocol_metarouter_json.gen.go index 2ee17f845..7de8448e7 100644 --- a/api/metaprotocol/v1alpha1/metaprotocol_metarouter_json.gen.go +++ b/api/metaprotocol/v1alpha1/metaprotocol_metarouter_json.gen.go @@ -62,11 +62,12 @@ package v1alpha1 import ( bytes "bytes" fmt "fmt" + math "math" + github_com_gogo_protobuf_jsonpb "github.com/gogo/protobuf/jsonpb" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" _ "istio.io/gogo-genproto/googleapis/google/api" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/redis/v1alpha1/redisdestination.pb.go b/api/redis/v1alpha1/redisdestination.pb.go index 99ec7376d..e587f84b8 100644 --- a/api/redis/v1alpha1/redisdestination.pb.go +++ b/api/redis/v1alpha1/redisdestination.pb.go @@ -7,13 +7,14 @@ package v1alpha1 import ( fmt "fmt" + io "io" + math "math" + math_bits "math/bits" + proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" - io "io" v1alpha3 "istio.io/api/networking/v1alpha3" _ "istio.io/gogo-genproto/googleapis/google/api" - math "math" - math_bits "math/bits" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/redis/v1alpha1/redisdestination_deepcopy.gen.go b/api/redis/v1alpha1/redisdestination_deepcopy.gen.go index 5f9715d26..afc34e4fe 100644 --- a/api/redis/v1alpha1/redisdestination_deepcopy.gen.go +++ b/api/redis/v1alpha1/redisdestination_deepcopy.gen.go @@ -7,11 +7,12 @@ package v1alpha1 import ( fmt "fmt" + math "math" + proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" _ "istio.io/api/networking/v1alpha3" _ "istio.io/gogo-genproto/googleapis/google/api" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/redis/v1alpha1/redisdestination_json.gen.go b/api/redis/v1alpha1/redisdestination_json.gen.go index a1becee88..cf4819927 100644 --- a/api/redis/v1alpha1/redisdestination_json.gen.go +++ b/api/redis/v1alpha1/redisdestination_json.gen.go @@ -8,12 +8,13 @@ package v1alpha1 import ( bytes "bytes" fmt "fmt" + math "math" + github_com_gogo_protobuf_jsonpb "github.com/gogo/protobuf/jsonpb" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" _ "istio.io/api/networking/v1alpha3" _ "istio.io/gogo-genproto/googleapis/google/api" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/redis/v1alpha1/redisservice.pb.go b/api/redis/v1alpha1/redisservice.pb.go index 0646e7a1f..e6cfd12e0 100644 --- a/api/redis/v1alpha1/redisservice.pb.go +++ b/api/redis/v1alpha1/redisservice.pb.go @@ -8,12 +8,13 @@ package v1alpha1 import ( encoding_binary "encoding/binary" fmt "fmt" - proto "github.com/gogo/protobuf/proto" - types "github.com/gogo/protobuf/types" io "io" - _ "istio.io/gogo-genproto/googleapis/google/api" math "math" math_bits "math/bits" + + proto "github.com/gogo/protobuf/proto" + types "github.com/gogo/protobuf/types" + _ "istio.io/gogo-genproto/googleapis/google/api" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/redis/v1alpha1/redisservice_deepcopy.gen.go b/api/redis/v1alpha1/redisservice_deepcopy.gen.go index 7d651537a..c8092c376 100644 --- a/api/redis/v1alpha1/redisservice_deepcopy.gen.go +++ b/api/redis/v1alpha1/redisservice_deepcopy.gen.go @@ -7,10 +7,11 @@ package v1alpha1 import ( fmt "fmt" + math "math" + proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" _ "istio.io/gogo-genproto/googleapis/google/api" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/api/redis/v1alpha1/redisservice_json.gen.go b/api/redis/v1alpha1/redisservice_json.gen.go index 2f605cc73..0e95ecff5 100644 --- a/api/redis/v1alpha1/redisservice_json.gen.go +++ b/api/redis/v1alpha1/redisservice_json.gen.go @@ -8,11 +8,12 @@ package v1alpha1 import ( bytes "bytes" fmt "fmt" + math "math" + github_com_gogo_protobuf_jsonpb "github.com/gogo/protobuf/jsonpb" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" _ "istio.io/gogo-genproto/googleapis/google/api" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/client-go/pkg/apis/dubbo/v1alpha1/types.gen.go b/client-go/pkg/apis/dubbo/v1alpha1/types.gen.go index ee46a5759..fc7697789 100644 --- a/client-go/pkg/apis/dubbo/v1alpha1/types.gen.go +++ b/client-go/pkg/apis/dubbo/v1alpha1/types.gen.go @@ -19,9 +19,10 @@ limitations under the License. package v1alpha1 import ( - dubbov1alpha1 "github.com/aeraki-mesh/aeraki/api/dubbo/v1alpha1" metav1alpha1 "istio.io/api/meta/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + dubbov1alpha1 "github.com/aeraki-mesh/aeraki/api/dubbo/v1alpha1" ) // diff --git a/client-go/pkg/apis/metaprotocol/v1alpha1/types.gen.go b/client-go/pkg/apis/metaprotocol/v1alpha1/types.gen.go index 1377f64f3..a722b8a55 100644 --- a/client-go/pkg/apis/metaprotocol/v1alpha1/types.gen.go +++ b/client-go/pkg/apis/metaprotocol/v1alpha1/types.gen.go @@ -19,9 +19,10 @@ limitations under the License. package v1alpha1 import ( - metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/api/metaprotocol/v1alpha1" metav1alpha1 "istio.io/api/meta/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/api/metaprotocol/v1alpha1" ) // please upgrade the proto package diff --git a/client-go/pkg/apis/redis/v1alpha1/types.gen.go b/client-go/pkg/apis/redis/v1alpha1/types.gen.go index 16ecca6cd..bc954bf02 100644 --- a/client-go/pkg/apis/redis/v1alpha1/types.gen.go +++ b/client-go/pkg/apis/redis/v1alpha1/types.gen.go @@ -19,9 +19,10 @@ limitations under the License. package v1alpha1 import ( - redisv1alpha1 "github.com/aeraki-mesh/aeraki/api/redis/v1alpha1" metav1alpha1 "istio.io/api/meta/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + redisv1alpha1 "github.com/aeraki-mesh/aeraki/api/redis/v1alpha1" ) // diff --git a/client-go/pkg/clientset/versioned/clientset.gen.go b/client-go/pkg/clientset/versioned/clientset.gen.go index 298cc2223..af7605e32 100644 --- a/client-go/pkg/clientset/versioned/clientset.gen.go +++ b/client-go/pkg/clientset/versioned/clientset.gen.go @@ -19,12 +19,13 @@ package versioned import ( "fmt" - dubbov1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1" - metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1" - redisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/redis/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" + + dubbov1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1" + metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1" + redisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/redis/v1alpha1" ) type Interface interface { diff --git a/client-go/pkg/clientset/versioned/fake/clientset_generated.gen.go b/client-go/pkg/clientset/versioned/fake/clientset_generated.gen.go index a8edf9ea2..bb9013316 100644 --- a/client-go/pkg/clientset/versioned/fake/clientset_generated.gen.go +++ b/client-go/pkg/clientset/versioned/fake/clientset_generated.gen.go @@ -17,6 +17,12 @@ package fake import ( + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/discovery" + fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/testing" + clientset "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" dubbov1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1" fakedubbov1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/fake" @@ -24,11 +30,6 @@ import ( fakemetaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake" redisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/redis/v1alpha1" fakeredisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/discovery" - fakediscovery "k8s.io/client-go/discovery/fake" - "k8s.io/client-go/testing" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/client-go/pkg/clientset/versioned/fake/register.gen.go b/client-go/pkg/clientset/versioned/fake/register.gen.go index 6fd414384..18fd15aa0 100644 --- a/client-go/pkg/clientset/versioned/fake/register.gen.go +++ b/client-go/pkg/clientset/versioned/fake/register.gen.go @@ -17,14 +17,15 @@ package fake import ( - dubbov1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" - metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" - redisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + + dubbov1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" + metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" + redisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/client-go/pkg/clientset/versioned/scheme/register.gen.go b/client-go/pkg/clientset/versioned/scheme/register.gen.go index 73556442c..e2eaa932a 100644 --- a/client-go/pkg/clientset/versioned/scheme/register.gen.go +++ b/client-go/pkg/clientset/versioned/scheme/register.gen.go @@ -17,14 +17,15 @@ package scheme import ( - dubbov1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" - metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" - redisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + + dubbov1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" + metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" + redisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/dubbo_client.gen.go b/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/dubbo_client.gen.go index d3f63b914..28de252e3 100644 --- a/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/dubbo_client.gen.go +++ b/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/dubbo_client.gen.go @@ -17,9 +17,10 @@ package v1alpha1 import ( + rest "k8s.io/client-go/rest" + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" - rest "k8s.io/client-go/rest" ) type DubboV1alpha1Interface interface { diff --git a/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/dubboauthorizationpolicy.gen.go b/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/dubboauthorizationpolicy.gen.go index a07deb2ba..b66acc205 100644 --- a/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/dubboauthorizationpolicy.gen.go +++ b/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/dubboauthorizationpolicy.gen.go @@ -20,12 +20,13 @@ import ( "context" "time" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" - scheme "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" + scheme "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" ) // DubboAuthorizationPoliciesGetter has a method to return a DubboAuthorizationPolicyInterface. diff --git a/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/fake/fake_dubbo_client.gen.go b/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/fake/fake_dubbo_client.gen.go index 4d1b286b5..c29d517f1 100644 --- a/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/fake/fake_dubbo_client.gen.go +++ b/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/fake/fake_dubbo_client.gen.go @@ -17,9 +17,10 @@ package fake import ( - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1" ) type FakeDubboV1alpha1 struct { diff --git a/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/fake/fake_dubboauthorizationpolicy.gen.go b/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/fake/fake_dubboauthorizationpolicy.gen.go index 61b34adaa..3cfc7a627 100644 --- a/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/fake/fake_dubboauthorizationpolicy.gen.go +++ b/client-go/pkg/clientset/versioned/typed/dubbo/v1alpha1/fake/fake_dubboauthorizationpolicy.gen.go @@ -19,13 +19,14 @@ package fake import ( "context" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" ) // FakeDubboAuthorizationPolicies implements DubboAuthorizationPolicyInterface diff --git a/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/applicationprotocol.gen.go b/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/applicationprotocol.gen.go index 006548690..26d549c51 100644 --- a/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/applicationprotocol.gen.go +++ b/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/applicationprotocol.gen.go @@ -20,12 +20,13 @@ import ( "context" "time" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" - scheme "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" + scheme "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" ) // ApplicationProtocolsGetter has a method to return a ApplicationProtocolInterface. diff --git a/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake/fake_applicationprotocol.gen.go b/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake/fake_applicationprotocol.gen.go index 14f68601e..2ce95bf27 100644 --- a/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake/fake_applicationprotocol.gen.go +++ b/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake/fake_applicationprotocol.gen.go @@ -19,13 +19,14 @@ package fake import ( "context" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" ) // FakeApplicationProtocols implements ApplicationProtocolInterface diff --git a/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake/fake_metaprotocol_client.gen.go b/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake/fake_metaprotocol_client.gen.go index d4e3d9c23..b960007d2 100644 --- a/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake/fake_metaprotocol_client.gen.go +++ b/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake/fake_metaprotocol_client.gen.go @@ -17,9 +17,10 @@ package fake import ( - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1" ) type FakeMetaprotocolV1alpha1 struct { diff --git a/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake/fake_metarouter.gen.go b/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake/fake_metarouter.gen.go index 1cbcd5c6d..9901b28a4 100644 --- a/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake/fake_metarouter.gen.go +++ b/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/fake/fake_metarouter.gen.go @@ -19,13 +19,14 @@ package fake import ( "context" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" ) // FakeMetaRouters implements MetaRouterInterface diff --git a/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/metaprotocol_client.gen.go b/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/metaprotocol_client.gen.go index 57624b5f1..4608085f8 100644 --- a/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/metaprotocol_client.gen.go +++ b/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/metaprotocol_client.gen.go @@ -17,9 +17,10 @@ package v1alpha1 import ( + rest "k8s.io/client-go/rest" + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" - rest "k8s.io/client-go/rest" ) type MetaprotocolV1alpha1Interface interface { diff --git a/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/metarouter.gen.go b/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/metarouter.gen.go index 638fb1477..1d5446a56 100644 --- a/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/metarouter.gen.go +++ b/client-go/pkg/clientset/versioned/typed/metaprotocol/v1alpha1/metarouter.gen.go @@ -20,12 +20,13 @@ import ( "context" "time" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" - scheme "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" + scheme "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" ) // MetaRoutersGetter has a method to return a MetaRouterInterface. diff --git a/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake/fake_redis_client.gen.go b/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake/fake_redis_client.gen.go index f31332b3f..f112fd785 100644 --- a/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake/fake_redis_client.gen.go +++ b/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake/fake_redis_client.gen.go @@ -17,9 +17,10 @@ package fake import ( - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/redis/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/typed/redis/v1alpha1" ) type FakeRedisV1alpha1 struct { diff --git a/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake/fake_redisdestination.gen.go b/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake/fake_redisdestination.gen.go index 1e7f977c2..6457d0a10 100644 --- a/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake/fake_redisdestination.gen.go +++ b/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake/fake_redisdestination.gen.go @@ -19,13 +19,14 @@ package fake import ( "context" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" ) // FakeRedisDestinations implements RedisDestinationInterface diff --git a/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake/fake_redisservice.gen.go b/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake/fake_redisservice.gen.go index c3a2bbc6c..10e6b095b 100644 --- a/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake/fake_redisservice.gen.go +++ b/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/fake/fake_redisservice.gen.go @@ -19,13 +19,14 @@ package fake import ( "context" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" ) // FakeRedisServices implements RedisServiceInterface diff --git a/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/redis_client.gen.go b/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/redis_client.gen.go index a9048da6f..93d996562 100644 --- a/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/redis_client.gen.go +++ b/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/redis_client.gen.go @@ -17,9 +17,10 @@ package v1alpha1 import ( + rest "k8s.io/client-go/rest" + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" - rest "k8s.io/client-go/rest" ) type RedisV1alpha1Interface interface { diff --git a/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/redisdestination.gen.go b/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/redisdestination.gen.go index 99a9ae575..d22e5b677 100644 --- a/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/redisdestination.gen.go +++ b/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/redisdestination.gen.go @@ -20,12 +20,13 @@ import ( "context" "time" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" - scheme "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" + scheme "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" ) // RedisDestinationsGetter has a method to return a RedisDestinationInterface. diff --git a/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/redisservice.gen.go b/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/redisservice.gen.go index ca98def94..01d220277 100644 --- a/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/redisservice.gen.go +++ b/client-go/pkg/clientset/versioned/typed/redis/v1alpha1/redisservice.gen.go @@ -20,12 +20,13 @@ import ( "context" "time" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" - scheme "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" + scheme "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" ) // RedisServicesGetter has a method to return a RedisServiceInterface. diff --git a/client-go/pkg/informers/externalversions/dubbo/v1alpha1/dubboauthorizationpolicy.gen.go b/client-go/pkg/informers/externalversions/dubbo/v1alpha1/dubboauthorizationpolicy.gen.go index abd733fc0..0d0b89c7e 100644 --- a/client-go/pkg/informers/externalversions/dubbo/v1alpha1/dubboauthorizationpolicy.gen.go +++ b/client-go/pkg/informers/externalversions/dubbo/v1alpha1/dubboauthorizationpolicy.gen.go @@ -20,14 +20,15 @@ import ( "context" time "time" - dubbov1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" - versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" - internalinterfaces "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/listers/dubbo/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + dubbov1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" + versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" + internalinterfaces "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/listers/dubbo/v1alpha1" ) // DubboAuthorizationPolicyInformer provides access to a shared informer and lister for diff --git a/client-go/pkg/informers/externalversions/factory.gen.go b/client-go/pkg/informers/externalversions/factory.gen.go index 123e4e72a..6674257bc 100644 --- a/client-go/pkg/informers/externalversions/factory.gen.go +++ b/client-go/pkg/informers/externalversions/factory.gen.go @@ -21,15 +21,16 @@ import ( sync "sync" time "time" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + schema "k8s.io/apimachinery/pkg/runtime/schema" + cache "k8s.io/client-go/tools/cache" + versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" dubbo "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/dubbo" internalinterfaces "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/internalinterfaces" metaprotocol "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/metaprotocol" redis "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/redis" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - schema "k8s.io/apimachinery/pkg/runtime/schema" - cache "k8s.io/client-go/tools/cache" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/client-go/pkg/informers/externalversions/generic.gen.go b/client-go/pkg/informers/externalversions/generic.gen.go index 58e34dfcd..4335fbfdc 100644 --- a/client-go/pkg/informers/externalversions/generic.gen.go +++ b/client-go/pkg/informers/externalversions/generic.gen.go @@ -19,11 +19,12 @@ package externalversions import ( "fmt" + schema "k8s.io/apimachinery/pkg/runtime/schema" + cache "k8s.io/client-go/tools/cache" + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" redisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" - schema "k8s.io/apimachinery/pkg/runtime/schema" - cache "k8s.io/client-go/tools/cache" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/client-go/pkg/informers/externalversions/internalinterfaces/factory_interfaces.gen.go b/client-go/pkg/informers/externalversions/internalinterfaces/factory_interfaces.gen.go index 2de7462d3..8ce17363f 100644 --- a/client-go/pkg/informers/externalversions/internalinterfaces/factory_interfaces.gen.go +++ b/client-go/pkg/informers/externalversions/internalinterfaces/factory_interfaces.gen.go @@ -19,10 +19,11 @@ package internalinterfaces import ( time "time" - versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" + + versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/client-go/pkg/informers/externalversions/metaprotocol/v1alpha1/applicationprotocol.gen.go b/client-go/pkg/informers/externalversions/metaprotocol/v1alpha1/applicationprotocol.gen.go index dfb5de6b5..b1fda7e08 100644 --- a/client-go/pkg/informers/externalversions/metaprotocol/v1alpha1/applicationprotocol.gen.go +++ b/client-go/pkg/informers/externalversions/metaprotocol/v1alpha1/applicationprotocol.gen.go @@ -20,14 +20,15 @@ import ( "context" time "time" - metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" - versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" - internalinterfaces "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/listers/metaprotocol/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" + versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" + internalinterfaces "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/listers/metaprotocol/v1alpha1" ) // ApplicationProtocolInformer provides access to a shared informer and lister for diff --git a/client-go/pkg/informers/externalversions/metaprotocol/v1alpha1/metarouter.gen.go b/client-go/pkg/informers/externalversions/metaprotocol/v1alpha1/metarouter.gen.go index 71ed437cd..f7a2bd0b2 100644 --- a/client-go/pkg/informers/externalversions/metaprotocol/v1alpha1/metarouter.gen.go +++ b/client-go/pkg/informers/externalversions/metaprotocol/v1alpha1/metarouter.gen.go @@ -20,14 +20,15 @@ import ( "context" time "time" - metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" - versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" - internalinterfaces "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/listers/metaprotocol/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + metaprotocolv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" + versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" + internalinterfaces "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/listers/metaprotocol/v1alpha1" ) // MetaRouterInformer provides access to a shared informer and lister for diff --git a/client-go/pkg/informers/externalversions/redis/v1alpha1/redisdestination.gen.go b/client-go/pkg/informers/externalversions/redis/v1alpha1/redisdestination.gen.go index 1370aafce..63037c6b3 100644 --- a/client-go/pkg/informers/externalversions/redis/v1alpha1/redisdestination.gen.go +++ b/client-go/pkg/informers/externalversions/redis/v1alpha1/redisdestination.gen.go @@ -20,14 +20,15 @@ import ( "context" time "time" - redisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" - versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" - internalinterfaces "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/listers/redis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + redisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" + versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" + internalinterfaces "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/listers/redis/v1alpha1" ) // RedisDestinationInformer provides access to a shared informer and lister for diff --git a/client-go/pkg/informers/externalversions/redis/v1alpha1/redisservice.gen.go b/client-go/pkg/informers/externalversions/redis/v1alpha1/redisservice.gen.go index 82c3c0306..ac97e631e 100644 --- a/client-go/pkg/informers/externalversions/redis/v1alpha1/redisservice.gen.go +++ b/client-go/pkg/informers/externalversions/redis/v1alpha1/redisservice.gen.go @@ -20,14 +20,15 @@ import ( "context" time "time" - redisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" - versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" - internalinterfaces "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/listers/redis/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + + redisv1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" + versioned "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned" + internalinterfaces "github.com/aeraki-mesh/aeraki/client-go/pkg/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/listers/redis/v1alpha1" ) // RedisServiceInformer provides access to a shared informer and lister for diff --git a/client-go/pkg/listers/dubbo/v1alpha1/dubboauthorizationpolicy.gen.go b/client-go/pkg/listers/dubbo/v1alpha1/dubboauthorizationpolicy.gen.go index ae2b54bcf..e3e54b61b 100644 --- a/client-go/pkg/listers/dubbo/v1alpha1/dubboauthorizationpolicy.gen.go +++ b/client-go/pkg/listers/dubbo/v1alpha1/dubboauthorizationpolicy.gen.go @@ -17,10 +17,11 @@ package v1alpha1 import ( - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/dubbo/v1alpha1" ) // DubboAuthorizationPolicyLister helps list DubboAuthorizationPolicies. diff --git a/client-go/pkg/listers/metaprotocol/v1alpha1/applicationprotocol.gen.go b/client-go/pkg/listers/metaprotocol/v1alpha1/applicationprotocol.gen.go index 4a54a0e30..f3e448cc5 100644 --- a/client-go/pkg/listers/metaprotocol/v1alpha1/applicationprotocol.gen.go +++ b/client-go/pkg/listers/metaprotocol/v1alpha1/applicationprotocol.gen.go @@ -17,10 +17,11 @@ package v1alpha1 import ( - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" ) // ApplicationProtocolLister helps list ApplicationProtocols. diff --git a/client-go/pkg/listers/metaprotocol/v1alpha1/metarouter.gen.go b/client-go/pkg/listers/metaprotocol/v1alpha1/metarouter.gen.go index f5cac1ec7..0804d3867 100644 --- a/client-go/pkg/listers/metaprotocol/v1alpha1/metarouter.gen.go +++ b/client-go/pkg/listers/metaprotocol/v1alpha1/metarouter.gen.go @@ -17,10 +17,11 @@ package v1alpha1 import ( - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" ) // MetaRouterLister helps list MetaRouters. diff --git a/client-go/pkg/listers/redis/v1alpha1/redisdestination.gen.go b/client-go/pkg/listers/redis/v1alpha1/redisdestination.gen.go index 6f6a07abc..bec6ce901 100644 --- a/client-go/pkg/listers/redis/v1alpha1/redisdestination.gen.go +++ b/client-go/pkg/listers/redis/v1alpha1/redisdestination.gen.go @@ -17,10 +17,11 @@ package v1alpha1 import ( - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" ) // RedisDestinationLister helps list RedisDestinations. diff --git a/client-go/pkg/listers/redis/v1alpha1/redisservice.gen.go b/client-go/pkg/listers/redis/v1alpha1/redisservice.gen.go index 1090672ba..e2bb1bc17 100644 --- a/client-go/pkg/listers/redis/v1alpha1/redisservice.gen.go +++ b/client-go/pkg/listers/redis/v1alpha1/redisservice.gen.go @@ -17,10 +17,11 @@ package v1alpha1 import ( - v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + + v1alpha1 "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/redis/v1alpha1" ) // RedisServiceLister helps list RedisServices. diff --git a/demo/install-demo.sh b/demo/install-demo.sh index f36e6d707..188cc1b45 100755 --- a/demo/install-demo.sh +++ b/demo/install-demo.sh @@ -21,7 +21,7 @@ DEMO=$1 SCRIPTS_DIR=$BASEDIR/test/e2e/scripts COMMON_DIR=$BASEDIR/test/e2e/common export ISTIO_VERSION=1.12.7 -export AERAKI_TAG=1.1.2 +export AERAKI_TAG=1.1.3 bash ${SCRIPTS_DIR}/istio.sh -y -f ${COMMON_DIR}/istio-config.yaml bash ${SCRIPTS_DIR}/aeraki.sh diff --git a/demo/metaprotocol-brpc/brpc-sample.yaml b/demo/metaprotocol-brpc/brpc-sample.yaml index 3bd09f5be..816fab5a6 100644 --- a/demo/metaprotocol-brpc/brpc-sample.yaml +++ b/demo/metaprotocol-brpc/brpc-sample.yaml @@ -28,7 +28,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.3 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 labels: app: brpc-echo-server version: v1 @@ -57,7 +57,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.3 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 labels: app: brpc-echo-server version: v2 @@ -86,7 +86,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.3 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 labels: app: brpc-echo-client spec: diff --git a/demo/metaprotocol-dubbo/dubbo-sample.yaml b/demo/metaprotocol-dubbo/dubbo-sample.yaml index a6e7c61f3..c29209923 100644 --- a/demo/metaprotocol-dubbo/dubbo-sample.yaml +++ b/demo/metaprotocol-dubbo/dubbo-sample.yaml @@ -28,7 +28,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-test-debug + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 labels: app: dubbo-sample-provider version: v1 @@ -55,7 +55,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-test-debug + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 labels: app: dubbo-sample-provider version: v2 @@ -82,7 +82,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-test-debug + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 labels: app: dubbo-sample-second-provider version: v2 @@ -109,7 +109,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-test-debug + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 labels: app: dubbo-sample-consumer spec: diff --git a/demo/metaprotocol-thrift/outlier-detection/outlier-detection.yaml b/demo/metaprotocol-thrift/outlier-detection/outlier-detection.yaml index 614025999..0e8b11374 100644 --- a/demo/metaprotocol-thrift/outlier-detection/outlier-detection.yaml +++ b/demo/metaprotocol-thrift/outlier-detection/outlier-detection.yaml @@ -29,7 +29,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.3 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 sidecar.istio.io/rewriteAppHTTPProbers: "false" labels: app: thrift-sample-server diff --git a/demo/metaprotocol-thrift/thrift-sample.yaml b/demo/metaprotocol-thrift/thrift-sample.yaml index 0389695fe..88caa35c7 100644 --- a/demo/metaprotocol-thrift/thrift-sample.yaml +++ b/demo/metaprotocol-thrift/thrift-sample.yaml @@ -28,7 +28,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.3 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 sidecar.istio.io/rewriteAppHTTPProbers: "false" labels: app: thrift-sample-server @@ -55,7 +55,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.3 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 sidecar.istio.io/rewriteAppHTTPProbers: "false" labels: app: thrift-sample-server @@ -82,7 +82,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.3 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 sidecar.istio.io/rewriteAppHTTPProbers: "false" labels: app: thrift-sample-client diff --git a/pkg/bootstrap/mesh_config.go b/pkg/bootstrap/mesh_config.go new file mode 100644 index 000000000..78091757e --- /dev/null +++ b/pkg/bootstrap/mesh_config.go @@ -0,0 +1,36 @@ +// Copyright Aeraki Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package bootstrap + +import ( + "istio.io/istio/pkg/config/mesh/kubemesh" +) + +const ( + // defaultMeshConfigMapName is the default name of the ConfigMap with the mesh config + // The actual name can be different - use getMeshConfigMapName + defaultMeshConfigMapName = "istio" + // configMapKey should match the expected MeshConfig file name + configMapKey = "mesh" +) + +// initSSecureWebhookServer handles initialization for the HTTPS webhook server. +func (s *Server) initConfigMapWatcher(args *AerakiArgs, handler func()) { + // Watch the istio ConfigMap for mesh config changes. + // This may be necessary for external Istiod. + s.configMapWatcher = kubemesh.NewConfigMapWatcher( + s.kubeClient, args.RootNamespace, defaultMeshConfigMapName, configMapKey, false, s.internalStop) + s.configMapWatcher.AddMeshHandler(handler) +} diff --git a/pkg/bootstrap/server.go b/pkg/bootstrap/server.go index 991f3fb79..a4a390be3 100644 --- a/pkg/bootstrap/server.go +++ b/pkg/bootstrap/server.go @@ -24,16 +24,15 @@ import ( "net/http" "sync" - "github.com/aeraki-mesh/aeraki/pkg/leaderelection" + "istio.io/istio/pkg/config/mesh" - aerakischeme "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" - "github.com/aeraki-mesh/aeraki/pkg/controller/istio" - "github.com/aeraki-mesh/aeraki/pkg/controller/kube" + "github.com/aeraki-mesh/aeraki/pkg/leaderelection" istioscheme "istio.io/client-go/pkg/apis/networking/v1alpha3" "istio.io/client-go/pkg/clientset/versioned" "istio.io/istio/pilot/pkg/model" istioconfig "istio.io/istio/pkg/config" + kubelib "istio.io/istio/pkg/kube" "istio.io/pkg/log" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" @@ -42,6 +41,10 @@ import ( kubeconfig "sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/controller-runtime/pkg/manager" + aerakischeme "github.com/aeraki-mesh/aeraki/client-go/pkg/clientset/versioned/scheme" + "github.com/aeraki-mesh/aeraki/pkg/controller/istio" + "github.com/aeraki-mesh/aeraki/pkg/controller/kube" + "github.com/aeraki-mesh/aeraki/pkg/envoyfilter" "github.com/aeraki-mesh/aeraki/pkg/model/protocol" "github.com/aeraki-mesh/aeraki/pkg/xds" @@ -56,7 +59,7 @@ var ( // Server contains the runtime configuration for the Aeraki service. type Server struct { args *AerakiArgs - kubeClient kubernetes.Interface + kubeClient kubelib.Client configController *istio.Controller envoyFilterController *envoyfilter.Controller xdsCacheMgr *xds.CacheMgr @@ -71,6 +74,13 @@ type Server struct { istiodCert *tls.Certificate CABundle *bytes.Buffer stopControllers func() + + // internalStop is closed when the server is shutdown. This should be avoided as much as possible, in + // favor of AddStartFunc. This is only required if we *must* start something outside of this process. + // For example, everything depends on mesh config, so we use it there rather than trying to sequence everything + // in AddStartFunc + internalStop chan struct{} + configMapWatcher mesh.Watcher } // NewServer creates a new Server instance based on the provided arguments. @@ -136,8 +146,8 @@ func NewServer(args *AerakiArgs) (*Server, error) { singletonCtrlMgr: singletonCtrlMgr, xdsCacheMgr: routeCacheMgr, xdsServer: xdsServer, + internalStop: make(chan struct{}), } - if err := server.initKubeClient(); err != nil { return nil, fmt.Errorf("error initializing kube client: %v", err) } @@ -150,6 +160,10 @@ func NewServer(args *AerakiArgs) (*Server, error) { if err := server.initConfigValidation(args); err != nil { return nil, fmt.Errorf("error initializing config validator: %v", err) } + server.initConfigMapWatcher(args, func() { + envoyFilterController.ConfigUpdated(model.EventUpdate) + }) + envoyFilterController.InitMeshConfig(server.configMapWatcher) return server, err } @@ -305,6 +319,7 @@ func isUnexpectedListenerError(err error) bool { func (s *Server) waitForShutdown(stop <-chan struct{}) { go func() { <-stop + close(s.internalStop) s.stopControllers() }() } @@ -314,7 +329,7 @@ func (s *Server) initKubeClient() error { if err != nil { return err } - s.kubeClient, err = kubernetes.NewForConfig(kubeConfig) + s.kubeClient, err = kubelib.NewClient(kubelib.NewClientConfigForRestConfig(kubeConfig)) return err } diff --git a/pkg/envoyfilter/controller.go b/pkg/envoyfilter/controller.go index 1451ac7b0..f58e71365 100644 --- a/pkg/envoyfilter/controller.go +++ b/pkg/envoyfilter/controller.go @@ -19,21 +19,22 @@ import ( "fmt" "time" + istioclient "istio.io/client-go/pkg/clientset/versioned" + "istio.io/istio/pkg/config" "github.com/aeraki-mesh/aeraki/pkg/config/constants" "github.com/gogo/protobuf/proto" - "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/zhaohuabing/debounce" networking "istio.io/api/networking/v1alpha3" "istio.io/client-go/pkg/apis/networking/v1alpha3" - istioclient "istio.io/client-go/pkg/clientset/versioned" istiomodel "istio.io/istio/pilot/pkg/model" + "istio.io/istio/pkg/config/mesh" "istio.io/istio/pkg/config/schema/collections" "istio.io/pkg/log" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/controller-runtime/pkg/client" metaprotocol "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" "github.com/aeraki-mesh/aeraki/pkg/model" @@ -64,6 +65,7 @@ type Controller struct { namespaceScoped bool // Sending on this channel results in a push. pushChannel chan istiomodel.Event + meshConfig mesh.Holder } // NewController creates a new controller instance based on the provided arguments. @@ -79,6 +81,11 @@ func NewController(istioClientset *istioclient.Clientset, store istiomodel.Confi return controller } +// InitMeshConfig global mesh configuration +func (c *Controller) InitMeshConfig(meshConfig mesh.Holder) { + c.meshConfig = meshConfig +} + // Run until a signal is received, this function won't block func (c *Controller) Run(stop <-chan struct{}) { go func() { @@ -280,6 +287,7 @@ func (c *Controller) envoyFilterContext(service *networking.ServiceEntry, return nil, fmt.Errorf("failed in finding the related meta router : %s: %v", service.Hosts[0], err) } return &model.EnvoyFilterContext{ + MeshConfig: c.meshConfig, ServiceEntry: &model.ServiceEntryWrapper{ Meta: serviceEntry.Meta, Spec: service, diff --git a/pkg/model/config.go b/pkg/model/config.go index 7728bdeef..edc80ab9b 100644 --- a/pkg/model/config.go +++ b/pkg/model/config.go @@ -17,6 +17,7 @@ package model import ( networking "istio.io/api/networking/v1alpha3" istioconfig "istio.io/istio/pkg/config" + "istio.io/istio/pkg/config/mesh" metaprotocol "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" ) @@ -52,6 +53,9 @@ type EnvoyFilterWrapper struct { // EnvoyFilterContext provides an aggregate API for EnvoyFilter generator type EnvoyFilterContext struct { + // Global Mesh config + MeshConfig mesh.Holder + // ServiceEntry describes the service for which we need to generate the EnvoyFilter. ServiceEntry *ServiceEntryWrapper diff --git a/pkg/xds/cache_mgr.go b/pkg/xds/cache_mgr.go index ac99603c2..262840268 100644 --- a/pkg/xds/cache_mgr.go +++ b/pkg/xds/cache_mgr.go @@ -35,10 +35,11 @@ import ( "github.com/aeraki-mesh/aeraki/pkg/model" - metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/config/route/v1alpha" cachev3 "github.com/envoyproxy/go-control-plane/pkg/cache/v3" networking "istio.io/api/networking/v1alpha3" + metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/config/route/v1alpha" + "github.com/zhaohuabing/debounce" istiomodel "istio.io/istio/pilot/pkg/model" "istio.io/istio/pkg/config/schema/collections" diff --git a/pkg/xds/utils.go b/pkg/xds/utils.go index e41cc6979..0a43e9549 100644 --- a/pkg/xds/utils.go +++ b/pkg/xds/utils.go @@ -27,10 +27,11 @@ import ( userapi "github.com/aeraki-mesh/aeraki/api/metaprotocol/v1alpha1" - metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/config/route/v1alpha" httproute "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" "github.com/envoyproxy/go-control-plane/pkg/cache/types" "github.com/envoyproxy/go-control-plane/pkg/cache/v3" + + metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/config/route/v1alpha" ) var regexEngine = &matcher.RegexMatcher_GoogleRe2{GoogleRe2: &matcher.RegexMatcher_GoogleRE2{}} diff --git a/plugin/metaprotocol/filters.go b/plugin/metaprotocol/filters.go index 399d844de..7768b548f 100644 --- a/plugin/metaprotocol/filters.go +++ b/plugin/metaprotocol/filters.go @@ -17,10 +17,6 @@ package metaprotocol import ( "fmt" - metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/config/route/v1alpha" - grldpl "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/filters/global_ratelimit/v1alpha" - lrldpl "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/filters/local_ratelimit/v1alpha" - mpdataplane "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/v1alpha" envoycore "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoyrl "github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v3" commondataplane "github.com/envoyproxy/go-control-plane/envoy/type/v3" @@ -28,6 +24,11 @@ import ( "github.com/golang/protobuf/ptypes/wrappers" "google.golang.org/protobuf/types/known/anypb" + metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/config/route/v1alpha" + grldpl "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/filters/global_ratelimit/v1alpha" + lrldpl "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/filters/local_ratelimit/v1alpha" + mpdataplane "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/v1alpha" + userapi "github.com/aeraki-mesh/aeraki/api/metaprotocol/v1alpha1" mpclient "github.com/aeraki-mesh/aeraki/client-go/pkg/apis/metaprotocol/v1alpha1" "github.com/aeraki-mesh/aeraki/pkg/xds" diff --git a/plugin/metaprotocol/metaprotocolproxy.go b/plugin/metaprotocol/metaprotocolproxy.go index c4e6cbb23..4e28d771c 100644 --- a/plugin/metaprotocol/metaprotocolproxy.go +++ b/plugin/metaprotocol/metaprotocolproxy.go @@ -15,11 +15,14 @@ package metaprotocol import ( - metaprotocol "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/v1alpha" + "fmt" + envoyconfig "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoytype "github.com/envoyproxy/go-control-plane/envoy/type/v3" istionetworking "istio.io/api/networking/v1alpha3" + metaprotocol "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/v1alpha" + "github.com/aeraki-mesh/aeraki/pkg/model" metaprotocolmodel "github.com/aeraki-mesh/aeraki/pkg/model/metaprotocol" ) @@ -34,7 +37,7 @@ func buildOutboundProxy(context *model.EnvoyFilterContext, if err != nil { return nil, err } - return &metaprotocol.MetaProtocolProxy{ + metaProtocolProy := &metaprotocol.MetaProtocolProxy{ StatPrefix: model.BuildClusterName(model.TrafficDirectionOutbound, "", context.ServiceEntry.Spec.Hosts[0], int(port.Number)), RouteSpecifier: &metaprotocol.MetaProtocolProxy_Rds{ @@ -66,18 +69,9 @@ func buildOutboundProxy(context *model.EnvoyFilterContext, Name: codec, }, MetaProtocolFilters: buildOutboundFilters(), - Tracing: &metaprotocol.Tracing{ - ClientSampling: &envoytype.Percent{ - Value: 100, - }, - RandomSampling: &envoytype.Percent{ - Value: 100, - }, - OverallSampling: &envoytype.Percent{ - Value: 100, - }, - }, - }, nil + } + configTracing(context, metaProtocolProy) + return metaProtocolProy, nil } func buildInboundProxy(context *model.EnvoyFilterContext, @@ -98,7 +92,7 @@ func buildInboundProxy(context *model.EnvoyFilterContext, return nil, err } - return &metaprotocol.MetaProtocolProxy{ + metaProtocolProy := &metaprotocol.MetaProtocolProxy{ StatPrefix: model.BuildClusterName(model.TrafficDirectionInbound, "", context.ServiceEntry.Spec.Hosts[0], int(port.Number)), RouteSpecifier: &metaprotocol.MetaProtocolProxy_RouteConfig{ @@ -109,16 +103,28 @@ func buildInboundProxy(context *model.EnvoyFilterContext, Name: codec, }, MetaProtocolFilters: filters, - Tracing: &metaprotocol.Tracing{ + } + configTracing(context, metaProtocolProy) + return metaProtocolProy, nil +} + +func configTracing(context *model.EnvoyFilterContext, metaProtocolProy *metaprotocol.MetaProtocolProxy) { + if context.MeshConfig.Mesh().EnableTracing { + randomSampling := 1.0 + fmt.Printf("%v", context.MeshConfig.Mesh().DefaultConfig.Tracing) + if context.MeshConfig.Mesh().DefaultConfig.Tracing != nil { + randomSampling = context.MeshConfig.Mesh().DefaultConfig.Tracing.Sampling + } + metaProtocolProy.Tracing = &metaprotocol.Tracing{ ClientSampling: &envoytype.Percent{ Value: 100, }, RandomSampling: &envoytype.Percent{ - Value: 100, + Value: randomSampling, }, OverallSampling: &envoytype.Percent{ Value: 100, }, - }, - }, nil + } + } } diff --git a/plugin/metaprotocol/route.go b/plugin/metaprotocol/route.go index c980ec7cf..832fccc10 100644 --- a/plugin/metaprotocol/route.go +++ b/plugin/metaprotocol/route.go @@ -15,9 +15,10 @@ package metaprotocol import ( - metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/config/route/v1alpha" istionetworking "istio.io/api/networking/v1alpha3" + metaroute "github.com/aeraki-mesh/meta-protocol-control-plane-api/meta_protocol_proxy/config/route/v1alpha" + "github.com/aeraki-mesh/aeraki/pkg/model" ) diff --git a/test/e2e/common/istio-config.yaml b/test/e2e/common/istio-config.yaml index 6da1ddc0d..7b753fd1a 100644 --- a/test/e2e/common/istio-config.yaml +++ b/test/e2e/common/istio-config.yaml @@ -8,6 +8,7 @@ spec: logging: level: default:debug meshConfig: + enableTracing: true accessLogFile: /dev/stdout defaultConfig: holdApplicationUntilProxyStarts: true @@ -25,6 +26,10 @@ spec: - .*kafka.* - .*zookeeper.* - .*meta_protocol.* + tracing: + sampling: 100 + zipkin: + address: zipkin.istio-system:9411 components: pilot: hub: istio diff --git a/test/e2e/metaprotocol/metaprotocol_test.go b/test/e2e/metaprotocol/metaprotocol_test.go index 606d00f1c..70addef99 100644 --- a/test/e2e/metaprotocol/metaprotocol_test.go +++ b/test/e2e/metaprotocol/metaprotocol_test.go @@ -60,7 +60,7 @@ func TestSidecarOutboundConfig(t *testing.T) { consumerPod, _ := util.GetPodName("metaprotocol", "app=dubbo-sample-consumer", "") config, _ := util.PodExec("metaprotocol", consumerPod, "istio-proxy", "curl -s 127.0.0.1:15000/config_dump", false, "") config = strings.Join(strings.Fields(config), "") - want := "{\n\"name\":\"envoy.filters.network.meta_protocol_proxy\",\n\"typed_config\":{\n\"@type\":\"type.googleapis.com/udpa.type.v1.TypedStruct\",\n\"type_url\":\"type.googleapis.com/aeraki.meta_protocol_proxy.v1alpha.MetaProtocolProxy\",\n\"value\":{\n\"stat_prefix\":\"outbound|20880||org.apache.dubbo.samples.basic.api.demoservice\",\n\"application_protocol\":\"dubbo\",\n\"rds\":{\n\"config_source\":{\n\"api_config_source\":{\n\"api_type\":\"GRPC\",\n\"grpc_services\":[\n{\n\"envoy_grpc\":{\n\"cluster_name\":\"aeraki-xds\"\n}\n}\n],\n\"transport_api_version\":\"V3\"\n},\n\"resource_api_version\":\"V3\"\n},\n\"route_config_name\":\"org.apache.dubbo.samples.basic.api.demoservice_20880\"\n},\n\"codec\":{\n\"name\":\"aeraki.meta_protocol.codec.dubbo\"\n},\n\"meta_protocol_filters\":[\n{\n\"name\":\"aeraki.meta_protocol.filters.router\"\n}\n]\n}\n}\n}" + want := "{\n\"name\":\"envoy.filters.network.meta_protocol_proxy\",\n\"typed_config\":{\n\"@type\":\"type.googleapis.com/udpa.type.v1.TypedStruct\",\n\"type_url\":\"type.googleapis.com/aeraki.meta_protocol_proxy.v1alpha.MetaProtocolProxy\",\n\"value\":{\n\"stat_prefix\":\"outbound|20880||org.apache.dubbo.samples.basic.api.demoservice\",\n\"application_protocol\":\"dubbo\",\n\"rds\":{\n\"config_source\":{\n\"api_config_source\":{\n\"api_type\":\"GRPC\",\n\"grpc_services\":[\n{\n\"envoy_grpc\":{\n\"cluster_name\":\"aeraki-xds\"\n}\n}\n],\n\"transport_api_version\":\"V3\"\n},\n\"resource_api_version\":\"V3\"\n},\n\"route_config_name\":\"org.apache.dubbo.samples.basic.api.demoservice_20880\"\n},\n\"codec\":{\n\"name\":\"aeraki.meta_protocol.codec.dubbo\"\n},\n\"meta_protocol_filters\":[\n{\n\"name\":\"aeraki.meta_protocol.filters.router\"\n}\n],\n\"tracing\":{\n\"client_sampling\":{\n\"value\":100\n},\n\"random_sampling\":{\n\"value\":100\n},\n\"overall_sampling\":{\n\"value\":100\n}\n}\n}\n}\n}\n]\n}" want = strings.Join(strings.Fields(want), "") if !strings.Contains(config, want) { t.Errorf("cant't find metaprotocol proxy in the outbound listener of the envoy sidecar: conf \n %s, want \n %s", config, want) @@ -73,7 +73,7 @@ func TestSidecarInboundConfig(t *testing.T) { providerPod, _ := util.GetPodName("metaprotocol", "app=dubbo-sample-provider", "") config, _ := util.PodExec("metaprotocol", providerPod, "istio-proxy", "curl -s 127.0.0.1:15000/config_dump", false, "") config = strings.Join(strings.Fields(config), "") - want := "{\n\"name\":\"envoy.filters.network.meta_protocol_proxy\",\n\"typed_config\":{\n\"@type\":\"type.googleapis.com/udpa.type.v1.TypedStruct\",\n\"type_url\":\"type.googleapis.com/aeraki.meta_protocol_proxy.v1alpha.MetaProtocolProxy\",\n\"value\":{\n\"stat_prefix\":\"inbound|20880||\",\n\"application_protocol\":\"dubbo\",\n\"route_config\":{\n\"name\":\"inbound|20880||\",\n\"routes\":[\n{\n\"route\":{\n\"cluster\":\"inbound|20880||\"\n}\n}\n]\n},\n\"codec\":{\n\"name\":\"aeraki.meta_protocol.codec.dubbo\"\n},\n\"meta_protocol_filters\":[\n{\n\"name\":\"aeraki.meta_protocol.filters.router\"\n}\n]\n}\n}\n}" + want := "{\n\"name\":\"envoy.filters.network.meta_protocol_proxy\",\n\"typed_config\":{\n\"@type\":\"type.googleapis.com/udpa.type.v1.TypedStruct\",\n\"type_url\":\"type.googleapis.com/aeraki.meta_protocol_proxy.v1alpha.MetaProtocolProxy\",\n\"value\":{\n\"stat_prefix\":\"inbound|20880||\",\n\"application_protocol\":\"dubbo\",\n\"route_config\":{\n\"name\":\"inbound|20880||\",\n\"routes\":[\n{\n\"route\":{\n\"cluster\":\"inbound|20880||\"\n}\n}\n]\n},\n\"codec\":{\n\"name\":\"aeraki.meta_protocol.codec.dubbo\"\n},\n\"meta_protocol_filters\":[\n{\n\"name\":\"aeraki.meta_protocol.filters.router\"\n}\n],\n\"tracing\":{\n\"client_sampling\":{\n\"value\":100\n},\n\"random_sampling\":{\n\"value\":100\n},\n\"overall_sampling\":{\n\"value\":100\n}\n}\n}\n}\n}" want = strings.Join(strings.Fields(want), "") if !strings.Contains(config, want) { t.Errorf("cant't find metaprotocol proxy in the inbound listener of the envoy sidecar: conf \n %s, want \n %s", config, want) @@ -274,6 +274,7 @@ func TestTrafficMirror(t *testing.T) { } v1log := util.GetPodLogsForLabel("metaprotocol", "version=v1", "dubbo-sample-provider", true, false, "") want := 10 + log.Info(v1log) actual := strings.Count(v1log, "Hello Aeraki, request from consumer") if actual != want { t.Errorf("fail to send request to host, want: %v got:%v ", want, actual) diff --git a/test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml b/test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml index c281a6670..ef655d5ff 100644 --- a/test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml +++ b/test/e2e/metaprotocol/testdata/metaprotocol-sample.yaml @@ -14,7 +14,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.3 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 labels: app: dubbo-sample-provider version: v1 @@ -41,7 +41,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.3 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 labels: app: dubbo-sample-provider version: v2 @@ -55,6 +55,33 @@ spec: --- apiVersion: apps/v1 kind: Deployment +metadata: + name: dubbo-sample-second-provider + labels: + app: dubbo-sample-second-provider +spec: + selector: + matchLabels: + app: dubbo-sample-second-provider + replicas: 1 + template: + metadata: + annotations: + sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 + labels: + app: dubbo-sample-second-provider + version: v2 + service_group: batchjob + spec: + containers: + - name: dubbo-sample-second-provider + image: aeraki/dubbo-sample-second-provider + ports: + - containerPort: 20880 +--- +apiVersion: apps/v1 +kind: Deployment metadata: name: dubbo-sample-consumer labels: @@ -68,7 +95,7 @@ spec: metadata: annotations: sidecar.istio.io/bootstrapOverride: aeraki-bootstrap-config - sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.3 + sidecar.istio.io/proxyImage: aeraki/meta-protocol-proxy-debug:1.1.4 labels: app: dubbo-sample-consumer spec: diff --git a/test/e2e/metaprotocol/testdata/serviceentry.yaml b/test/e2e/metaprotocol/testdata/serviceentry.yaml index 2f49e327b..3f62f6d9d 100644 --- a/test/e2e/metaprotocol/testdata/serviceentry.yaml +++ b/test/e2e/metaprotocol/testdata/serviceentry.yaml @@ -16,3 +16,21 @@ spec: labels: app: dubbo-sample-provider resolution: STATIC +--- +apiVersion: networking.istio.io/v1alpha3 +kind: ServiceEntry +metadata: + name: dubbo-secondservice + annotations: + interface: org.apache.dubbo.samples.basic.api.SecondService +spec: + hosts: + - org.apache.dubbo.samples.basic.api.secondservice + ports: + - number: 20880 + name: tcp-metaprotocol-dubbo + protocol: TCP + workloadSelector: + labels: + app: dubbo-sample-second-provider + resolution: STATIC diff --git a/test/e2e/util/kube_utils.go b/test/e2e/util/kube_utils.go index b6feca59d..4927c48b3 100644 --- a/test/e2e/util/kube_utils.go +++ b/test/e2e/util/kube_utils.go @@ -607,7 +607,7 @@ func GetPodLogsForLabel(n, labelSelector string, container string, tail, alsoSho func GetPodLogs(n, pod, container string, tail, alsoShowPreviousPodLogs bool, kubeconfig string) string { tailOption := "" if tail { - tailOption = "--tail=100" + tailOption = "--tail=200" } o1 := "" if alsoShowPreviousPodLogs {