feat: copy labels from upstream

Signed-off-by: Hans Knecht <Hans.Knecht@missionlane.com>

docs/gitbook/tutorials/gloo-progressive-delivery.md

@@ -160,6 +160,8 @@ spec:
           cmd: "hey -z 2m -q 5 -c 2 -host app.example.com http://gateway-proxy.gloo-system"
 ```
 
+*Note: when using upstreamRef the following fields are copied over from the original upstream: `Labels, SslConfig, CircuitBreakers, ConnectionConfig, UseHttp2, InitialStreamWindowSize`*
+
 Save the above resource as podinfo-canary.yaml and then apply it:
 
 ```bash

pkg/apis/gloo/gloo/v1/types.go

@@ -18,6 +18,7 @@ type Upstream struct {
 
 type UpstreamSpec struct {
 	Kube                        *KubeUpstream         `json:"kube,omitempty"`
+	Labels                      map[string]string     `json:"Labels,omitempty"`
 	SslConfig                   *UpstreamSslConfig    `json:"sslConfig,omitempty"`
 	CircuitBreakers             *CircuitBreakerConfig `json:"circuitBreakers,omitempty"`
 	ConnectionConfig            *ConnectionConfig     `json:"connectionConfig,omitempty"`

pkg/apis/gloo/gloo/v1/zz_generated.deepcopy.go

@@ -294,6 +294,13 @@ func (in *UpstreamSpec) DeepCopyInto(out *UpstreamSpec) {
 		*out = new(KubeUpstream)
 		(*in).DeepCopyInto(*out)
 	}
+	if in.Labels != nil {
+		in, out := &in.Labels, &out.Labels
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
 	if in.SslConfig != nil {
 		in, out := &in.SslConfig, &out.SslConfig
 		*out = new(UpstreamSslConfig)

pkg/router/gloo.go

@@ -276,6 +276,7 @@ func (gr *GlooRouter) getGlooUpstreamKubeService(canary *flaggerv1.Canary, svc *
 	if glooUpstreamWithConfig != nil {
 		configSpec := glooUpstreamWithConfig.Spec
 		upstreamSpec = gloov1.UpstreamSpec{
+			Labels:                      configSpec.Labels,
 			SslConfig:                   configSpec.SslConfig,
 			CircuitBreakers:             configSpec.CircuitBreakers,
 			ConnectionConfig:            configSpec.ConnectionConfig,
@@ -293,10 +294,20 @@ func (gr *GlooRouter) getGlooUpstreamKubeService(canary *flaggerv1.Canary, svc *
 		Selector:         svc.Spec.Selector,
 	}
 
+	upstreamLabels := make(map[string]string)
+	if upstreamSpec.Labels != nil {
+		for k, v := range upstreamSpec.Labels { // Order not specified
+			if _, ok := upstreamLabels[k]; !ok {
+				upstreamLabels[k] = v
+			}
+		}
+	}
+
 	return &gloov1.Upstream{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      upstreamName,
 			Namespace: canary.Namespace,
+			Labels:    upstreamLabels,
 			OwnerReferences: []metav1.OwnerReference{
 				*metav1.NewControllerRef(canary, schema.GroupVersionKind{
 					Group:   flaggerv1.SchemeGroupVersion.Group,