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

federation: avoid double core group registration #42722

Merged

Conversation

sttts
Copy link
Contributor

@sttts sttts commented Mar 8, 2017

The federation apiserver installed its custom core group into the global pkg/api registry, leading to double registration. Luckily (or maybe unfortunately) we did not fail hard in this case, but the init funcs just ignored the error.

This PR creates an extra apigroup registry based on the already existing federation core.Scheme. This decouples the two core groups (which happen to co-exist in hyperkube).

@sttts sttts added kind/bug Categorizes issue or PR as related to a bug. sig/federation labels Mar 8, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 8, 2017
@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels Mar 8, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@sttts sttts added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Mar 8, 2017
@deads2k
Copy link
Contributor

deads2k commented Mar 8, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 8, 2017
@nikhiljindal
Copy link
Contributor

Is this for 1.6 or later?

@sttts
Copy link
Contributor Author

sttts commented Mar 9, 2017

@nikhiljindal I have not investigated whether there are any consequences like inconcistencies. Maybe the import order is hiding problems. wdyt?

@sttts sttts added this to the v1.7 milestone Mar 16, 2017
@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 30, 2017
@nikhiljindal
Copy link
Contributor

LGTM, thanks!

@nikhiljindal
Copy link
Contributor

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, nikhiljindal, sttts

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 3, 2017
@caesarxuchao
Copy link
Member

@k8s-bot gce etcd3 e2e test this

@caesarxuchao
Copy link
Member

Needs rebase.

@caesarxuchao
Copy link
Member

@sttts could you rebase this PR? #44171 depends on it :)

@sttts sttts force-pushed the sttts-federation-core-group branch from a84b8bd to dcb50aa Compare April 10, 2017 18:45
@k8s-github-robot k8s-github-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 10, 2017
@sttts
Copy link
Contributor Author

sttts commented Apr 10, 2017

could you rebase this PR?

Done.

@sttts sttts added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 10, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 43870, 30302, 42722, 43736)

@k8s-github-robot k8s-github-robot merged commit e864b31 into kubernetes:master Apr 10, 2017
@k8s-github-robot
Copy link

@sttts PR needs rebase

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 10, 2017
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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants