Merge branch 'master' of github.com:kumahq/kuma into feat/virtual-out…

…bound_dnspersistence

Signed-off-by: Charly Molter <charly.molter@konghq.com>

.golangci.yml

@@ -4,6 +4,7 @@ linters:
     - gci
     - gocritic
     - govet
+    - importas
     - misspell
     - unconvert
     - whitespace
@@ -22,6 +23,12 @@ linters-settings:
       - singleCaseSwitch
   gci:
     local-prefixes: github.com/kumahq/kuma
+  importas:
+    alias:
+    - pkg: github.com/kumahq/kuma/pkg/core/resources/apis/mesh
+      alias: core_mesh
+    - pkg: github.com/kumahq/kuma/api/mesh/v1alpha1
+      alias: mesh_proto
 
 issues:
   fix: true

api/mesh/options.proto

@@ -13,7 +13,7 @@ message KumaResourceOptions {
   // Name and value of the modelResourceType constant.
   string type = 2;
 
-  // True if this resoure has global scope. Otherwise it will be mesh scope.
+  // True if this resource has global scope. Otherwise it will be mesh scope.
   bool global = 3;
 
   // Name of the resource's Go package.
@@ -24,6 +24,9 @@ message KumaResourceOptions {
 
   // Whether to skip type registration for this resource.
   bool skip_registration = 6;
+
+  KumaKdsOptions kds = 10;
+  KumaWsOptions ws = 7;
 }
 
 message KumaWsOptions {
@@ -39,7 +42,13 @@ message KumaWsOptions {
   bool admin_only = 4;
 }
 
+message KumaKdsOptions {
+  // SendToGlobal whether this entity will be sent from zone cp to global cp
+  bool send_to_global = 1;
+  // SendToZone whether this entity will be sent from global cp to zone cp
+  bool send_to_zone = 2;
+}
+
 extend google.protobuf.MessageOptions {
   KumaResourceOptions resource = 43534533; // 'kuma'
-  KumaWsOptions ws = 43534534;
 }

api/mesh/v1alpha1/circuit_breaker.proto

@@ -22,7 +22,8 @@ message CircuitBreaker {
   option (kuma.mesh.resource).name = "CircuitBreakerResource";
   option (kuma.mesh.resource).type = "CircuitBreaker";
   option (kuma.mesh.resource).package = "mesh";
-  option (kuma.mesh.ws).name = "circuit-breaker";
+  option (kuma.mesh.resource).kds.send_to_zone = true;
+  option (kuma.mesh.resource).ws.name = "circuit-breaker";
 
   // List of selectors to match dataplanes that are sources of traffic.
   repeated Selector sources = 1;