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

remove deprecated validEgressSelectorNames 'master' #102242

Merged
merged 3 commits into from Sep 16, 2021
Merged

remove deprecated validEgressSelectorNames 'master' #102242

merged 3 commits into from Sep 16, 2021

Conversation

pacoxu
Copy link
Member

@pacoxu pacoxu commented May 24, 2021

What type of PR is this?

/kind cleanup
/kind deprecation

What this PR does / why we need it:

Which issue(s) this PR fixes:

Follow up of #95235
/cc andrewsykim

Special notes for your reviewer:

#94900 test related is still not done: only part one #100181

Does this PR introduce a user-facing change?

Remove 'master' as a valid EgressSelection type in the EgressSelectorConfiguration API.

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/apiserver kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels May 24, 2021
@fejta-bot
Copy link

This PR may require API review.

If so, when the changes are ready, complete the pre-review checklist and request an API review.

Status of requested reviews is tracked in the API Review project.

@pacoxu pacoxu force-pushed the controlplane-egress-selector branch from 0d643a0 to 6ff75d5 Compare May 25, 2021 05:29
@pacoxu
Copy link
Member Author

pacoxu commented May 25, 2021

/cc cheftako

@fedebongio
Copy link
Contributor

/assign @cheftako @caesarxuchao @Jefftree
/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels May 25, 2021
@pacoxu
Copy link
Member Author

pacoxu commented Jun 2, 2021

/priority important-soon
since it is targeting 1.22

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jun 2, 2021
@Jefftree
Copy link
Member

Jefftree commented Jun 2, 2021

I believe https://github.com/kubernetes/kubernetes/blob/master/cluster/gce/gci/configure-helper.sh#L938 and https://github.com/kubernetes/kubernetes/blob/master/cluster/gce/gci/configure-helper.sh#L956 will need to be updated as well.

@k8s-ci-robot k8s-ci-robot added area/provider/gcp Issues or PRs related to gcp provider sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. labels Jun 3, 2021
@pacoxu
Copy link
Member Author

pacoxu commented Jun 3, 2021

I believe https://github.com/kubernetes/kubernetes/blob/master/cluster/gce/gci/configure-helper.sh#L938 and https://github.com/kubernetes/kubernetes/blob/master/cluster/gce/gci/configure-helper.sh#L956 will need to be updated as well.

@Jefftree Forget to change gce scripts: cluster/gce/gci/configure-helper.sh. Thanks.
Updated.

@pacoxu pacoxu force-pushed the controlplane-egress-selector branch 2 times, most recently from e7c325c to c39a5b6 Compare September 15, 2021 08:47
pacoxu
pacoxu commented Sep 15, 2021
View reviewed changes
staging/src/k8s.io/apiserver/pkg/server/egressselector/config_test.go
@@ -527,7 +527,7 @@ func TestValidateEgressSelectorConfiguration(t *testing.T) {
},
},
{
Name: "master",
Name: "controlplane",
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 is dup test case.

Copy link
Member Author

Choose a reason for hiding this comment

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

Duplicate error is like
Calling ValidateEgressSelectorConfiguration expected error, got [service.connection[1]: Duplicate value: "controlplane"]--- PASS: TestValidateEgressSelectorConfiguration (0.00s)

@pacoxu pacoxu requested a review from liggitt September 15, 2021 08:58
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 15, 2021
@pacoxu pacoxu marked this pull request as draft September 15, 2021 11:45
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 15, 2021
@pacoxu pacoxu marked this pull request as ready for review September 15, 2021 13:20
@k8s-ci-robot k8s-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 Sep 15, 2021
@pacoxu
remove deprecated validEgressSelectorNames 'master'
6475783 
Signed-off-by: pacoxu <paco.xu@daocloud.io>
@pacoxu
update gce configure: replace deprecated egress name 'master' with 'c…
79941e7 
…ontrolplane'

Signed-off-by: pacoxu <paco.xu@daocloud.io>
@pacoxu
Copy link
Member Author

pacoxu commented Sep 15, 2021

/retest
fix the verify failure for code generating.

@liggitt
Copy link
Member

liggitt commented Sep 16, 2021

/lgtm
/approve

@liggitt liggitt added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Sep 16, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 16, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cheftako, liggitt, pacoxu

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 Sep 16, 2021
@liggitt liggitt added this to API review completed, 1.23 in API Reviews Sep 16, 2021
@k8s-ci-robot k8s-ci-robot merged commit a48a2ef into kubernetes:master Sep 16, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Sep 16, 2021
@ccampo133 ccampo133 mentioned this pull request Sep 16, 2021
Closed
ibabou pushed a commit to ibabou/kubernetes that referenced this pull request Sep 28, 2021
@pacoxu @ibabou
remove deprecated validEgressSelectorNames 'master' (kubernetes#102242)
e6e5e59 
* remove deprecated validEgressSelectorNames 'master'

Signed-off-by: pacoxu <paco.xu@daocloud.io>

* update gce configure: replace deprecated egress name 'master' with 'controlplane'

Signed-off-by: pacoxu <paco.xu@daocloud.io>

* add dup error for EgressSelection & fix converting alpha/beta to v1 name
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liggitt liggitt liggitt left review comments

@caesarxuchao caesarxuchao caesarxuchao left review comments

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

@cheftako cheftako Awaiting requested review from cheftako

@jpbetz jpbetz Awaiting requested review from jpbetz

Assignees

@cheftako cheftako

@liggitt liggitt

@caesarxuchao caesarxuchao

@Jefftree Jefftree

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/provider/gcp Issues or PRs related to gcp provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
API Reviews
Status: API review completed, 1.23
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@pacoxu @fejta-bot @fedebongio @Jefftree @cheftako @k8s-ci-robot @liggitt @caesarxuchao