add kubeconfig types #2861

deads2k · 2014-12-11T14:53:20Z

Adds the ability to read a kubeconfig file (issue #1755).

Addresses #2644 to allow binding to different names and provides suggested names with a user specified prefix.

bgrant0607 · 2014-12-11T17:06:04Z

/cc @ghodss @jlowdermilk @derekwaynecarr @smarterclayton

deads2k · 2014-12-11T20:47:22Z

@smarterclayton simple renames squashed in. APIServer and APIVersion captialized. CmdBuilder clarified to FlagBasedBuilder. IsReady() renamed to Complete().

deads2k · 2014-12-15T21:34:00Z

@smarterclayton read path complete including merging and overriding.

deads2k · 2014-12-17T14:20:10Z

@smarterclayton Comments addressed except

Remove Client() method.

It does work when you won't want to skew server and client versions. If my intent is to get a client.Client for a particular server,authInfo pair, it doesn't seem unreasonable to provide checking that the client is likely to work. Sort of a validation check before returning. Given that we already have a flag for this in both kubernetes and openshift, it seems reasonable to have a common spot to have it checked. Using the factory doesn't seem very clean. That prevents this code from standing alone and the Factory in kubectl seems only tangentially related to what this code is trying to do.

deads2k · 2014-12-17T20:27:27Z

@smarterclayton moved match-server-version

derekwaynecarr · 2014-12-22T15:32:52Z

pkg/client/clientcmd/validation.go

+	return util.SliceToError(validationErrors)
+}
+
+// validateAuthInfo looks for conflicts and errors in the cluster info


validateClusterInfo looks for conflicts...

derekwaynecarr · 2014-12-22T15:36:03Z

minor nit on godoc, but looks good to me.

smarterclayton · 2014-12-22T15:43:54Z

Will look later today

On Dec 17, 2014, at 3:27 PM, David Eads notifications@github.com wrote:

@smarterclayton moved match-server-version

—
Reply to this email directly or view it on GitHub.

deads2k · 2014-12-22T19:34:27Z

@derekwaynecarr typo fixed.

deads2k · 2015-01-05T20:43:11Z

@ghodss @jlowdermilk This enables reading multiple cli configuration profiles #1755. Do you guys have comments?

j3ffml · 2015-01-05T22:20:40Z

pkg/client/clientcmd/client_builder.go

