github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
14,116 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

494 Commits (89900fa19b03d8e2f1599bba02b1d4cafe2d8a01)

Author SHA1 Message Date
Justin Santa Barbara c4a2631593 Mount logic breaks if /var/lib/kubelet is a symlink 
Pass the correct kubelet root-dir on AWS
 2015-05-29 20:13:09 -04:00
Rohit Jnagal 6274d845b9 Merge pull request #8931 from dchen1107/clean 
Fix the race when monit is used to monitor services which are also
 2015-05-29 11:23:21 -07:00
Rohit Jnagal 50b9d6284a Merge pull request #8681 from vmarmol/system-container 
Create a system container
 2015-05-29 09:41:06 -07:00
Tim Hockin ac3cc3c518 Rename PORTAL_NET all over 2015-05-28 16:10:44 -07:00
Tim Hockin 3005471100 Add new apiserver flags for clusterIP (nee portal) 
Leave old flags but marked as deprecated
 2015-05-28 16:10:44 -07:00
Dawn Chen 79a2a4f18d Fix the race when monit is used to monitor services which are also 
started at boot time via init.d at boot time.
 2015-05-28 11:58:33 -07:00
Eric Tune b76dd0e585 Merge pull request #8722 from roberthbailey/dead-flags-salt 
Remove deprecated nodecontroller flags from the salt configuration.
 2015-05-27 08:22:26 -07:00
Victor Marmol c97dda068d Create a /system system container in Debian. 2015-05-26 20:52:09 -07:00
Saad Ali fae1636eda Merge pull request #8586 from vmarmol/use-root-containers 
Run Docker containers as top-level containers in Debian.
 2015-05-26 18:44:36 -07:00
Saad Ali bed9f826d3 Merge pull request #7435 from jsafrane/devel/volume-tests 
V2: Add e2e tests for NFS and Gluster
 2015-05-26 17:49:41 -07:00
Robert Bailey e46b5641ae Remove deprecated flags from the salt configuration. 2015-05-26 12:36:09 -07:00
Jan Safranek 20004e0c16 Add e2e tests for Gluster and NFS tests. 
- add appropriate server containers into contrib/for-tests/volumes-tester
- the tests are off by default (they need kubelet --allow_privileged=True)
  - enable by 'go run hack/e2e.go ... --ginkgo.focus=Volume'
- add glusterfs tools to list of installed packages on each node
 2015-05-25 12:02:41 +02:00
CJ Cullen d6e0aedec1 Re-add the cluster_name flag that the ServiceController and RouteController need. 2015-05-22 16:31:22 -07:00
Victor Marmol 656be14e84 Run Docker containers as top-level containers in Debian. 
Part of #8215
 2015-05-22 13:27:25 -07:00
Dawn Chen 677a4aa1a7 Merge pull request #8164 from cjcullen/cloudprovider 
Route creation reconciler loop.
 2015-05-22 12:27:50 -07:00
Dawn Chen 626d25d50e Initial cpu limit for fluentd pods (file based). 2015-05-21 23:44:26 -07:00
Dawn Chen 456262c43c Merge pull request #8475 from dchen1107/clean 
Create default LimitRange object for cluster: 100m cpu.share per container
 2015-05-21 09:14:20 -07:00
CJ Cullen bf646abf8d Revert "Revert "Modify nodes to register directly with the master."" 
This reverts commit c53786ab31.
 2015-05-20 14:21:03 -07:00
Quinton Hoole c53786ab31 Revert "Modify nodes to register directly with the master." 2015-05-20 13:47:51 -07:00
Satnam Singh 32842b4d22 Update Fluentd GCP image 2015-05-19 16:12:50 -07:00
Dawn Chen 061155c1eb Create LimitRange object for cluster before addons service 2015-05-19 10:23:41 -07:00
Dawn Chen 55501a6314 Have default LimitRange created for cluster: 100m cpu.share per container 2015-05-19 10:23:40 -07:00
Robert Bailey 8e356f8439 Configure the cloud provider for the kubelet. 2015-05-19 09:55:07 -07:00
Robert Bailey 01467e0bb8 Modify nodes to register directly with the master. 
- Delete nodes when they are no longer ready and don't exist in the
cloud provider.
 - Label each node with it's hostname.
 - Add flag to skip node registration.
 - Add a test for registering an existing node.
 2015-05-19 09:55:07 -07:00
Jeff Lowdermilk 553f9f822b Add ga-beacon analytics to gendocs scripts 
hack/run-gendocs.sh puts ga-beacon analytics link into all md files,
hack/verify-gendocs.sh verifies presence of link.
 2015-05-15 18:56:38 -07:00
