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

use separate scheme to serve the kube-aggregator #42672

Merged

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Mar 7, 2017

This removes a hack which used the client scheme to serve the kube-aggregator. This switches it to run from its own scheme.

@kubernetes/sig-api-machinery-pr-reviews
@ncdc

@deads2k deads2k added this to the v1.7 milestone Mar 7, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 7, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: deads2k

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

We suggest the following people:
cc
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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Mar 7, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 7, 2017
@ncdc ncdc added release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. labels Mar 9, 2017
)

func init() {
Copy link
Member

Choose a reason for hiding this comment

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

Is there a way to do this in a normal func instead of init?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is there a way to do this in a normal func instead of init?

Maybe. We've always initialized a scheme on init, you want to change it to run through an accessor calling a func using a global sync.Once? I can if you feel strongly.

Copy link
Member

Choose a reason for hiding this comment

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

It's not like you're differing from current patterns. Long-term, I'd like to get away from init but it's fine for now.

func init() {
install.Install(groupFactoryRegistry, registry, Scheme)

// we need to add the options to empty v1
Copy link
Member

Choose a reason for hiding this comment

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

what options?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

what options?

Adds options objects to the scheme.

Copy link
Member

Choose a reason for hiding this comment

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

Like ListOptions?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Like ListOptions?

yes

install.Install(groupFactoryRegistry, registry, Scheme)

// we need to add the options to empty v1
metav1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
Copy link
Member

Choose a reason for hiding this comment

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

Specify explicit Group: ""

Copy link
Member

Choose a reason for hiding this comment

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

Or use unversioned from the next line

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Specify explicit Group: ""

ok

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Or use unversioned from the next line

these are logically distinct, so separation makes sense.

Copy link
Member

Choose a reason for hiding this comment

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

But they are identical, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But they are identical, right?

For now

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done and clarified the comment.

@ncdc
Copy link
Member

ncdc commented Mar 9, 2017

Only minor comments. Do we have any tests (maybe integration?) that can catch any possible regressions in the aggregator apiserver?

@deads2k
Copy link
Contributor Author

deads2k commented Mar 9, 2017

Only minor comments. Do we have any tests (maybe integration?) that can catch any possible regressions in the aggregator apiserver?

Yes. We have an integration test that fires it up and makes sure it can create APIService resources.

@deads2k deads2k added approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Mar 9, 2017
@deads2k
Copy link
Contributor Author

deads2k commented Mar 9, 2017

@k8s-bot kops aws e2e test this
@k8s-bot cvm gce e2e test this

@deads2k
Copy link
Contributor Author

deads2k commented Mar 14, 2017

@k8s-bot gce etcd3 e2e test this

@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 25, 2017
@fejta fejta removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 25, 2017
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 42672, 42770, 42818, 42820, 40849)

@k8s-github-robot k8s-github-robot merged commit f11258a into kubernetes:master Mar 25, 2017
@k8s-ci-robot
Copy link
Contributor

@deads2k: The following test(s) failed:

Test name Commit Details Rerun command
Jenkins Bazel Build 1dc8ae9 link @k8s-bot bazel test this
Jenkins kops AWS e2e 1dc8ae9 link @k8s-bot kops aws e2e test this

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

k8s-github-robot pushed a commit that referenced this pull request Mar 27, 2017
Automatic merge from submit-queue (batch tested with PRs 43694, 41262, 42911)

combine kube-apiserver and kube-aggregator

This combines several pulls currently in progress and wires them together.  The aggregator sits in front of the normal kube-apiserver and allows local fallthrough instead of proxying.

@kubernetes/sig-api-machinery-misc 
@DirectXMan12 since you seem invested, your life will get easier
@luxas FYI since you've started trying to wire something together.  



Dependent Pulls LGTM:
- [x] #42801
- [x] #42886
- [x] #42900
- [x] #42732
- [x] #42672
- [x] #43141
- [x] #43076
- [x] #43149
- [x] #43226
- [x] #43144
@deads2k deads2k mentioned this pull request Mar 28, 2017
12 tasks
@deads2k deads2k deleted the agg-24-use-custom-scheme branch August 3, 2017 20:07
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants