Helm: Adapt Hubble ingress template to the new Ingress API #13682

youssefazrak · 2020-10-21T20:47:10Z

Ingress and IngressClass resources have graduated to networking.k8s.io/v1 in Kubernetes v1.19. This also introduced changes to the objects.

Also in Helm, GitVersion is being deprecated and has thus been replaced with Version.

Signed-off-by: Youssef Azrak [email protected]

Fixes: #13611

Helm: Adapt Hubble ingress template to the new Ingress API

youssefazrak · 2020-10-21T21:04:46Z

Hey guys,
Not sure if there is a more elegant solution but I've tested it and we get the right fields.

sayboras

Few comments I have right now. I haven't tested it out yet, will do later the day.

install/kubernetes/cilium/templates/hubble-ui-ingress.yaml

sayboras · 2020-10-21T22:59:49Z

install/kubernetes/cilium/templates/_helpers.tpl

@@ -9,9 +9,9 @@ Create chart name and version as used by the chart label.
 Return the appropriate apiVersion for ingress.
 */}}
 {{- define "ingress.apiVersion" -}}
-{{- if semverCompare ">=1.4-0, <1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if semverCompare ">=1.4-0, <1.19-0" .Capabilities.KubeVersion.Version -}}


good pick on version 1.14 here 💯 . For other reviewer, Ingress in networking.k8s.io/v1beta1 is available from from 1.14, but Ingress is available in networking.k8s.io/v1 from 1.19+ only.

So where is the networking.k8s.io/v1beta1? I see extensions/v1beta1 and networking.k8s.io/v1 but not networking.k8s.io/v1beta1.

@aanm if I understand correctly you want to use latest api version in relation to each Kubernetes version?
Right now this works fine, but if needed we can have better versioning.

What I'm trying to says is that extensions/v1beta1 will be used for up until k8s 1.19 for non-ingress resources, why is that? Non-ingress resources can use networking.k8s.io/v1 since 1.14.

@aanm I've introduced networking.k8s.io/v1beta1 starting from 1.14 as documented here. I didn't change the field for the ingress as they only changed from networking.k8s.io/v1.
Let me know if there is anything else.

christarazi

LGTM, nothing else besides what Tam pointed out.

kkourt

Modulo @sayboras' comments, LGTM.

For other reviewers/reference: helm/charts#19242

install/kubernetes/cilium/templates/hubble-ui-ingress.yaml

aanm · 2020-10-22T16:43:33Z

install/kubernetes/cilium/templates/_helpers.tpl

@@ -9,9 +9,9 @@ Create chart name and version as used by the chart label.
 Return the appropriate apiVersion for ingress.
 */}}
 {{- define "ingress.apiVersion" -}}
-{{- if semverCompare ">=1.4-0, <1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if semverCompare ">=1.4-0, <1.19-0" .Capabilities.KubeVersion.Version -}}


So where is the networking.k8s.io/v1beta1? I see extensions/v1beta1 and networking.k8s.io/v1 but not networking.k8s.io/v1beta1.

sayboras

LGTM 💯

Ingress and IngressClass resources have graduated to networking.k8s.io/v1 in Kubernetes v1.19. This also introduced changes to the objects. Using Helm `.Capabilities`, the correct fields are chosen. Also in Helm, `GitVersion` is being deprecated and has thus been replaced with `Version`. See Cilium issue cilium#13611 See Kubernetes issue #89778 Signed-off-by: Youssef Azrak <[email protected]>

# Description Fix ingress helm template issue due to missing helper script: - The hubble-ui subchart of retina doesn't include the `ingress.paths` definition from the cilium chart, so it needs to be defined instead in the _helpers.tpl helper script of retina. - Root cause line in `ingress.yaml` template: https://github.com/microsoft/retina/blob/7e2fc3346eaabf3ece23c1d181a1de7dcac2bd82/deploy/hubble/manifests/controller/helm/retina/templates/hubble-ui/ingress.yaml#L38 ## Related Issue - cilium/cilium#13682 ## Checklist - [x] I have read the [contributing documentation](https://retina.sh/docs/Contributing/overview). - [x] I signed and signed-off the commits (`git commit -S -s ...`). See [this documentation](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification) on signing commits. - [x] I have correctly attributed the author(s) of the code. - [x] I have tested the changes locally. - [x] I have followed the project's style guidelines. - [x] I have updated the documentation, if necessary. - [x] I have added tests, if applicable. ## Screenshots (if applicable) or Testing Completed Ingress completly created (screenshot from k9s): <img width="859" alt="붙여넣은_이미지_2025__4__30__오후_5_27" src="https://github.com/user-attachments/assets/cc727bf6-591f-4f88-a7a1-559210a8f3df" /> ## Additional Notes N/A --- Please refer to the [CONTRIBUTING.md](../CONTRIBUTING.md) file for more information on how to contribute to this project. Signed-off-by: younsl <[email protected]>

youssefazrak requested review from a team as code owners October 21, 2020 20:47

youssefazrak requested review from a team October 21, 2020 20:47

maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Oct 21, 2020

youssefazrak force-pushed the helm_hubble_ingress_fix branch from 533d849 to 694045d Compare October 21, 2020 20:57

youssefazrak changed the title ~~WIP Helm: Adapt Hubble ingress template to the new Ingress API~~ Helm: Adapt Hubble ingress template to the new Ingress API Oct 21, 2020

sayboras added area/helm Impacts helm charts and user deployment experience area/hubble release-note/minor This PR changes functionality that users may find relevant to operating Cilium. labels Oct 21, 2020

maintainer-s-little-helper bot removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Oct 21, 2020

sayboras reviewed Oct 21, 2020

View reviewed changes

install/kubernetes/cilium/templates/hubble-ui-ingress.yaml Outdated Show resolved Hide resolved

sayboras requested review from a team October 21, 2020 22:51

sayboras reviewed Oct 21, 2020

View reviewed changes

sayboras requested review from a team October 21, 2020 23:01

christarazi approved these changes Oct 22, 2020

View reviewed changes

kkourt approved these changes Oct 22, 2020

View reviewed changes

rolinh approved these changes Oct 22, 2020

View reviewed changes

sayboras requested changes Oct 22, 2020

View reviewed changes

install/kubernetes/cilium/templates/hubble-ui-ingress.yaml Show resolved Hide resolved

youssefazrak force-pushed the helm_hubble_ingress_fix branch 2 times, most recently from b20ff21 to 8df6073 Compare October 22, 2020 13:46

aanm requested changes Oct 22, 2020

View reviewed changes

sayboras approved these changes Oct 23, 2020

View reviewed changes

youssefazrak force-pushed the helm_hubble_ingress_fix branch from 8df6073 to fc8a029 Compare October 24, 2020 10:03

aanm approved these changes Oct 24, 2020

View reviewed changes

aanm added needs-backport/1.9 release-note/bug This PR fixes an issue in a previous release of Cilium. and removed release-note/minor This PR changes functionality that users may find relevant to operating Cilium. labels Oct 24, 2020

aanm merged commit aec71a9 into cilium:master Oct 24, 2020

gandro mentioned this pull request Oct 26, 2020

v1.9 backports 2020-10-26 #13751

Merged

gandro added backport-pending/1.9 and removed needs-backport/1.9 labels Oct 26, 2020

joestringer mentioned this pull request Nov 3, 2020

Prepare for release v1.9.0-rc3 #13864

Merged

youssefazrak deleted the helm_hubble_ingress_fix branch March 19, 2021 00:16

younsl mentioned this pull request Apr 30, 2025

fix(helm): Missing helper template for ingress resource microsoft/retina#1570

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Helm: Adapt Hubble ingress template to the new Ingress API #13682

Helm: Adapt Hubble ingress template to the new Ingress API #13682

Uh oh!

youssefazrak commented Oct 21, 2020

Uh oh!

youssefazrak commented Oct 21, 2020

Uh oh!

sayboras left a comment

Uh oh!

Uh oh!

sayboras Oct 21, 2020 •

edited

Loading

Uh oh!

aanm Oct 22, 2020 •

edited

Loading

Uh oh!

youssefazrak Oct 23, 2020

Uh oh!

aanm Oct 23, 2020

Uh oh!

youssefazrak Oct 24, 2020 •

edited

Loading

Uh oh!

christarazi left a comment

Uh oh!

kkourt left a comment

Uh oh!

Uh oh!

aanm Oct 22, 2020 •

edited

Loading

Uh oh!

sayboras left a comment

Uh oh!

Uh oh!

Helm: Adapt Hubble ingress template to the new Ingress API #13682

Helm: Adapt Hubble ingress template to the new Ingress API #13682

Uh oh!

Conversation

youssefazrak commented Oct 21, 2020

Uh oh!

youssefazrak commented Oct 21, 2020

Uh oh!

sayboras left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sayboras Oct 21, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aanm Oct 22, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

youssefazrak Oct 23, 2020

Choose a reason for hiding this comment

Uh oh!

aanm Oct 23, 2020

Choose a reason for hiding this comment

Uh oh!

youssefazrak Oct 24, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

christarazi left a comment

Choose a reason for hiding this comment

Uh oh!

kkourt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

aanm Oct 22, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sayboras left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sayboras Oct 21, 2020 •

edited

Loading

aanm Oct 22, 2020 •

edited

Loading

youssefazrak Oct 24, 2020 •

edited

Loading

aanm Oct 22, 2020 •

edited

Loading