Commit Graph

955 Commits

Author SHA1 Message Date
Derek Carr
2af9b54147 Merge pull request #6259 from zmerlynn/fix_cloud_provider
Eliminate grains.cloud_provider (in preference to grains.cloud) from SaltStack
2015-04-01 17:04:05 -04:00
Robert Bailey
40ebed845f Remove salt configuration that matches the default settings in
the Kubelet.
2015-04-01 12:13:40 -07:00
Abhishek Shah
8e3a41b52c Run etcd 2.0.5 in a pod 2015-04-01 11:38:21 -07:00
Zach Loafman
b581320bf7 Eliminate grains.cloud_provider (in preference to grains.cloud) from SaltStack
This variable can be entirely derived from grains.cloud, and it
simplifies the configuration somewhat. (Or someone convince me I'm
wrong. I'm happy to be wrong here.)
2015-04-01 08:32:32 -07:00
Satnam Singh
73a9ab2928 Rename logging image to use google_containers 2015-03-31 16:00:52 -07:00
Victor Marmol
f0b3493c26 Merge pull request #6240 from zmerlynn/fix_apiservers
s/apiservers/api_servers/ in Salt
2015-03-31 13:06:09 -07:00
Zach Loafman
6c219885e0 s/apiservers/api_servers/ in Salt
It looks like api_servers finally won this battle. Kill off the
last remaining places passing it, but allow the kubelet Salt to
accept apiservers for a period of time.

(This was bothering my OCD.)
2015-03-31 12:29:46 -07:00
Abhishek Shah
541219db77 Retry kube-addons creation if kube-addons creation fails. 2015-03-30 18:14:54 -07:00
Robert Bailey
bc8af553a3 Configure the kubelet to bind a simple healthz server to a localhost
port for monitoring by monit. This is in preparation for the standard
kubelet port to switch to SSL only (and eventually to only accepting
connections on the SSL port that present a proper client SSL cert).

Also standardize the formatting of the monit config files a bit.
2015-03-30 14:20:30 -07:00
Victor Marmol
b9214d4fcf Merge pull request #6122 from satnam6502/fluentd-gcp
Update Salt config to use gcr.io Fluentd to Cloud Logging agent
2015-03-30 08:02:12 -07:00
Zach Loafman
848134fdfa Revert "Running etcd 2.0.5 in a pod on master" 2015-03-28 07:36:39 -07:00
Dawn Chen
179fe870cc Merge pull request #4442 from ArtfulCoder/docker_etcd
Running etcd 2.0.5 in a pod on master
2015-03-27 18:33:25 -07:00
Daniel Smith
525bbfd175 Merge pull request #6103 from zmerlynn/remove_gce_node_names
Remove the --machines SaltStack configuration on GCE
2015-03-27 17:55:16 -07:00
Abhishek Shah
7750f35e7c Running etcd 2.0.5 in a pod on master 2015-03-27 17:50:10 -07:00
Satnam Singh
666e2b69ac Update Salt config to use gcr.io Fluentd to Cloud Logging agent 2015-03-27 16:39:12 -07:00
Satnam Singh
ce1e73fccc Update Salt config use gcr.io Fluentd to ES image 2015-03-27 16:09:37 -07:00
Zach Loafman
68ccb97907 Remove the --machines SaltStack configuration on GCE
Per https://github.com/GoogleCloudPlatform/kubernetes/issues/6072#issuecomment-87074456, this is no longer necessary.
We now no longer need a static node list. Woo!
2015-03-27 14:44:19 -07:00
Abhishek Shah
d84ff79cfd Added a catchall to set api server ip address in kubelet cmd params 2015-03-27 08:44:52 -07:00
Piotr Szczesniak
c516aba8e8 Merge pull request #6043 from ArtfulCoder/kubelet_salt
Modified salt config to get master ip address correctly
2015-03-27 10:03:05 +01:00
Abhishek Shah
f35a352782 Modified salt config to get master ip address correctly 2015-03-26 21:17:06 -07:00
Abhishek Shah
d1015e785f Add salt configuration to remove cadvisor.manifest from master. cadvisor is now part of kubelet 2015-03-26 10:15:30 -07:00
Robert Bailey
268b617b84 Add local babysitting for the kube-proxy. 2015-03-25 23:24:24 -07:00
Brendan Burns
8bac135f85 Configure docker and kubelet on AWS master. 2015-03-24 17:19:06 -07:00
Satnam Singh
69f867dafb Upgrade etcd to v2.0.5 on the master 2015-03-23 13:52:04 -07:00
Justin Santa Barbara
60a07e972b Raise the file ulimit for kube-proxy for init.d systems 2015-03-19 19:36:13 -04:00
Satnam Singh
985d5c1f95 Add a prefix to the POS file for Fluentd to Elasticsearch 2015-03-17 13:13:03 -07:00
Satnam Singh
0212e68e91 Adjust POS file for Fluentd to Cloud Logging 2015-03-17 11:44:04 -07:00
Timothy St. Clair
140330fca8 Fix to address issue #5461 kube-proxy too many files open
https://github.com/GoogleCloudPlatform/kubernetes/issues/5461
2015-03-17 10:13:25 -05:00
Satnam Singh
d395efa463 Make Fluentd to Cloud Logging collector read from head 2015-03-16 16:19:07 -07:00
Derek Carr
440c720805 Merge pull request #5330 from zmerlynn/try_addons_again
Retry object creation with --validate in kube-addons
2015-03-16 10:43:39 -04:00
Victor Marmol
1a7f7245e7 Remove cAdvisor manifest from cluster startup.
cAdvisor is now integrated into the Kubelet and runs inside of it.
2015-03-13 16:06:42 -07:00
Brendan Burns
966e8301a0 Add kubelet to the master. 2015-03-13 12:09:24 -07:00
Satnam Singh
e16bcceceb Merge pull request #5390 from brendandburns/shell_sucks
Configure docker on the master like we do on workers.
2015-03-12 11:42:03 -07:00
Brendan Burns
17ff8fb421 Configure docker on the master like we do on workers. 2015-03-12 10:37:30 -07:00
Saad Ali
7629b616a7 Merge pull request #5348 from dchen1107/docker
Check docker unixsocket periodically through monit. If failed, restart d...
2015-03-11 17:42:58 -07:00
Dawn Chen
fe9e0ca5ce Check docker unixsocket periodically through monit. If failed, restart docker. 2015-03-11 17:20:03 -07:00
Zach Loafman
018b11bc3a Retry object creation with --validate in kube-addons
The better solution is some fence with Salt, but the actual logs
provided in the bug don't support any race condition here, plus the
ordering in the Salt configuration seems correct.

We haven't seen this again in a while, but given the results of the
situation (a borked cluster), I'm proposing a relatively simple
workaround.

Fixes #4357 (dubiously)
2015-03-11 14:40:37 -07:00
derekwaynecarr
f71a91a131 Fix regression introduced when moving to standalone salt 2015-03-11 11:06:00 -04:00
derekwaynecarr
468bf1da75 Enable common set of admission controllers across salt providers 2015-03-11 11:06:00 -04:00
Brian Grant
b3d3db08ef Merge pull request #5064 from justinsb/ignore_stopped_aws_instances
Ignore EC2 instances that are stopped
2015-03-10 11:03:34 -07:00
Alex Robinson
6700a7f230 Merge pull request #5253 from satnam6502/fluentd
Modify Fluentd to ES setup to pass flags
2015-03-10 10:46:26 -07:00
Brendan Burns
00f3779c6f Merge pull request #5119 from zmerlynn/salt_drones
Change GCE to use standalone Saltstack config
2015-03-10 10:29:59 -07:00
Satnam Singh
3ce0ede78e Modify Fluentd to ES setup to pass flags 2015-03-10 10:11:26 -07:00
Alex Robinson
8fd33476f0 Merge pull request #5218 from satnam6502/fluentd-es
Change Fluentd config to read from head of Docker container logs
2015-03-10 09:57:02 -07:00
Zach Loafman
120dba474e Change GCE to use standalone Saltstack config:
Change provisioning to pass all variables to both master and node. Run
Salt in a masterless setup on all nodes ala
http://docs.saltstack.com/en/latest/topics/tutorials/quickstart.html,
which involves ensuring Salt daemon is NOT running after install. Kill
Salt master install. And fix push to actually work in this new flow.

As part of this, the GCE Salt config no longer has access to the Salt
mine, which is primarily obnoxious for two reasons: - The minions
can't use Salt to see the master: this is easily fixed by static
config. - The master can't see the list of all the minions: this is
fixed temporarily by static config in util.sh, but later, by other
means (see
https://github.com/GoogleCloudPlatform/kubernetes/issues/156, which
should eventually remove this direction).

As part of it, flatten all of cluster/gce/templates/* into
configure-vm.sh, using a single, separate piece of YAML to drive the
environment variables, rather than constantly rewriting the startup
script.
2015-03-10 09:04:29 -07:00
derekwaynecarr
22e559d769 Provision network before kubelet 2015-03-10 10:30:50 -04:00
Satnam Singh
2486de1287 Change Fluentd config to read from head of Docker container logs 2015-03-09 23:25:52 -07:00
Justin Santa Barbara
a3ae480acc Ignore EC2 instances that are stopped
Otherwise we pick up previous cluster instances (in EC2, stopped instances hang around for
a while - maybe 30 minutes?)
2015-03-09 19:03:46 -07:00
Dawn Chen
7a47ea8913 Ask monit health check kubelet; if failed, restart. 2015-03-05 17:29:38 -08:00
derekwaynecarr
35ab4ccc6d Further vagrant reliability improvements. 2015-03-03 06:55:34 -08:00