-func (builder *builder) Config() (*client.Config, error) {
-	if builder.config != nil {
-		return builder.config, nil
+// Client implements KubeConfig


Forget to delete this?

Forget to delete this?

Yes. Tidied up.

j3ffml · 2015-01-05T22:43:35Z

LGTM, this fits the design proposed in #1755 nicely. Just nits above.

Might be helpful to add a .md doc that includes an explanation of load order. Maybe cut/paste the text of the comment on getKubeConfig

deads2k · 2015-01-06T13:01:19Z

Might be helpful to add a .md doc that includes an explanation of load order.

@jlowdermilk Just a doc under kubernetes/docs?

smarterclayton · 2015-01-06T17:55:00Z

Some final comments (one substantial concern about validation, one gap with flag names), otherwise is in good shape to me.

deads2k · 2015-01-06T20:12:14Z

@smarterclayton Got the renames. I put the error type export in a separate commit so you can confirm that's how you want it.

deads2k · 2015-01-07T18:32:41Z

@smarterclayton tweaked, rebased, squashed.

smarterclayton · 2015-01-07T18:35:46Z

LGTM

add kubeconfig types

ClientConfig changed right as rollingupdate was introduced.

Fix inflight merge conflict by adapting rollingupdate to #2861

brendandburns · 2015-01-07T20:34:56Z

I think that this broke e2e because we didn't make changes to cluster turn up to write the appropriate config file.

brendandburns · 2015-01-07T20:36:05Z

I would lean towards rolling this back, and then have a re-revert with changes to kube-up function cluster/*/

Sorry!

zmerlynn · 2015-01-07T20:39:16Z

/sub (chasing this with @brendanburns)

deads2k · 2015-01-07T20:40:45Z

@brendanburns All command line flags were kept exactly the same and the file isn't supposed to be required, however vagrant e2e has always been hit or miss so I got the same results as I got on master and considered it good.

Would you like me to do the revert? Also, do you have a gist with the failure?

…ter_conflict Revert "Fix inflight merge conflict by adapting rollingupdate to #2861"

zmerlynn · 2015-01-07T20:44:17Z

The e2e failure looks about like this:

�[0;32mKubernetes cluster is running.  The master is running at:

�[0;33m  https://130.211.187.55

�[0;32mThe user name and password to use is located in ~/.kubernetes_auth.�[0m

... calling validate-cluster
Project: kubernetes-jenkins
Project: kubernetes-jenkins
Running: /jenkins-master-data/jobs/kubernetes-e2e-gce/workspace/kubernetes/cluster/../cluster/gce/../../cluster/../cluster/gce/../../cluster/../cluster/gce/../../platforms/linux/amd64/kubectl get minions -o template -t {{range.items}}{{.id}}
{{end}}
F0107 20:34:08.663798   22537 get.go:75] Get https://130.211.187.55/api/v1beta1/minions?namespace=default: x509: certificate signed by unknown authority
2015/01/07 20:34:08 Error running up: exit status 255
2015/01/07 20:34:08 Error starting e2e cluster. Aborting.
exit status 1

deads2k · 2015-01-07T20:54:47Z

Ok, well that's pretty bad. I see the problem. .kubernetes_auth contains information for the server to identify the user and information for the client to identify the server. I lost the latter half during a refactor.

I'll put together a change to restore that and show that succeeding. I'm sorry about this.

deads2k · 2015-01-07T21:43:05Z

@zmerlynn Forgive my ignorance, but is there an easy way for me to run e2e using the gke provider from outside google (getting started lists gce, but not gke)?

While there was a bug in respecting "Insecure" from a .kubernetes_auth file, that didn't affect the vagrant environment either way and I noticed that "--auth_path" is handled differently for gke depending on whether it is kubecfg of kubectl. Basically, it means that making sure auth for e2e runs properly vagrant (It did before too) doesn't mean that it will work on gke.

Alternatively, if the ~/.kubernetes_auth from your failing test had "Insecure":true, then we're golden.

deads2k force-pushed the deads-add-clicfg-types branch from 0f23338 to 379d5e8 Compare December 11, 2014 15:16

deads2k force-pushed the deads-add-clicfg-types branch from 379d5e8 to 43bff2b Compare December 11, 2014 20:45

deads2k force-pushed the deads-add-clicfg-types branch 2 times, most recently from e162676 to d8acc0a Compare December 15, 2014 21:33

deads2k force-pushed the deads-add-clicfg-types branch from d8acc0a to eb2fa2c Compare December 16, 2014 19:52

deads2k force-pushed the deads-add-clicfg-types branch from 30c1305 to 7f61ebc Compare December 17, 2014 14:32

derekwaynecarr reviewed Dec 22, 2014
View reviewed changes

smarterclayton mentioned this pull request Dec 22, 2014

Allow --api-version to properly override various default behaviors in CLI #2909

Merged

deads2k force-pushed the deads-add-clicfg-types branch 2 times, most recently from 4f3503d to 8405eb3 Compare December 22, 2014 21:30

erictune assigned smarterclayton Dec 23, 2014

deads2k force-pushed the deads-add-clicfg-types branch 3 times, most recently from c67192a to ffc4f5e Compare January 5, 2015 18:16

j3ffml reviewed Jan 5, 2015
View reviewed changes

j3ffml added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 5, 2015

deads2k force-pushed the deads-add-clicfg-types branch from ffc4f5e to ade2236 Compare January 6, 2015 12:49

deads2k closed this Jan 6, 2015

deads2k force-pushed the deads-add-clicfg-types branch from a1e7c03 to af1247c Compare January 6, 2015 20:45

goltermann mentioned this pull request Jan 7, 2015

Proposal: Rename --ns-path to --namespace-path #3148

Closed

deads2k force-pushed the deads-add-clicfg-types branch from af1247c to cece022 Compare January 7, 2015 17:58

bump(imdario/mergo):6633656539c1639d9d78127b7d47c622b5d7b6dc

12ecd0f

deads2k force-pushed the deads-add-clicfg-types branch from cece022 to 131deef Compare January 7, 2015 18:03

add kubeconfig file

0e688dc

deads2k force-pushed the deads-add-clicfg-types branch from 131deef to 0e688dc Compare January 7, 2015 18:09

smarterclayton added a commit that referenced this pull request Jan 7, 2015

Merge pull request #2861 from deads2k/deads-add-clicfg-types

585d2c8

add kubeconfig types

smarterclayton merged commit 585d2c8 into kubernetes:master Jan 7, 2015

smarterclayton mentioned this pull request Jan 7, 2015

Add a rollingupdate lib and command to kubectl #3061

Merged

smarterclayton added a commit to smarterclayton/kubernetes that referenced this pull request Jan 7, 2015

Fix inflight merge conflict by adapting rollingupdate to kubernetes#2861

e0f0b9c

ClientConfig changed right as rollingupdate was introduced.

deads2k deleted the deads-add-clicfg-types branch January 7, 2015 18:54

deads2k mentioned this pull request Jan 7, 2015

add kubectl config #3275

Merged

smarterclayton added a commit that referenced this pull request Jan 7, 2015

Merge pull request #3273 from smarterclayton/fix_master_conflict

41e7b25

Fix inflight merge conflict by adapting rollingupdate to #2861

deads2k mentioned this pull request Jan 7, 2015

fix build break #3277

Closed

brendandburns mentioned this pull request Jan 7, 2015

Revert "add kubeconfig types" #3282

Merged

brendandburns added a commit that referenced this pull request Jan 7, 2015

Revert "Fix inflight merge conflict by adapting rollingupdate to #2861"

cfffe70

brendandburns added a commit that referenced this pull request Jan 7, 2015

Merge pull request #3283 from GoogleCloudPlatform/revert-3273-fix_mas…

5963c17

…ter_conflict Revert "Fix inflight merge conflict by adapting rollingupdate to #2861"

deads2k mentioned this pull request Jan 8, 2015

add kubeconfig file properly #3316

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add kubeconfig types #2861

add kubeconfig types #2861

deads2k commented Dec 11, 2014

bgrant0607 commented Dec 11, 2014

deads2k commented Dec 11, 2014

deads2k commented Dec 15, 2014

deads2k commented Dec 17, 2014

deads2k commented Dec 17, 2014

derekwaynecarr Dec 22, 2014

derekwaynecarr commented Dec 22, 2014

smarterclayton commented Dec 22, 2014

deads2k commented Dec 22, 2014

deads2k commented Jan 5, 2015

j3ffml Jan 5, 2015

deads2k Jan 6, 2015

j3ffml commented Jan 5, 2015

deads2k commented Jan 6, 2015

smarterclayton commented Jan 6, 2015

deads2k commented Jan 6, 2015

deads2k commented Jan 7, 2015

smarterclayton commented Jan 7, 2015

brendandburns commented Jan 7, 2015

brendandburns commented Jan 7, 2015

zmerlynn commented Jan 7, 2015

deads2k commented Jan 7, 2015

zmerlynn commented Jan 7, 2015

deads2k commented Jan 7, 2015

deads2k commented Jan 7, 2015

add kubeconfig types #2861

add kubeconfig types #2861

Conversation

deads2k commented Dec 11, 2014

bgrant0607 commented Dec 11, 2014

deads2k commented Dec 11, 2014

deads2k commented Dec 15, 2014

deads2k commented Dec 17, 2014

deads2k commented Dec 17, 2014

derekwaynecarr Dec 22, 2014

Choose a reason for hiding this comment

derekwaynecarr commented Dec 22, 2014

smarterclayton commented Dec 22, 2014

deads2k commented Dec 22, 2014

deads2k commented Jan 5, 2015

j3ffml Jan 5, 2015

Choose a reason for hiding this comment

deads2k Jan 6, 2015

Choose a reason for hiding this comment

j3ffml commented Jan 5, 2015

deads2k commented Jan 6, 2015

smarterclayton commented Jan 6, 2015

deads2k commented Jan 6, 2015

deads2k commented Jan 7, 2015

smarterclayton commented Jan 7, 2015

brendandburns commented Jan 7, 2015

brendandburns commented Jan 7, 2015

zmerlynn commented Jan 7, 2015

deads2k commented Jan 7, 2015

zmerlynn commented Jan 7, 2015

deads2k commented Jan 7, 2015

deads2k commented Jan 7, 2015