upstream group and subsets

changelog/v0.13.6/upstream_groups.yaml

@@ -0,0 +1,7 @@
+changelog:
+  - type: NEW_FEATURE
+    description: Allow configuring upstream groups for routes.
+    issueLink: https://github.com/solo-io/gloo/pull/601
+  - type: NEW_FEATURE
+    description: Allow doing user-defined subset load balancing.
+    issueLink: https://github.com/solo-io/gloo/pull/601

install/helm/gloo/templates/100-gloo-crds.yaml

@@ -90,4 +90,22 @@ spec:
   scope: Namespaced
   version: v1
 ---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: upstreamgroups.gloo.solo.io
+  annotations:
+    "helm.sh/hook": crd-install
+spec:
+  group: gloo.solo.io
+  names:
+    kind: UpstreamGroup
+    listKind: UpstreamGroupList
+    plural: upstreamgroups
+    shortNames:
+      - ug
+    singular: upstreamgroup
+  scope: Namespaced
+  version: v1
+---
 {{- end}}

install/helm/gloo/templates/20-namespace-clusterrole-gateway.yaml

@@ -19,7 +19,7 @@ rules:
   resources: ["customresourcedefinitions"]
   verbs: ["get", "create"]
 - apiGroups: ["gloo.solo.io"]
-  resources: ["settings", "upstreams", "proxies","virtualservices"]
+  resources: ["settings", "upstreams","upstreamgroups", "proxies","virtualservices"]
   verbs: ["*"]
 - apiGroups: ["gateway.solo.io"]
   resources: ["virtualservices", "gateways"]

projects/gloo/api/v1/plugins/kubernetes/kubernetes.proto

@@ -7,6 +7,7 @@ import "gogoproto/gogo.proto";
 option (gogoproto.equal_all) = true;
 
 import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/service_spec.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins/subset_spec.proto";
 
 // Upstream Spec for Kubernetes Upstreams
 // Kubernetes Upstreams represent a set of one or more addressable pods for a Kubernetes Service
@@ -25,6 +26,12 @@ message UpstreamSpec {
     // any are provided here.
     // (see [Kubernetes labels and selectors](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)
     map<string, string> selector = 4;
-//     An optional Service Spec describing the service listening at this address
+    // An optional Service Spec describing the service listening at this address
     .plugins.gloo.solo.io.ServiceSpec service_spec = 5;
+
+
+    // Subset configuration. For discovery sources that has labels (like kubernetes). this 
+    // configuration allows you to partition the upstream to a set of subsets.
+    // for each unique set of keys and values, a subset will be created.
+    .plugins.gloo.solo.io.SubsetSpec subset_spec = 6;
 }

projects/gloo/api/v1/plugins/subset_spec.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+package plugins.gloo.solo.io;
+option go_package = "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/plugins";
+
+import "gogoproto/gogo.proto";
+option (gogoproto.equal_all) = true;
+
+message SubsetSpec {
+    repeated Selector selectors =1;
+}
+
+message Selector {
+    repeated string keys = 1;
+}

projects/gloo/api/v1/proxy.proto

@@ -10,6 +10,7 @@ import "github.com/solo-io/solo-kit/api/v1/status.proto";
 import "github.com/solo-io/solo-kit/api/v1/ref.proto";
 
 import "github.com/solo-io/gloo/projects/gloo/api/v1/ssl.proto";
+import "github.com/solo-io/gloo/projects/gloo/api/v1/subset.proto";
 import "github.com/solo-io/gloo/projects/gloo/api/v1/plugins.proto";
 /*
 @solo-kit:resource.short_name=px
@@ -248,6 +249,9 @@ message RouteAction {
         Destination single = 1;
         // Use MultiDestination to load balance requests between multiple upstreams (by weight)
         MultiDestination multi = 2;
+
+        // Use a reference to an upstream group for routing.
+        core.solo.io.ResourceRef upstream_group = 3;
     };
 }
 
@@ -261,8 +265,32 @@ message Destination {
     // destination config. If the destination config is required for the upstream and not provided by the user,
     // Gloo will invalidate the destination and its parent resources.
     DestinationSpec destination_spec = 2;
+
+    // If specified, traffic will only be routed to a subset of the upstream. If upstream doesn't
+    // contain the specified subset, we will fallback to normal upstream routing.
+    Subset subset = 3;
+}
+
+
+/*
+@solo-kit:resource.short_name=ug
+@solo-kit:resource.plural_name=upstreamgroups
+*/
+message UpstreamGroup {
+
+    // The destinations that are part of this upstream group.
+    repeated WeightedDestination destinations = 1;
+
+    // Status indicates the validation status of this resource.
+    // Status is read-only by clients, and set by gloo during validation
+    core.solo.io.Status status = 6 [(gogoproto.nullable) = false, (gogoproto.moretags) = "testdiff:\"ignore\""];
+
+    // Metadata contains the object metadata for this resource
+    core.solo.io.Metadata metadata = 7 [(gogoproto.nullable) = false];
 }
 
+
+
 // MultiDestination is a container for a set of weighted destinations. Gloo will load balance traffic for a single
 // route across multiple destinations according to their specified weights.
 message MultiDestination {

projects/gloo/api/v1/solo-kit.json

@@ -24,6 +24,10 @@
         "name": "Proxy",
         "package": "gloo.solo.io"
       },
+      {
+        "name": "UpstreamGroup",
+        "package": "gloo.solo.io"
+      },
       {
         "name": "Secret",
         "package": "gloo.solo.io"

projects/gloo/api/v1/subset.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+package gloo.solo.io;
+option go_package = "github.com/solo-io/gloo/projects/gloo/pkg/api/v1";
+
+import "gogoproto/gogo.proto";
+option (gogoproto.equal_all) = true;
+
+message Subset {
+   map<string, string> values = 1;
+}

projects/gloo/cli/pkg/cmd/install/uninstall_test.go

@@ -37,7 +37,7 @@ func (k *MockKubectl) Kubectl(stdin io.Reader, args ...string) error {
 var _ = Describe("Uninstall", func() {
 
 	const (
-		deleteCrds = "delete crd gateways.gateway.solo.io proxies.gloo.solo.io settings.gloo.solo.io upstreams.gloo.solo.io virtualservices.gateway.solo.io"
+		deleteCrds = "delete crd gateways.gateway.solo.io proxies.gloo.solo.io settings.gloo.solo.io upstreams.gloo.solo.io upstreamgroups.gloo.solo.io virtualservices.gateway.solo.io"
 	)
 
 	var flagSet *pflag.FlagSet

projects/gloo/cli/pkg/cmd/install/util.go

@@ -49,6 +49,7 @@ func init() {
 		"proxies.gloo.solo.io",
 		"settings.gloo.solo.io",
 		"upstreams.gloo.solo.io",
+		"upstreamgroups.gloo.solo.io",
 		"virtualservices.gateway.solo.io",
 	}
 

projects/gloo/cli/pkg/printers/virtualservice.go

@@ -80,6 +80,8 @@ func destinationString(route *gloov1.Route) string {
 			return fmt.Sprintf("%v destinations", len(dest.Multi.Destinations))
 		case *gloov1.RouteAction_Single:
 			return dest.Single.Upstream.Name
+		case *gloov1.RouteAction_UpstreamGroup:
+			return fmt.Sprintf("upstream group: %s.%s", dest.UpstreamGroup.Name, dest.UpstreamGroup.Namespace)
 		}
 	case *gloov1.Route_DirectResponseAction:
 		return strconv.Itoa(int(action.DirectResponseAction.Status))