Daniel Smith ce4b54ec70 Merge pull request #8209 from krousey/v1beta1_cluster 
Removing some v1beta1 uses in cluster/
 2015-05-15 14:56:41 -07:00
Kris Rousey 98c457c397 Updating /cluster to use v1beta 3 specs, and change a lot of polling to 
healthz instead of api endpoints.
 2015-05-15 14:17:55 -07:00
Victor Marmol d3c6fb0d6a Merge pull request #8275 from dchen1107/clean 
Install monit_watcher as a cron job (1m) to check if monit is running,
 2015-05-15 08:02:55 -07:00
Dawn Chen e6c159eda2 Install monit_watcher as a cron job (1m) to check if monit is running, 
and oom protect monit processes.
 2015-05-14 15:19:11 -07:00
Rohit Jnagal e4c98a05ea Merge pull request #8182 from GoogleCloudPlatform/revert-7863-etcd_maxprocs 
Revert "Set GOMAXPROCS for etcd"
 2015-05-14 11:19:56 -07:00
Victor Marmol 5e7a7b9206 Merge pull request #8241 from gmarek/remove_name 
Remove unused ClusterName from NodeController
 2015-05-14 09:49:34 -07:00
Victor Marmol 2b1b85468a Merge pull request #7330 from chrismoos/volume_format_script_updates 
Add safe_format_and_mount to hyperkube image.
 2015-05-14 09:17:20 -07:00
gmarek 8a4717d3f5 Remove unused ClusterName from NodeController 2015-05-14 18:01:23 +02:00
Dawn Chen 309a157665 Merge pull request #7984 from cjcullen/kubelet 
Kubelet configure cbr0 instead of configure-vm.sh
 2015-05-13 17:32:52 -07:00
Yu-Ju Hong ad83197c63 Merge pull request #8187 from satnam6502/nosecret 
Remove the use of secrets from node level logging agents
 2015-05-13 11:12:08 -07:00
Jeff Lowdermilk f8ebc4e21e Merge pull request #8104 from roberthbailey/kubelet-using-kubeconfig 
Replace the auth config file with a kubeconfig file when starting the kubelet on GCE.
 2015-05-13 11:09:27 -07:00
Dawn Chen e32daf4229 Monit watch kubelet and kube-proxy on master node too. 2015-05-13 10:36:00 -07:00
Satnam Singh 53ec5e38c7 Remove the use of secrets from node level logging agents 2015-05-13 10:11:07 -07:00
Filip Grzadkowski eecd7b8c0f Revert "Set GOMAXPROCS for etcd" 2015-05-13 17:53:04 +02:00
Robert Bailey c47b9178b4 Replace the auth config file with a kubeconfig file when 
starting the kubelet on GCE.
 2015-05-13 01:03:28 -07:00
CJ Cullen 31ea7d1295 Put cbr0-modifying stuff behind a flag. Address some other comments. 2015-05-12 23:00:28 -07:00
Alex Robinson a98d883134 Merge pull request #8121 from satnam6502/fluentd-gcp 
Convert node level logging to Cloud Logging to use token-system-logging
 2015-05-12 14:26:46 -07:00
Alex Robinson 96cb4360fa Merge pull request #8120 from satnam6502/fluentd-es 
Convert nodel level logging to ES to use token-system-logging
 2015-05-12 14:26:28 -07:00
Nikhil Jindal d75bd8bf2a Merge pull request #7101 from liggitt/service_account 
ServiceAccounts
 2015-05-12 10:23:41 -07:00
Satnam Singh ade18e4ff3 Conver node level logging to Cloud Logging to use token-system-logging 2015-05-12 10:17:45 -07:00
Satnam Singh f9af0658fa Convert nodel level logging to ES to use token-system-logging 2015-05-12 10:07:49 -07:00
Alex Robinson e2b7ef8d2c Merge pull request #8078 from satnam6502/fluentd-gcp 
Convert Fluentd to Cloud Logging pod specs to YAML
 2015-05-11 16:55:14 -07:00
Satnam Singh e246685468 Convert Fluentd to Cloud Logging pod specs to YAML 2015-05-11 14:55:46 -07:00
Satnam Singh 2f5ba28a17 Switch Fluentd to ES manifest back to YAML 2015-05-11 14:37:41 -07:00
Jordan Liggitt db1f0dc906 JWT token generation/verification 2015-05-11 17:18:06 -04:00
Robert Bailey 6c42cb154b Stop copying certs into /usr/share/nginx/ since nothing relies 
on that location any longer.
 2015-05-11 11:44:19 -07:00
Wojciech Tyczynski 600b00f2b1 Merge pull request #7863 from fgrzadkowski/etcd_maxprocs 
Set GOMAXPROCS for etcd
 2015-05-07 10:09:29 +02:00
Filip Grzadkowski 7e8bde53dd Set GOMAXPROCS for etcd 2015-05-07 08:11:39 +02:00
CJ Cullen f0c26052eb Fix controller-manager manifest for providers that don't specify CLUSTER_IP_RANGE 2015-05-06 17:50:04 -07:00
Maxwell Forbes 7426b533df Merge pull request #7862 from cjcullen/cbr0 
Remove restriction that cluster-cidr be a class-b
 2015-05-06 15:46:57 -07:00
saadali 4569de7a46 Enable Google Cloud Monitoring and Google Cloud Logging instead of 
Influxdb for Google Compute Engine deployments.
 2015-05-06 15:23:40 -07:00
CJ Cullen fbd125e4e2 Remove restriction that cluster-cidr be a class-b 2015-05-06 15:01:13 -07:00
Mark Lamourine b7c1b7eed2 Added port 6443 to kube-proxy default IP address for api-server 
added  api_servers_with_port variable and settings.

removed extra port string

split azure api_server host and port out
 2015-05-06 12:43:24 +00:00
Robert Bailey 357df12c02 Set allocate_node_cidrs to be blank by default. 2015-05-05 23:41:30 -07:00
Jerzy Szczepkowski e967ffd522 Added flag to set cluster class B network address for pods, add flag to disable allocation CIDRs for Pods. Fixed synchornization bug in NodeController registerNodes(). 2015-05-05 16:10:43 -07:00
Jeff Lowdermilk 87cdc3f032 Merge pull request #7672 from eparis/boilerplate-python 
Check license boilerplate for python files
 2015-05-05 09:23:36 -07:00
Chris Moos 1b814ffd2c Add safe_format_and_mount to hyperkube image. 
* Add volume format script into hyperkube image.
* Fix issue with format script on non-redhat platforms.
 2015-05-04 21:25:39 -07:00
Zach Loafman 2b3e52c230 Use built-in ContainerVM Docker version rather than installing lxc-docker 2015-05-04 16:33:00 -07:00
Eric Paris f416289a85 update all python with boilerplate 2015-05-04 18:37:47 -04:00
Robert Bailey e3ff2dc02d Merge pull request #7678 from justinsb/aws_api_on_443 
AWS: Change apiserver to listen on 443 directly, not through nginx
 2015-05-04 13:52:57 -07:00
Daniel Smith fbe3ec7513 Merge pull request #7316 from ArtfulCoder/master_components_logs 
logs for master components
 2015-05-04 11:20:03 -07:00
Justin Santa Barbara 57f7b658bb AWS: Change apiserver to listen on 443 directly, not through nginx 
Mirrors changes in GCE.  I think the same changes will be needed for vagrant.
 2015-05-02 16:59:04 -04:00
Eric Paris 6b3a6e6b98 Make copyright ownership statement generic 
Instead of saying "Google Inc." (which is not always correct) say "The
Kubernetes Authors", which is generic.
 2015-05-01 17:49:56 -04:00
Satnam Singh 941a457851 Trim Fleuntd tag for Cloud Logging 2015-04-30 13:39:35 -07:00
Satnam Singh e65f0aafd5 Trim cluster log tags to pod name and container name 2015-04-29 18:24:13 -07:00
Abhishek Shah 96439b5a52 logs for master components 2015-04-29 09:51:09 -07:00
Robert Bailey 8206aa9eac Salt configuration to add basic auth to GCE. 2015-04-28 14:07:54 -07:00
Satnam Singh 4a0cc7905d Convert node level logging agents to v1beta3 2015-04-27 17:21:42 -07:00
CJ Cullen 39c5bf363b Merge pull request #7303 from erictune/kube_env3 
kube-proxy uses token to access port 443 of apiserver
 2015-04-27 14:33:53 -07:00
derekwaynecarr 81e9395533 Fix vagrant regression due to #7326 2015-04-27 17:18:30 -04:00
Eric Tune 9044177bb6 Generate a token for kube-proxy. 
Tested on GCE.
Includes untested modifications for AWS and Vagrant.
No changes for any other distros.
Probably will work on other up-to-date providers
but beware.  Symptom would be that service proxying
stops working.

 1. Generates a token kube-proxy in AWS, GCE, and Vagrant setup scripts.
 1. Distributes the token via salt-overlay, and salt to /var/lib/kube-proxy/kubeconfig
 1. Changes kube-proxy args:
   - use the --kubeconfig argument
   - changes --master argument from http://MASTER:7080 to https://MASTER
     - http -> https
     - explicit port 7080 -> implied 443

