Merge remote-tracking branch 'origin/master' into chore/tls_origination

kumahq · Nov 4, 2020 · 5c27e51 · 5c27e51
2 parents a6665b6 + 571c4d0
commit 5c27e51
Show file tree

Hide file tree

Showing 146 changed files with 3,005 additions and 977 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -27,6 +27,8 @@ reusable:
       filters:
         branches:
           only: master, /^release-.*/
+        tags:
+          ignore: /.*/ # we don't want to run master workflow on commits with tag because use_local_kuma_images has to be false for all the jobs to pass
 
     # filters for the kuma-commit workflow
     commit_workflow_filters: &commit_workflow_filters

diff --git a/api/mesh/v1alpha1/dataplane.pb.go b/api/mesh/v1alpha1/dataplane.pb.go
diff --git a/api/mesh/v1alpha1/dataplane.pb.validate.go b/api/mesh/v1alpha1/dataplane.pb.validate.go
diff --git a/api/mesh/v1alpha1/dataplane.proto b/api/mesh/v1alpha1/dataplane.proto
@@ -30,13 +30,19 @@ message Dataplane {
         string mesh = 3;
       }
       repeated AvailableService availableServices = 1;
+
+      // PublicAddress defines IP or DNS name on which Ingress is accessible to
+      // other Kuma clusters.
+      string publicAddress = 2;
+      // PublicPort defines port on which Ingress is accessible to other Kuma
+      // clusters.
+      uint32 publicPort = 3;
     }
 
     // Ingress if not nil, dataplane will be work in the Ingress mode
     Ingress ingress = 6;
 
     // Public IP on which the dataplane is accessible in the network.
-    // Host names and DNS are not allowed.
     string address = 5;
 
     // Inbound describes a service implemented by the dataplane.

diff --git a/api/mesh/v1alpha1/dataplane_helpers.go b/api/mesh/v1alpha1/dataplane_helpers.go
@@ -338,6 +338,13 @@ func (d *Dataplane) IsIngress() bool {
 	return d.Networking.Ingress != nil
 }
 
+func (d *Dataplane) HasPublicAddress() bool {
+	if d.Networking.Ingress == nil {
+		return false
+	}
+	return d.Networking.Ingress.PublicAddress != "" && d.Networking.Ingress.PublicPort != 0
+}
+
 func (d *Dataplane) HasAvailableServices() bool {
 	if !d.IsIngress() {
 		return false

diff --git a/api/system/v1alpha1/zone.pb.go b/api/system/v1alpha1/zone.pb.go
diff --git a/api/system/v1alpha1/zone.pb.validate.go b/api/system/v1alpha1/zone.pb.validate.go
diff --git a/api/system/v1alpha1/zone.proto b/api/system/v1alpha1/zone.proto
@@ -6,13 +6,4 @@ option go_package = "v1alpha1";
 
 // Zone defines the Zone configuration used at the Global Control Plane
 // within a distributed deployment
-message Zone {
-
-  // Configure the Zone's Ingress
-  message Ingress {
-    // The public load balancer address of the Zone Ingress
-    string address = 1;
-  }
-
-  Ingress ingress = 2;
-}
+message Zone {}