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.

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

Fixes to gateway template environment variables #16957

Merged
merged 2 commits into from
Sep 11, 2019

Conversation

howardjohn
Copy link
Member

Fixes #16945

  • Sidecar injector had typo
  • Gateway was missing labels + cluster id

@howardjohn howardjohn requested a review from a team as a code owner September 10, 2019 01:33
@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Sep 10, 2019
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 10, 2019
@@ -1,18 +1,16 @@
{{- range $key, $spec := .Values }}
{{- if ne $key "enabled" }}
{{- if $spec.enabled }}

{{- $labels := dict "release" $.Release.Name "chart" (include "gateway.chart" $) "heritage" $.Release.Service }}
{{- $labels = merge $labels $spec.labels }}
Copy link
Member

@morvencao morvencao Sep 10, 2019

Choose a reason for hiding this comment

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

There is an helm issue that complains the = here, which has been fixed from helm v2.13.0, see: helm/helm#4987
istio/istio is still using helm v2.10.0, isn't it?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ahh thanks! thats why it worked locally then.

We advertise helm 2.10 support so probably need to find an even dirtier hack to accomplish this

@morvencao
Copy link
Member

morvencao commented Sep 11, 2019

/test unit-tests_istio

@howardjohn
Copy link
Member Author

/retest

@howardjohn
Copy link
Member Author

howardjohn commented Sep 11, 2019 via email

@istio-testing
Copy link
Collaborator

@howardjohn: once the present PR merges, I will cherry-pick it on top of release-1.3 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.3

On Tue, Sep 10, 2019, 7:20 PM Morven Cao notifications@github.com wrote:

@morvencao approved this pull request.


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
https://github.com/istio/istio/pull/16957?email_source=notifications&email_token=AAEYGXJTUGFXSCCPKGZRVRLQJBIWLA5CNFSM4IVBZ6UKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCEKAKOA#pullrequestreview-286524728,
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAEYGXNZK4JHUKVLCZPV2HDQJBIWLANCNFSM4IVBZ6UA
.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@istio-testing
Copy link
Collaborator

@howardjohn: new pull request created: #16995

In response to this:

/cherrypick release-1.3

On Tue, Sep 10, 2019, 7:20 PM Morven Cao notifications@github.com wrote:

@morvencao approved this pull request.


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
https://github.com/istio/istio/pull/16957?email_source=notifications&email_token=AAEYGXJTUGFXSCCPKGZRVRLQJBIWLA5CNFSM4IVBZ6UKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCEKAKOA#pullrequestreview-286524728,
or mute the thread
https://github.com/notifications/unsubscribe-auth/AAEYGXNZK4JHUKVLCZPV2HDQJBIWLANCNFSM4IVBZ6UA
.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@istio-testing
Copy link
Collaborator

@howardjohn: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pilot-multicluster-e2e_istio 89be6dd link /test pilot-multicluster-e2e_istio

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Expose LABELS environment variable on gateway
4 participants