Possible ways this might break other distros:

Mitigation: there is an default empty kubeconfig file.
If the distro does not populate the salt-overlay, then
it should get the empty, which parses to an empty
object, which, combined with the --master argument,
should still work.

Mitigation:
  - azure: Special case to use 7080 in
  - rackspace: way out of date, so don't care.
  - vsphere: way out of date, so don't care.
  - other distros: not using salt.
 2015-04-27 08:59:57 -07:00
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
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
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
Satnam Singh c9b9e7651e Convert Elasticsearch logging to v1beta and de-salt 2015-04-23 13:06:15 -07: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
Satnam Singh 2444c1f943 Propagate pod and container name for log files 2015-04-22 15:08:51 -07: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
Abhishek Shah 8cf11fd608 removed elasticsearch and fluentd-gcp pods from master 2015-04-22 12:54:57 -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
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
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
CJ Cullen 1be193098a Merge pull request #7072 from dchen1107/cleanup 
Remove fqdn dependency for node name
 2015-04-20 18:00:21 -07:00
Abhishek Shah f513aad380 kube-controller-manager in a pod. 2015-04-20 16:06:37 -07: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
Kenjiro Nakayama 2e702b0c61 Replace hostname -f with uname -n 2015-04-20 14:16:21 -07:00
Eric Tune 424ae1d67a Fix kube-addon retrying. 2015-04-20 07:38:39 -07:00
Robert Bailey 972cf60d2b Merge pull request #6957 from ArtfulCoder/no_monit 
remove unused file
 2015-04-17 11:40:36 -07:00
Abhishek Shah b08102d358 remove unused file 2015-04-16 21:51:51 -07:00
Abhishek Shah 647d5948a1 Docker Image install script - Sleep before each iteration of while loop 2015-04-16 21:46:35 -07:00
Derek Carr 6c394e4d81 Merge pull request #6911 from erictune/del_kub_user 
Remove unused kubelet user from salt.
 2015-04-16 11:45:26 -04:00
Eric Tune 955cc1e1df Remove unused kubelet user from salt. 
Fixes #1512.

Cluster creation and validation succeeds with this change.
 2015-04-16 07:46:56 -07:00
litian54 b5e4111234 Fix Jinja render bug if 'portal_net' or 'cluster_name' is undefined 2015-04-15 17:17:38 -07:00
Abhi Shah 72a694b6b3 Merge pull request #6823 from ArtfulCoder/scheduler-in-a-pod 
Scheduler in a pod
 2015-04-15 08:27:28 -07:00
Abhishek Shah a908bb78ea kube-scheduler in a pod 2015-04-14 17:53:12 -07:00
Quinton Hoole cd6daae014 Merge pull request #6271 from a-robinson/asynclb 
Manage load balancer creation and deletion asynchronously in a ServiceController
 2015-04-14 17:50:07 -07:00
Abhishek Shah 37eb4d85e1 Install kube-controller-manager image 2015-04-14 16:45:39 -07:00
Abhishek Shah 682e8cfa99 Load Kube Scheduler Image. 2015-04-14 15:20:24 -07:00
Alex Robinson ccc300289f Implement a ServiceController that watches services and handles keeping 
external load balancers up-to-date based on the service's specs, using
the new DeltaFIFO watch queue class. Remove the old registry REST
handler code for creating/updating/deleting load balancers.

Also clean up a bunch of the GCE cloudprovider code related to load balancers.
 2015-04-14 18:56:24 +00:00
Justin Santa Barbara 72687184b9 Don't always use aws.conf 
We don't usually need it, and it makes it harder to put apiserver into a container.
 2015-04-14 09:30:00 -07:00
Abhishek Shah c9d7010461 kube-apiserver in a pod. 2015-04-13 15:15:45 -07:00
Dawn Chen 67169ec87d Merge pull request #6719 from litian54/master 
Fix Rendering SLS 'base:nginx' failed if 'cloud' is not defined in minio...
 2015-04-13 10:42:48 -07:00
Dawn Chen 7f2f165797 Revert "kube-apiserver in a pod." 2015-04-10 22:54:52 -07:00
litian54 36ef786228 Fix Rendering SLS 'base:nginx' failed if 'cloud' is not defined in minion grains 2015-04-10 18:27:22 -07:00
Abhishek Shah 2f70395396 kube-apiserver in a pod. 2015-04-10 15:46:49 -07:00
Justin Santa Barbara a366f9ee88 Create the /usr/share/google dir in salt 2015-04-10 13:25:43 -07:00
Justin Santa Barbara b9fd56050a Add safe_format_and_mount script to aws 
Apache licensed :-)
 2015-04-10 13:25:42 -07:00
