Skip to content

update to kube 1.20#227

Merged
openshift-merge-robot merged 3 commits intoopenshift:masterfrom
danwinship:rebase-1.20
Dec 4, 2020
Merged

update to kube 1.20#227
openshift-merge-robot merged 3 commits intoopenshift:masterfrom
danwinship:rebase-1.20

Conversation

@danwinship
Copy link
Contributor

@danwinship danwinship commented Dec 4, 2020 •
edited
Loading

Update to s d n -4.7-kubernetes-1.20-rc.0. Obsoletes #219 (which it's partially based on)

/cc @tssurya

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 4, 2020
@danwinship
Copy link
Contributor Author

danwinship commented Dec 4, 2020

So the problem here (and probably in #219 too) is that it's not creating any iptables service rules...

@danwinship danwinship changed the title WIP update to kube 1.20 update to kube 1.20 Dec 4, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 4, 2020
@rcarrillocruz
Copy link
Contributor

rcarrillocruz commented Dec 4, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 4, 2020
@knobunc
Copy link
Contributor

knobunc commented Dec 4, 2020

/lgtm

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 4, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, knobunc, rcarrillocruz

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [danwinship,knobunc,rcarrillocruz]

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

@danwinship
Copy link
Contributor Author

danwinship commented Dec 4, 2020

/retest

@danwinship danwinship mentioned this pull request Dec 4, 2020
Closed
abhat
abhat reviewed Dec 4, 2020
View reviewed changes
pkg/openshift-sdn/proxy.go
}
return o.GetConfig(), nil

config := o.GetConfig()
Copy link
Contributor

@abhat abhat Dec 4, 2020

Choose a reason for hiding this comment

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

Is there a reason we can't disable the endpointslice featuregates in the config file itself, so we don't need the changes you added to readProxyConfig?

Otherwise LGTM.

Copy link
Contributor Author

@danwinship danwinship Dec 4, 2020

Choose a reason for hiding this comment

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

"because CI is on fire and I didn't want to try to get a CNO PR in too". But I'll fix that later...

@openshift-bot
Copy link
Contributor

openshift-bot commented Dec 4, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit e48f05e into openshift:master Dec 4, 2020
@danwinship danwinship deleted the rebase-1.20 branch December 8, 2020 12:31
@danwinship danwinship mentioned this pull request Mar 11, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tssurya tssurya Awaiting requested review from tssurya

1 more reviewer

@abhat abhat abhat left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@rcarrillocruz rcarrillocruz

@knobunc knobunc

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@danwinship @rcarrillocruz @knobunc @openshift-ci-robot @openshift-bot @abhat @openshift-merge-robot