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

helm: allow further configurability of ingress version (manual backport) #9237

Merged
merged 1 commit into from Nov 29, 2021

Conversation

TomHellier
Copy link
Contributor

The ingress api version changed when it went to v1, and this has caused some upheaval
throughout the kubernetes ecosystem. This commit uses a common method of deciding which
ingress api to use, and allows the optional override of the kubernetes version
presented to helm using the helm build-in capabilities.
also add an ingress into the helm integration tests so any regressions to how ingresses
are handled in the future are caught easier.

Closes #9174

Signed-off-by: Tom Hellier me@tomhellier.com
(cherry picked from commit ba44602)

Which issue is resolved by this Pull Request:
Resolves #9232

@TomHellier TomHellier force-pushed the cherrypick-pr-9176 branch 2 times, most recently from 2322a17 to 90394c6 Compare November 24, 2021 13:47
@TomHellier
Copy link
Contributor Author

@travisn I've just copied the helm code over, as even resolving the commits and trying to get the tests working wasn't proving very fruitful as the orchestration has changed so significantly.

@TomHellier TomHellier changed the title helm: allow further configurability of ingress version helm: allow further configurability of ingress version (manual backport) Nov 24, 2021
@leseb leseb requested a review from travisn November 25, 2021 08:15
@mergify
Copy link

mergify bot commented Nov 29, 2021

Hi @TomHellier, this pull request was opened against a release branch, is it expected? Normally patches should go in the master branch first and then be backported to release branches.

@leseb
Copy link
Member

leseb commented Nov 29, 2021

Hi @TomHellier, this pull request was opened against a release branch, is it expected? Normally patches should go in the master branch first and then be backported to release branches.

It's alright.

Copy link
Member

@leseb leseb left a comment

Choose a reason for hiding this comment

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

Please use git cherry-pick -x ba4460247710124d00d8768614f7dd2dcd8c8758, then fix the conflicts and repush. Thanks!

The ingress api version changed when it went to v1, and this has caused some upheaval
throughout the kubernetes ecosystem. This commit uses a common method of deciding which
ingress api to use, and allows the optional override of the kubernetes version
presented to helm using the helm build-in capabilities.
also add an ingress into the helm integration tests so any regressions to how ingresses
are handled in the future are caught easier.

Closes rook#9174

Signed-off-by: Tom Hellier <me@tomhellier.com>
(cherry picked from commit ba44602)
Signed-off-by: Tom Hellier <me@tomhellier.com>
@TomHellier
Copy link
Contributor Author

@leseb refixed conflicts

@leseb leseb merged commit 3a7dfdd into rook:release-1.7 Nov 29, 2021
@TomHellier TomHellier deleted the cherrypick-pr-9176 branch November 29, 2021 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants