-
Notifications
You must be signed in to change notification settings - Fork 327
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
Support ingress annotations (kuma.io/ingress-public-address and kuma.… #1796
Conversation
…io/ingress-public-port) in helm (kumahq#1795) Signed-off-by: Bill DeCoste <bdecoste@gmail.com>
Signed-off-by: Bill DeCoste <bdecoste@gmail.com>
Looks great, thanks for the contribution @bdecoste ! I think you've found almost all the gotchas, just need to run: |
Signed-off-by: Bill DeCoste <bdecoste@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change looks good to me, though all e2e-type tests are having seemingly unrelated issues, cc' @nickolaev: https://app.circleci.com/pipelines/github/kumahq/kuma/6825/workflows/8a43ec13-c47b-4e2d-b294-b500016c57ec/jobs/81156
I'd say we merge this, but would like to understand what's going on with the tests.
{{- if .Values.ingress.annotations }} | ||
{{- range $key, $value := .Values.ingress.annotations }} | ||
{{ $key }}: {{ $value | quote }} | ||
{{- end }} | ||
{{- end }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit, and more of a follow-up note for myself since I know this is done elsewhere, but I don't think we should be silently supporting invalid annotations (by quoting each one). Instead, it'd be better to:
{{- if .Values.ingress.annotations }} | |
{{- range $key, $value := .Values.ingress.annotations }} | |
{{ $key }}: {{ $value | quote }} | |
{{- end }} | |
{{- end }} | |
{{- with .Values.ingress.annotations }} | |
{{ . | toYaml | nindent 8 }} | |
{{- end }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will merge it as it is and will let you submit another PR if you want to cover all the relevant places in the charts.
Looks like the failing tests are part of a larger problem/ outage with Bintray's planned maintenance: https://status.bintray.com/incidents/4mzph0y8l6hk |
…… (backport #1796) (#1809) * Support ingress annotations (kuma.io/ingress-public-address and kuma.… (#1796) * Support ingress annotations (kuma.io/ingress-public-address and kuma.io/ingress-public-port) in helm (#1795) Signed-off-by: Bill DeCoste <bdecoste@gmail.com> (cherry picked from commit 309e035) # Conflicts: # app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go * fix(*) make check Signed-off-by: Nikolay Nikolaev <nikolay.nikolaev@konghq.com> Co-authored-by: Bill DeCoste <bdecoste@gmail.com> Co-authored-by: Nikolay Nikolaev <nikolay.nikolaev@konghq.com>
…io/ingress-public-port) in helm (#1795)
Summary
Support ingress annotations (kuma.io/ingress-public-address and kuma.io/ingress-public-port) in helm
Full changelog
Issues resolved
Fix #1795
Documentation