Derek Carr d2b6920a32 Merge pull request #6496 from ArtfulCoder/docker_image_install 
Load docker images of kubernetes components after docker is installed.
 2015-04-10 16:19:10 -04:00
Maxwell Forbes 7eb7387d97 Merge pull request #6403 from zmerlynn/salt_docs 
Update the existing salt.md, add the start of a Salt README tree
 2015-04-09 10:34:25 -07:00
Abhishek Shah 4996ccbf2d Load docker images of kubernetes components after docker is installed. 2015-04-09 09:06:42 -07:00
Dawn Chen 8ede54c511 Upgrade kubernetes to gcr.io/google_containers/etcd:2.0.9 2015-04-07 16:26:11 -07:00
Justin Santa Barbara 2426366ec8 Update cAdvisor with moved docker root on AWS 
We set up a symlink now, and we also pass docker_root into the kubelet.

The symlink is probably sufficient, but doing both feels safer.
 2015-04-07 10:40:22 -07:00
Abhishek Shah a0ea2c6718 Disable nginx service 2015-04-06 18:38:03 -07:00
Zach Loafman c292d2e8d6 Update the existing salt.md, add the start of a Salt README tree 
Starts to fix #6070
 2015-04-06 14:41:21 -07:00
Abhishek Shah 9231fae998 Prevent docker load. 2015-04-06 11:09:27 -07:00
Abhishek Shah fb665ede4c Run etcd on localhost for all providers. 2015-04-03 14:00:44 -07:00
Abhishek Shah 23c42cd8b2 Etcd listens on localhost for GCE 2015-04-03 11:40:09 -07:00
Yu-Ju Hong 76f1232a2e Merge pull request #6404 from dchen1107/master 
Using gcr.io/google_containers/etcd:2.0.8
 2015-04-03 08:51:41 -07:00
Zach Loafman de67b96ff7 Merge pull request #6396 from ArtfulCoder/master_logging 
Enable log collection from master.
 2015-04-02 18:50:30 -07:00
Abhishek Shah 39bb6d3777 Enable log collection from master. 2015-04-02 18:37:07 -07:00
Zach Loafman 12cf7681a9 Merge pull request #5470 from erictune/for-abhis 
Make secrets at cluster startup.
 2015-04-02 17:43:56 -07:00
Dawn Chen 814177c21b Using gcr.io/google_containers/etcd:2.0.8 2015-04-02 17:04:05 -07:00
Abhi Shah a918a719e0 Merge pull request #6334 from brendandburns/nginx 
Add an nginx docker image for use on the master.
 2015-04-02 16:58:02 -07:00
Brendan Burns 9f48a2f4e6 Add an nginx docker image for use on the master. 2015-04-02 16:42:17 -07:00
Eric Tune 59daeabaee Make secrets at cluster startup. 
These secrets will be used in subsequent PRs by:
scheduler, controller-manager, monitoring services,
logging services, and skydns.

Each of these services will then be able to stop using kubernetes-ro
or host networking.
 2015-04-02 15:58:45 -07:00
Zach Loafman c627a3598c Merge pull request #6384 from erictune/cleanup-addons.sh 
Use same addons script for init.d and systemd.
 2015-04-02 14:49:44 -07:00
Derek Carr 4ae016e022 Merge pull request #6382 from derekwaynecarr/fix_vagrant_kubelet 
Fix vagrant with etcd in pod
 2015-04-02 17:22:44 -04:00
Eric Tune b9570b3daa Use same addons script for init.d and systemd. 2015-04-02 14:07:23 -07:00
derekwaynecarr c6bf46acd7 Fix vagrant with etcd in pod 2015-04-02 16:55:29 -04:00
Dawn Chen 9b2f835a01 Merge pull request #6326 from ArtfulCoder/docker_image_creation 
Create Docker images for master components
 2015-04-02 13:12:17 -07:00
Abhishek Shah b1b779a8d5 docker image creation 2015-04-02 12:39:12 -07:00
Filip Grzadkowski 65c2942a82 Increase ulimit -n for apiserver. 2015-04-02 17:01:23 +02:00
CJ Cullen 5e6e67ba59 Add an alternative TokenSource to the GCE CloudProvider. 2015-04-01 17:52:30 -07:00
Dawn Chen ab1a8b1e7c Merge pull request #6298 from roberthbailey/kubelet-config 
Remove salt configuration that matches the default settings in the Kubelet.
 2015-04-01 14:31:31 -07:00
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