Commit Graph

1299 Commits

Author SHA1 Message Date
Zach Loafman
854c20c5e2 Merge pull request #7113 from erictune/kube-proxy-token
Added kube-proxy token.
2015-04-22 09:16:04 -07:00
Matt Bruzek
35301bbcfd Merge branch 'add-charms' of github.com:mbruzek/kubernetes into add-charms
Resolved conflicts in:
	cluster/juju/util.sh
2015-04-22 10:36:42 -05:00
Matt Bruzek
af15d6d614 Removed the need for an extra python file. i
- Formatted for consistency
- Used different variables for juju directory
2015-04-22 10:31:26 -05:00
Matt Bruzek
3342bb42e0 Removed extra c in path to distro files. 2015-04-22 10:29:55 -05:00
Matt Bruzek
5f59e167fd Editing the local bundle to use github. 2015-04-22 10:29:07 -05:00
Whit Morriss
0ab77ae8be line formatting 2015-04-22 09:40:47 -05:00
Whit Morriss
a57a64781a scripting tweaks
- use absolute path for kube_root (fixes JUJU_REPOSITORY directory creation issue) - shortcircuit status polling (for rerunning kubeup)
 - more granular polling iterations
2015-04-22 09:40:47 -05:00
Whit Morriss
cc81044230 use git copy of docker charms for debugging 2015-04-22 09:40:47 -05:00
Filip Grzadkowski
780db9d794 Wait for minion to start even if gcloud command fails. 2015-04-22 16:37:22 +02:00
CJ Cullen
e982ac5b55 Change kube2sky to use token-system-dns secret, point at https endpoint (instead of kubernetes-ro service). 2015-04-21 23:10:12 -07:00
fabioy
acb64e66e8 Fix validate-cluster.sh to work on Mac. 2015-04-21 17:51:35 -07:00
Brendan Burns
78dabbdb7f Fix the ssh-to-node to actually fail on failures. 2015-04-21 15:27:38 -07:00
Brendan Burns
71e6b05825 Fix kube-apiserver restart. 2015-04-21 15:11:00 -07:00
Matt Bruzek
9ca54b3cb6 Merge branch 'master' of github.com:GoogleCloudPlatform/kubernetes into add-charms 2015-04-21 16:55:00 -05:00
Matt Bruzek
9d21292646 Changing bundle to v0.15.0 and docker git head. 2015-04-21 16:50:47 -05:00
Matt Bruzek
60e0a77a0c Removing cadvisor and normalizing python quotes. 2015-04-21 16:46:21 -05:00
Robert Bailey
0035781c50 Merge pull request #7137 from brendandburns/fix
Fix kube-apiserver restart.
2015-04-21 14:33:54 -07:00
Brendan Burns
9d715226d6 Fix kube-apiserver restart. 2015-04-21 13:59:26 -07:00
Robert Bailey
8745ebce15 Revert "Rollback "validate-cluster.sh" to previous version." 2015-04-21 13:30:16 -07:00
Robert Bailey
b9904f63d4 Merge pull request #7124 from fabioy/revert-validate.fix
Rollback "validate-cluster.sh" to previous version.
2015-04-21 12:29:54 -07:00
Robert Bailey
a50e02bb3b Merge pull request #7078 from jlowdermilk/gke-kubectl
Use standalone kubectl for gke, remove special case for vagrant
2015-04-21 12:11:45 -07:00
Fabio Yeon
12db42e4f0 Rollback "validate-cluster.sh" to previous version. 2015-04-21 12:09:34 -07:00
Jeff Lowdermilk
70a576e25a Use standalone kubectl for gke, remove special case for vagrant
also fix hack/local-up-cluster.sh kubeconfig instructions
2015-04-21 11:01:45 -07:00
Eric Tune
b944049fe9 Merge pull request #6916 from ArtfulCoder/controller-in-a-pod
kube-controller-manager in a pod.
2015-04-21 09:58:29 -07:00
Eric Tune
2ca8a9d15d Added kube-proxy token.
Generates the new token on AWS, GCE, Vagrant.
Renames instance metadata from "kube-token" to "kubelet-token".
(Is this okay for GKE?)

Having separate tokens for kubelet and kube-proxy permits
using principle of least privilege, makes it easy to
rate limit the clients separately, allows annotation
of apiserver logs with the client identity at a finer grain
than just source-ip.
2015-04-21 09:21:31 -07:00
Matt Bruzek
c1a56187b8 Removing debug statements from the python code. 2015-04-21 11:02:47 -05:00
Matt Bruzek
85e0e9d6c7 Adding a slash to continue the line. 2015-04-21 11:02:02 -05:00
Eric Tune
7475efbcfb Extend PR#5470 for AWS and Vagrant 2015-04-21 08:22:31 -07:00
Justin Santa Barbara
29592356f7 Rename salt minion_ip to hostname_override
Prep work for making AWS node identifier -> instance id
2015-04-21 06:24:49 -07:00
Derek Carr
b5d9afd093 Merge pull request #7099 from derekwaynecarr/fix_vagrant
Fix vagrant regression from 6691
2015-04-21 00:45:30 -04:00
derekwaynecarr
3fc627e416 Fix vagrant regression from 6691 2015-04-21 00:44:44 -04:00
Justin Santa Barbara
45b658ea7c AWS: don't try to create undefined config_dir 2015-04-20 19:14:16 -07:00
Brian Grant
9dcf3e0a33 Merge pull request #7082 from fabioy/api-cs.fix
Fixed "componentstatuses" API object JSON descriptions.
2015-04-20 18:10:36 -07:00
CJ Cullen
1be193098a Merge pull request #7072 from dchen1107/cleanup
Remove fqdn dependency for node name
2015-04-20 18:00:21 -07:00
Fabio Yeon
81ef0198f4 Fixed "componentstatuses" API object JSON descriptions. 2015-04-20 17:28:13 -07:00
Vish Kannan
db7a56529f Merge pull request #7077 from brendandburns/hyperkube
Update docker examples to 0.15.0
2015-04-20 19:48:49 -04:00
CJ Cullen
ae3a0fe661 Merge pull request #7055 from erictune/kubeconfig-secrets
Create system secrets in kubeconfig format
2015-04-20 16:42:35 -07:00
Abhishek Shah
f513aad380 kube-controller-manager in a pod. 2015-04-20 16:06:37 -07:00
Brendan Burns
8c947de4e2 Update docker examples to 0.15.0 2015-04-20 15:40:08 -07:00
Matt Bruzek
f201379938 Merge pull request #1 from whitmo/new-cadvisor-port
Change cadvisor port and point kubelet to find it
2015-04-20 17:17:18 -05:00
Whit Morriss
7b3534e012 move cadvisor port to 4193 to avoid collision with kubelet 2015-04-20 17:07:19 -05:00
Eric Tune
c3203cba6d Create system secrets in kubeconfig format
Was previously kubernetes_auth format.

Added defaults file which uses salt to fill in an env var
with the master's IP.

More thought needs to be given soon to how to make this
connection use a cert for the master, and how to support
multiple masters, and whether to use the DNS record
instead of an IP address.  But this PR unblocks some other
more urgent things, so doing it this way.
2015-04-20 15:02:45 -07:00
Matt Bruzek
a5da3708d2 Removing old docs, setting latest false on docker 2015-04-20 17:00:41 -05:00
Matt Bruzek
7802db4862 Added protetecion if the arguments are not there. 2015-04-20 16:57:42 -05:00
Matt Bruzek
3dd62a5c65 Log the JSON output from BASH 2015-04-20 16:55:08 -05:00
Kenjiro Nakayama
2e702b0c61 Replace hostname -f with uname -n 2015-04-20 14:16:21 -07:00
Robert Bailey
82190a58b1 Merge pull request #7026 from justinsb/aws_use_ssl_for_salt
AWS: master should download salt using SSL
2015-04-20 11:58:47 -07:00
Jeff Lowdermilk
196b3d066d Merge pull request #6919 from zmerlynn/sharded-e2e
Add hack/parallel-e2e.sh to run hack/e2e.go on multiple clusters
2015-04-20 11:34:18 -07:00
Brendan Burns
7f75c982ce Merge pull request #6691 from jlowdermilk/gen-kubeconfig
Generate kubeconfig for all providers in cluster/ that use auth
2015-04-20 11:28:36 -07:00
Brendan Burns
e079e23e47 Merge pull request #6597 from fabioy/kubectl-validate
Add "kubectl validate" command to do a cluster health check.
2015-04-20 11:21:06 -07:00