github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
59,577 Commits 1 Branch 31 Tags
14d01883ed435d8604cb153899ebb91bf23fdd31
Commit Graph

6790 Commits

Author SHA1 Message Date
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