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

Remove generic ingress reconciler and adjust code layout to look like all others. #6002

Merged

Conversation

markusthoemmes
Copy link
Contributor

Proposed Changes

This removes the BaseIngressReconciler and instead sets the entire reconciler and controller up in the same way as all the other reconcilers we have. Initialization logic has been moved into controller.go completely, unnecessary abstractions have been removed.

I was on the fence to break this down into smaller bits. Please let me know if you want me to do that and think this is not reviawable as-is.

Release Note

NONE

/assign @wtam @tcnghia

… all others.

This removes the BaseIngressReconciler and instead sets the entire reconciler and controller up in the same way as all the other reconcilers we have. Initialization logic has been moved into `controller.go` completely, unnecessary abstractions have been removed.
@knative-prow-robot
Copy link
Contributor

@markusthoemmes: GitHub didn't allow me to assign the following users: wtam.

Note that only knative members, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

Proposed Changes

This removes the BaseIngressReconciler and instead sets the entire reconciler and controller up in the same way as all the other reconcilers we have. Initialization logic has been moved into controller.go completely, unnecessary abstractions have been removed.

I was on the fence to break this down into smaller bits. Please let me know if you want me to do that and think this is not reviawable as-is.

Release Note

NONE

/assign @wtam @tcnghia

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.

@googlebot googlebot added the cla: yes Indicates the PR's author has signed the CLA. label Nov 11, 2019
@knative-prow-robot knative-prow-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. area/API API objects and controllers area/networking labels Nov 11, 2019
Copy link
Contributor

@knative-prow-robot knative-prow-robot left a comment

Choose a reason for hiding this comment

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

@markusthoemmes: 2 warnings.

In response to this:

Proposed Changes

This removes the BaseIngressReconciler and instead sets the entire reconciler and controller up in the same way as all the other reconcilers we have. Initialization logic has been moved into controller.go completely, unnecessary abstractions have been removed.

I was on the fence to break this down into smaller bits. Please let me know if you want me to do that and think this is not reviawable as-is.

Release Note

NONE

/assign @wtam @tcnghia

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.

pkg/reconciler/ingress/ingress.go Outdated Show resolved Hide resolved
pkg/reconciler/ingress/ingress.go Show resolved Hide resolved
@knative-prow-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: markusthoemmes

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

@knative-prow-robot knative-prow-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 11, 2019
@knative-metrics-robot
Copy link

The following is the coverage report on the affected files.
Say /test pull-knative-serving-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/reconciler/ingress/controller.go 100.0% 82.5% -17.5
pkg/reconciler/ingress/ingress.go 84.9% 84.8% -0.1

@wtam2018
Copy link
Contributor

/lgtm

@knative-prow-robot
Copy link
Contributor

@wtam2018: changing LGTM is restricted to collaborators

In response to this:

/lgtm

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.

@nak3
Copy link
Contributor

nak3 commented Nov 12, 2019

I'm curious if we can stop using IngressAccessor. It was introduced for migration to Ingres from ClusterIngress in #4581 but ClusterIngress was already cleaned up.

It might be better to do that in another PR if we can?

@markusthoemmes
Copy link
Contributor Author

@nak3 we absolutely can. I have a second branch setup to do just that. It's quite the diff as well though, so I decided to move that out as this is already big enough.

@nak3
Copy link
Contributor

nak3 commented Nov 12, 2019

Oh, I see. Sounds great!
LGTM for this PR then.

@tcnghia
Copy link
Contributor

tcnghia commented Nov 12, 2019

/lgtm

@knative-prow-robot knative-prow-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 12, 2019
@knative-test-reporter-robot

The following jobs failed:

Test name Triggers Retries
pull-knative-serving-unit-tests 0/3

Failed non-flaky tests preventing automatic retry of pull-knative-serving-unit-tests:

pkg/activator/net.TestThrottlerWithError
pkg/activator/net.TestThrottlerWithError/both_requests_time_out

@nak3
Copy link
Contributor

nak3 commented Nov 12, 2019

/test pull-knative-serving-unit-tests

@knative-prow-robot knative-prow-robot merged commit ec657e7 into knative:master Nov 13, 2019
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. area/API API objects and controllers area/networking cla: yes Indicates the PR's author has signed the CLA. lgtm Indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants