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

cleanup ingress class handling #5354

Closed
wants to merge 1 commit into from
Closed

cleanup ingress class handling #5354

wants to merge 1 commit into from

Conversation

ElvinEfendi
Copy link
Member

What this PR does / why we need it:

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

How Has This Been Tested?

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 13, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ElvinEfendi

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 13, 2020
return true
}

if IngressClass == "" {
Copy link
Member Author

Choose a reason for hiding this comment

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

This condition would never hit. IngressClass is set only when ingress-class is not empty. Which means the only time it is set, it is set to a non-empty value.

return *className == IngressClass
}

if IngressClass == DefaultClass {
Copy link
Member Author

Choose a reason for hiding this comment

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

So here we are saying if the class name is not set in the given ingress resource, and also ingress-class flag is not configured for the controller we then process the ingress. But this does not make sense. According to our docs if ingress-class is not set, then the controller should be handling all the ingresses in the given cluster regardless of their ingress class.

@k8s-ci-robot
Copy link
Contributor

@ElvinEfendi: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-ingress-nginx-test 770673c link /test pull-ingress-nginx-test

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@cmluciano
Copy link
Contributor

/cc @aledbf

@aledbf
Copy link
Member

aledbf commented Apr 17, 2020

Closing. The interpretation I did of the new IngressClassName field is wrong.
https://github.com/kubernetes/kubernetes/blob/d911254debefb5b630498aa3552899ee2f99f22e/staging/src/k8s.io/api/networking/v1beta1/types.go#L292

We need:

  • To keep using the annotation if it's defined in the ingress
  • The new field requires k8s v1.18
  • A new flag is required for the IngressClass (this replaces the ingress.class annotation)
  • The controller needs to check the IngressClass exists on start

An example:

apiVersion: networking.k8s.io/v1beta1
kind: IngressClass
metadata:
  name: "internal"
  namespace: "ingress-nginx"
spec:
  controller: "k8s.io/ingress-nginx"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants