Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gloo: copy labels from upstream #932

Merged
merged 3 commits into from
Jun 15, 2021
Merged

gloo: copy labels from upstream #932

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8555f82
feat: copy labels from upstream
knechtionscoding Jun 11, 2021
35c8957
chore: lowercase labels
knechtionscoding Jun 13, 2021
e7357c4
fix: updating to use include-label-prefix
knechtionscoding Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/gitbook/tutorials/gloo-progressive-delivery.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/gloo/gloo/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type Upstream struct {

type UpstreamSpec struct {
Kube *KubeUpstream `json:"kube,omitempty"`
Labels map[string]string `json:"Labels,omitempty"`
knechtionscoding marked this conversation as resolved.
Show resolved Hide resolved
SslConfig *UpstreamSslConfig `json:"sslConfig,omitempty"`
CircuitBreakers *CircuitBreakerConfig `json:"circuitBreakers,omitempty"`
ConnectionConfig *ConnectionConfig `json:"connectionConfig,omitempty"`
Expand Down
7 changes: 7 additions & 0 deletions pkg/apis/gloo/gloo/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions pkg/router/gloo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ func (gr *GlooRouter) getGlooUpstreamKubeService(canary *flaggerv1.Canary, svc *
if glooUpstreamWithConfig != nil {
configSpec := glooUpstreamWithConfig.Spec
upstreamSpec = gloov1.UpstreamSpec{
Labels: configSpec.Labels,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

glooUpstreamWithConfig.Metadata.Labels right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so? This defines from the configSpec what labels to pass to the other upstream objects. glooUpstreamWithConfig.Metadata.Labels might make sense here: https://github.com/KnechtionsCoding/flagger/blob/35c8957a5585f9aa7d4446fd211c0289baa7a6ea/pkg/router/gloo.go#L310 but I think that declaration is already correct.

But I may be misunderstanding the flow here.

SslConfig: configSpec.SslConfig,
CircuitBreakers: configSpec.CircuitBreakers,
ConnectionConfig: configSpec.ConnectionConfig,
Expand All @@ -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 {
knechtionscoding marked this conversation as resolved.
Show resolved Hide resolved
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,
Expand Down