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

Add ingressclass for ingress_nginx #10091

Merged
merged 1 commit into from
May 24, 2023
Merged

Add ingressclass for ingress_nginx #10091

merged 1 commit into from
May 24, 2023

Conversation

peschmae
Copy link
Contributor

What type of PR is this?
/kind feature

What this PR does / why we need it:
Starting with Kubernetes 1.18 the ingress class resources was introduced to replace the widely adapted (but never formalised) kubernetes.io/ingress.class annotation.
This PR adds the ingressClass for nginx, and adds options to configure it as the default, as well as disabling the watch-ingress-without-class attribute for the nginx-controller

Which issue(s) this PR fixes:
Fixes #9936
Fixes #10014

Special notes for your reviewer:
As the ingress_nginx daemonset isn't configured for multiple ingresses in one deployment, the ingressClass resource is scoped to the cluster (which is the default)

Does this PR introduce a user-facing change?:

Add ingressClass resource for ingress_nginx by default

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 16, 2023
@k8s-ci-robot k8s-ci-robot requested review from bozzo and cristicalin May 16, 2023 21:45
@k8s-ci-robot
Copy link
Contributor

Hi @peschmae. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 16, 2023
oomichi
oomichi reviewed May 16, 2023
View reviewed changes
Copy link
Contributor

@oomichi oomichi left a comment

Choose a reason for hiding this comment

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

/cc @oomichi

...ubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot requested a review from oomichi May 16, 2023 23:03
@peschmae peschmae force-pushed the feature/nginx-ingressclass branch from 401b8e9 to c412f15 Compare May 17, 2023 06:27
oomichi
oomichi reviewed May 17, 2023
View reviewed changes
Copy link
Contributor

@oomichi oomichi left a comment

Choose a reason for hiding this comment

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

/lgtm

...ubernetes-apps/ingress_controller/ingress_nginx/templates/ds-ingress-nginx-controller.yml.j2 Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 17, 2023
mzaian
mzaian approved these changes May 17, 2023
View reviewed changes
Copy link
Contributor

@mzaian mzaian left a comment

Choose a reason for hiding this comment

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

Thanks @peschmae

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels May 17, 2023
@oomichi
Copy link
Contributor

oomichi commented May 18, 2023

Could you rebase this pull request on the latest master branch?
#10099 fixes the issue of tf-elastx_cleanup job.

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 18, 2023
@peschmae peschmae force-pushed the feature/nginx-ingressclass branch 2 times, most recently from c656579 to 63c3f04 Compare May 18, 2023 07:44
@peschmae
Copy link
Contributor Author

Rebased & squashed commits

@oomichi
Copy link
Contributor

oomichi commented May 18, 2023

Thank you for doing that.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 18, 2023
mzaian
mzaian approved these changes May 18, 2023
View reviewed changes
Copy link
Contributor

@mzaian mzaian left a comment

Choose a reason for hiding this comment

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

/retest

mzaian
mzaian approved these changes May 18, 2023
View reviewed changes
Copy link
Contributor

@mzaian mzaian left a comment

Choose a reason for hiding this comment

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

/retest

mzaian
mzaian approved these changes May 18, 2023
View reviewed changes
Copy link
Contributor

@mzaian mzaian left a comment

Choose a reason for hiding this comment

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

/retest

mzaian
mzaian approved these changes May 18, 2023
View reviewed changes
Copy link
Contributor

@mzaian mzaian left a comment

Choose a reason for hiding this comment

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

/retest

mzaian
mzaian approved these changes May 18, 2023
View reviewed changes
Copy link
Contributor

@mzaian mzaian left a comment

Choose a reason for hiding this comment

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

/retest

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 22, 2023
@mzaian
Copy link
Contributor

mzaian commented May 22, 2023

Hello @peschmae

Please squash your commits and rebase if needed.

@peschmae peschmae force-pushed the feature/nginx-ingressclass branch from 68c5994 to a9b70fa Compare May 22, 2023 19:53
@peschmae
Copy link
Contributor Author

Rebased & squashed

I think I've also found the issue with the CI pipeline failing, as the failing build is the only one with ingress_nginx enabled.

@yankay yankay mentioned this pull request May 23, 2023
Closed
@peschmae peschmae force-pushed the feature/nginx-ingressclass branch from a9b70fa to 0ac3897 Compare May 23, 2023 09:49
@peschmae
Copy link
Contributor Author

/retest

@mzaian
Copy link
Contributor

mzaian commented May 23, 2023

/retest

Try pushing an empty commit.

/ok-to-test

@peschmae
feature(ingress_nginx) Add ingressclass for ingress_nginx
fe80a29 
Add option to configure class as the default class
Add option to disable wathcing for ingresses without class

Remove redundant if that always evaluates to true

Fix default value missing for ingress_nginx_default
@peschmae peschmae force-pushed the feature/nginx-ingressclass branch from 0ac3897 to fe80a29 Compare May 23, 2023 20:34
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mzaian, peschmae

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@oomichi
Copy link
Contributor

oomichi commented May 24, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 24, 2023
@k8s-ci-robot k8s-ci-robot merged commit 862fd2c into kubernetes-sigs:master May 24, 2023
@peschmae peschmae deleted the feature/nginx-ingressclass branch May 24, 2023 11:51
@yankay yankay mentioned this pull request Aug 24, 2023
Closed
pedro-peter pushed a commit to pedro-peter/kubespray that referenced this pull request May 8, 2024
@peschmae @pedromcpedro
feature(ingress_nginx) Add ingressclass for ingress_nginx (kubernetes…
0f05765 
…-sigs#10091)

Add option to configure class as the default class
Add option to disable wathcing for ingresses without class

Remove redundant if that always evaluates to true

Fix default value missing for ingress_nginx_default
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oomichi oomichi oomichi left review comments

@mzaian mzaian mzaian approved these changes

@bozzo bozzo Awaiting requested review from bozzo

@cristicalin cristicalin Awaiting requested review from cristicalin

Assignees

@oomichi oomichi

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
4 participants
@peschmae @k8s-ci-robot @oomichi @mzaian