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

Futher storage isolation and removal of the tools interface. #18383

Merged
merged 1 commit into from
Dec 11, 2015

Conversation

timothysc
Copy link
Member

This completes the removal of the tools.interface and adds mechanics to allow for multiple back-ends via a Config interface.

@wojtek-t & @karlkfi | @jdef for review, as it touches their areas.

@k8s-github-robot k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 8, 2015
@k8s-github-robot
Copy link

Labelling this PR as size/L

@wojtek-t
Copy link
Member

wojtek-t commented Dec 8, 2015

Will take a look tomorrow.

@karlkfi
Copy link
Contributor

karlkfi commented Dec 8, 2015

Why do we have a forked go-etcd?
Is that what's allowing us to remove our client interface?
Trading a util package and interface for a fork to maintain doesn't seem like an improvement...

@timothysc
Copy link
Member Author

@karlkfi - The fork has nothing to do with changes to your code, they are shuffling to isolate the dependency which existed in the startup of the apiserver. Post shuffle, the dependencies will be upgraded &| eliminated, this is more about encapsulation to enable other work.

The modifications to the mesos code are simply to remove the tools dependency.

@k8s-bot
Copy link

k8s-bot commented Dec 8, 2015

GCE e2e test build/test passed for commit ebb768df52c40554ccf2fda69e9cb1fe0b6cc367.

@k8s-bot
Copy link

k8s-bot commented Dec 8, 2015

GCE e2e test build/test passed for commit 57ab3e354af274a0c957e381b87a40ff4650bd1a.

if !reflect.DeepEqual(client.calls, expectedCalls) {
t.Errorf("unexpected calls: %#v", client.calls)
}
w_ldr.Stop()
Copy link
Contributor

Choose a reason for hiding this comment

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

do we not need to show that the calls happened in the expected order?

Copy link
Member Author

Choose a reason for hiding this comment

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

I would argue no, b/c the goal of the test is to check that (X) is not the leader.

Operational ordering imho was a false test that wrapped the tool.interface.

@wojtek-t
Copy link
Member

wojtek-t commented Dec 9, 2015

The changes outside mesos code lgtm (just very minor comments).

@wojtek-t
Copy link
Member

wojtek-t commented Dec 9, 2015

LGTM from mi side (I'm waiting for @karlkfi for confirmation if he is also fine with it)

@k8s-bot
Copy link

k8s-bot commented Dec 9, 2015

GCE e2e test build/test passed for commit 836dfd7ddd703dd37e2e13e8ee657ce31c442c02.

@jdef
Copy link
Contributor

jdef commented Dec 9, 2015

lgtm

@timothysc
Copy link
Member Author

@wojtek-t PTAL for lgtm apply.

@wojtek-t
Copy link
Member

wojtek-t commented Dec 9, 2015

Generated docs are out of date. Please run hack/update-generated-docs.sh
!!! Error in hack/verify-generated-docs.sh:28
'"${KUBE_ROOT}/hack/after-build/verify-generated-docs.sh" "$@"' exited with status 1

@timothysc - can you please fix it?

@timothysc
Copy link
Member Author

@wojtek-t done.

@wojtek-t wojtek-t added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 9, 2015
@wojtek-t
Copy link
Member

wojtek-t commented Dec 9, 2015

LGTM

@k8s-bot
Copy link

k8s-bot commented Dec 9, 2015

GCE e2e test build/test passed for commit 413d8d1.

@k8s-github-robot
Copy link

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

@k8s-bot
Copy link

k8s-bot commented Dec 11, 2015

GCE e2e test build/test passed for commit 413d8d1.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Dec 11, 2015
@k8s-github-robot k8s-github-robot merged commit d3243b8 into kubernetes:master Dec 11, 2015
@@ -234,7 +230,6 @@ func (s *APIServer) AddFlags(fs *pflag.FlagSet) {
fs.StringVar(&s.AdmissionControl, "admission-control", s.AdmissionControl, "Ordered list of plug-ins to do admission control of resources into cluster. Comma-delimited list of: "+strings.Join(admission.GetPlugins(), ", "))
fs.StringVar(&s.AdmissionControlConfigFile, "admission-control-config-file", s.AdmissionControlConfigFile, "File with admission control configuration.")
fs.StringSliceVar(&s.EtcdServerList, "etcd-servers", s.EtcdServerList, "List of etcd servers to watch (http://ip:port), comma separated. Mutually exclusive with -etcd-config")
fs.StringVar(&s.EtcdConfigFile, "etcd-config", s.EtcdConfigFile, "The config file for the etcd client. Mutually exclusive with -etcd-servers.")
Copy link
Member

Choose a reason for hiding this comment

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

This is a breaking change... we now have no way to run against a secured etcd. I know the client lib no longer supports the config file, but we have to (even if it means deserializing the file and building the etcd client config ourselves)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.

10 participants