Commit Graph

1200 Commits (37040fb0e37d5cb6cafaa0aaa2622e01c98bdef6)

Author SHA1 Message Date
Robert Bailey 846ffcff83 Pass the CA root cert into the apiserver so that the apiserver will
perform client cert checks for authorization. Only enable on GCE where
the apiserver is terminating SSL connections from end users.
2015-04-24 22:01:56 -07:00
saadali acbd3d78f1 Specify host/container ports for InfluxDB, so that the UI is accessible. 2015-04-24 16:22:50 -07:00
Rohit Jnagal d60c86a3a7 Fix the binary path reported by get-kube script. 2015-04-24 21:31:21 +00:00
Brian Grant 60d7bad147 Merge pull request #7128 from nikhiljindal/fixbeta1tests
Removing more references to v1beta1 from pkg/
2015-04-24 11:07:53 -07:00
Satnam Singh b6bee06c20 Merge pull request #7269 from zmerlynn/lose_one_sanity
Remove buggy GCE post turn-up cluster validation code (rely on validate-cluster.sh)
2015-04-24 10:56:20 -07:00
Brendan Burns 49977e6a47 Revert "Update docker examples to 0.15.0" 2015-04-24 10:05:27 -07:00
Dawn Chen 2128d4e251 Merge pull request #7261 from erictune/kube_env
Pass KUBELET_TOKEN in kube-env metadata.
2015-04-24 10:03:34 -07:00
Nikhil Jindal 84cb48be11 Merge pull request #7246 from satnam6502/es
Convert Elasticsearch logging to v1beta3 and de-salt
2015-04-24 09:21:41 -07:00
nikhiljindal dcc368c781 Removing more references to v1beta1 from pkg/ 2015-04-24 00:45:17 -07:00
CJ Cullen 80af1c9e40 kube2sky using kubeconfig secret: take 2. Point system secrets at https://kubernetes. Override in clients that can't use DNS. 2015-04-23 18:13:16 -07:00
David Oppenheimer dda010b572 Merge pull request #7240 from satnam6502/v1beta3
Update Kibana RC and service to v1beta3
2015-04-23 17:09:27 -07:00
Zach Loafman ad829dead7 Remove buggy GCE post turn-up cluster validation code (rely on validate-cluster.sh)
Fixes #7266
2015-04-23 16:28:44 -07:00
Eric Tune e8a83b23d1 Pass KUBELET_TOKEN in kube-env metadata.
ensure-kube-token is not needed anymore because
the token passed in kube-env.

In the up case it is set, in the push case it is an empty string
but not used.

Allow unset KUBELET_TOKEN (for push case).

Fix comment.
2015-04-23 15:21:27 -07:00
Satnam Singh c9b9e7651e Convert Elasticsearch logging to v1beta and de-salt 2015-04-23 13:06:15 -07:00
Satnam Singh 0abc34245a Update Kibana RC and service to v1beta3 2015-04-23 12:19:17 -07:00
Derek Carr fade245a44 Merge pull request #7220 from jsafrane/devel/fix-vagrant
V2: Fix vagrant setup broken by commit 7475efbcfb.
2015-04-23 14:49:31 -04:00
Dawn Chen f9156c281a Merge pull request #7123 from satnam6502/logging
Propagate pod and container name for log files
2015-04-23 10:13:08 -07:00
Joakim Gustin 645d6d1f26 Use existing subnet when launching AWS cluster in existing VPC 2015-04-23 11:01:17 +02:00
Jan Safranek 1c8f888477 Fix vagrant setup broken by commit 7475efbcfb.
- 'local' can be used only inside bash functions
- s/KNOWN_TOKENS_FILE/known_tokens_file
2015-04-23 11:00:10 +02:00
Wojciech Tyczynski cf824ae5e0 Merge pull request #7164 from fgrzadkowski/fix_wait_minion
Wait for minion to start even if gcloud command fails.
2015-04-23 08:21:19 +02:00
Justin Santa Barbara 9253ae6dca AWS: Fix some bash style problems: variable quoting & locals 2015-04-22 18:30:09 -07:00
Fabio Yeon 0a0bd88db6 Revert "Change kube2sky to use token-system-dns secret, point at https endpoint ..." 2015-04-22 17:56:34 -07:00
Satnam Singh e4e830badc Update Kibana pod to speak to Elasticsearchusing v1beta3 2015-04-22 17:37:47 -07:00
Fabio Yeon 3ed2dcae68 Merge pull request #7197 from roberthbailey/fix-restart-apiserver
Fix the restart-apiserver command for GCE/GKE.
2015-04-22 15:52:14 -07:00
Robert Bailey 6951bb0bd5 Fix the restart-apiserver command for GCE/GKE. 2015-04-22 15:21:13 -07:00
Satnam Singh 2444c1f943 Propagate pod and container name for log files 2015-04-22 15:08:51 -07:00
Matt Bruzek ee2d43ac35 Changing the copyright to the Google. 2015-04-22 16:41:03 -05:00
Matt Bruzek dce5f28a63 Changing the copyright to the Google. 2015-04-22 16:40:16 -05:00
Dawn Chen 87e0d5da08 Merge pull request #7186 from ArtfulCoder/no_log_pod_on_master
removed elasticsearch and fluentd-gcp pods from master
2015-04-22 14:40:07 -07:00
Matt Bruzek cdc671a86f Setting the default release number to v0.15.0 2015-04-22 16:39:36 -05:00
Robert Bailey 4346c6ecae Swallow the output from the test ssh connections so that it
doesn't interfere with string comparison.
2015-04-22 14:19:15 -07:00
CJ Cullen 924015dc94 Merge pull request #7182 from justinsb/aws_fix_hostname
AWS: Set hostname_override for minions, back to fully-qualified name
2015-04-22 14:13:53 -07:00
Zach Loafman 26aeb6c370 Merge pull request #6618 from roberthbailey/no-nginx
Salt reconfiguration to get rid of nginx on GCE
2015-04-22 13:59:12 -07:00
Matt Bruzek 60f678be32 Merge branch 'master' of github.com:GoogleCloudPlatform/kubernetes into add-charms 2015-04-22 15:07:49 -05:00
Matt Bruzek b69792535d Updating guestbook with the v1beta3 json files. 2015-04-22 15:05:46 -05:00
Abhishek Shah 8cf11fd608 removed elasticsearch and fluentd-gcp pods from master 2015-04-22 12:54:57 -07:00
Brendan Burns ee34d4942b Merge pull request #6576 from jeffmendoza/azure-loop
Azure: Wait for salt completion on cluster initialization
2015-04-22 12:51:40 -07:00
Matt Bruzek b4766bb380 Removing unneeded status check before juju deployer 2015-04-22 14:45:50 -05:00
Robert Bailey 35a18e35c3 Merge pull request #7154 from cjcullen/readonly
Change kube2sky to use token-system-dns secret, point at https endpoint ...
2015-04-22 12:41:53 -07:00
Justin Santa Barbara 4120849cc4 AWS: Set hostname_override for minions, back to fully-qualified name
This is a stop-gap fix; we'd really like to use EC2 instance ids, but that is
blocked by #7092 or changing that health-check to not assume that the node name
is resolvable.

This stop-gap essentially reverts #7072 for AWS
2015-04-22 11:28:53 -07:00
Robert Bailey dc45f7f9e6 Remove nginx and replace basic auth with bearer token auth for GCE.
- Configure the apiserver to listen securely on 443 instead of 6443.
 - Configure the kubelet to connect to 443 instead of 6443.
 - Update documentation to refer to bearer tokens instead of basic auth.
2015-04-22 11:11:20 -07:00
Robert Bailey 4ca8fbbec6 Merge pull request #7147 from fabioy/validate.fix
Fix validate-cluster.sh to work on Mac.
2015-04-22 11:06:46 -07:00
Zach Loafman 86468cd29d Revert "Added kube-proxy token." 2015-04-22 10:55:08 -07:00
Matt Bruzek 450f1f0215 Using readlink instead of realpath. 2015-04-22 12:53:30 -05:00
Zach Loafman 0e3e502d52 Fix unbound variable after #7146 2015-04-22 10:19:53 -07:00
Zach Loafman 42e1710ccf Fix build after #7146 2015-04-22 10:11:19 -07:00
Zach Loafman c9988db0ee Merge pull request #7146 from brendandburns/get-k8s
Extend the get-cluster.sh script to use sudo if necessary.
2015-04-22 09:58:07 -07:00
Brendan Burns 42121d1809 Extend the get-cluster.sh script to use sudo if necessary. 2015-04-22 09:52:44 -07:00
Matt Bruzek dbca4bf5dd Using python to parse the json output from Juju. 2015-04-22 11:36:37 -05:00
Matt Bruzek 5deef09178 Exporting master and minion variables and calling detect methods in kube-up. 2015-04-22 11:35:49 -05:00
Zach Loafman b98f93bb4b Merge pull request #7112 from erictune/kubeconfig-secrets
Extend PR#5470 for AWS and Vagrant
2015-04-22 09:25:53 -07:00
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