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

Finish clustername removal #109602

Merged
merged 3 commits into from May 7, 2022
Merged

Finish clustername removal #109602

merged 3 commits into from May 7, 2022

Conversation

lavalamp
Copy link
Member

@lavalamp lavalamp commented Apr 21, 2022 •
edited by liggitt

This completes the work started in #108717. It should not merge until merges reopen for 1.25.

The compatibility test will fail until I run the command to update it, which I can't do until the tag for 1.24.0 exists.

The `metadata.clusterName` field is completely removed. This should not have any user-visible impact.

@k8s-ci-robot
Copy link
Contributor

Please note that we're already in Test Freeze for the release-1.24 branch. This means every merged PR has to be cherry-picked into the release branch to be part of the upcoming v1.24.0 release.

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. 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 area/code-generation approved Indicates a PR has been approved by an approver from all required OWNERS files. area/test kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API labels Apr 21, 2022
@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/testing Categorizes an issue or PR as relevant to SIG Testing. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 21, 2022
@k8s-triage-robot
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.

@enj enj added this to Needs Triage in SIG Auth Old Apr 25, 2022
@fedebongio
Copy link
Contributor

/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 Apr 26, 2022
@k8s-ci-robot k8s-ci-robot removed the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 4, 2022
liggitt
liggitt reviewed May 4, 2022
View reviewed changes
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go Outdated
// +optional
ZZZ_DeprecatedClusterName string `json:"clusterName,omitempty" protobuf:"bytes,15,opt,name=clusterName"`
// Tombstone: ClusterName was a legacy field that was always cleared by
// the system and never used. It consumed proto tag 15.
Copy link
Member

Choose a reason for hiding this comment

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

Include the json field name as well. In other places, we actually kept the full field declaration, just commented out... dunno if we want to do that here.

	// IPFamily is tombstoned to show why 15 is a reserved protobuf tag.
	// IPFamily *IPFamily `json:"ipFamily,omitempty" protobuf:"bytes,15,opt,name=ipFamily,Configcasttype=IPFamily"`

@liggitt
Copy link
Member

liggitt commented May 4, 2022

removal lgtm, one comment on the tombstone

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 5, 2022
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 5, 2022
@lavalamp
Copy link
Member Author

lavalamp commented May 5, 2022

ok, updated...

@liggitt
Copy link
Member

liggitt commented May 5, 2022

checked the diff on the fixture files was dropping tag 15:

--- /dev/fd/63	2022-05-05 16:03:00.000000000 -0400
+++ /dev/fd/62	2022-05-05 16:03:00.000000000 -0400
@@ -37,7 +37,6 @@
       7: 1
     }
     14: "14"
-    15: "15"
     17 {
       1: "16"
       2: "\351\220\212\345\224\212\351\243\231\305\236-U\345\234\264\303\267a/\311\224}\346\221\201(\346\271\227\304\206]"

looks like an extensions/v1beta1 NetworkPolicy type got missed in the fixture update? (unit test failure)

@liggitt
Copy link
Member

liggitt commented May 5, 2022

/approve

lgtm once the unit test is fixed

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lavalamp, liggitt

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

@lavalamp
Copy link
Member Author

lavalamp commented May 5, 2022

That's very weird, I'll run it again...

@lavalamp
Copy link
Member Author

lavalamp commented May 6, 2022

OK, figured it out.

@lavalamp
Copy link
Member Author

lavalamp commented May 6, 2022

Actually, wait, I probably have clobbered the base files and should double check that

@lavalamp
Copy link
Member Author

lavalamp commented May 6, 2022

OK I think everything should be right now.

@lavalamp
Copy link
Member Author

lavalamp commented May 6, 2022

/test pull-kubernetes-e2e-gce-ubuntu-containerd

@liggitt
Copy link
Member

liggitt commented May 7, 2022

/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 7, 2022
@k8s-ci-robot k8s-ci-robot merged commit 7af5a7b into kubernetes:master May 7, 2022
SIG Auth Old automation moved this from Needs Triage to Closed / Done May 7, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone May 7, 2022
@pohly pohly mentioned this pull request May 8, 2022
Closed
@github-actions github-actions bot mentioned this pull request May 11, 2022
Open
@atiratree atiratree mentioned this pull request Jul 18, 2022
Merged
@STRRL STRRL mentioned this pull request Sep 19, 2022
Merged
11 tasks
@aojea aojea mentioned this pull request Oct 29, 2022
Closed
@BradNicolle BradNicolle mentioned this pull request Sep 14, 2023
Merged
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

@aojea aojea Awaiting requested review from aojea

@caesarxuchao caesarxuchao Awaiting requested review from caesarxuchao

Assignees

@liggitt liggitt

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/code-generation area/test 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 lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. 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/apps Categorizes an issue or PR as relevant to SIG Apps. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Auth
Archived in project
SIG Auth Old
Closed / Done
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@lavalamp @k8s-ci-robot @k8s-triage-robot @fedebongio @liggitt @deads2k