Commit Graph

357 Commits

Author SHA1 Message Date
Dawn Chen
d767e71475 Using container-vm-v20141208 as the default image on GCE. 2014-12-09 17:11:23 -08:00
Joe Beda
09a8efefe9 Merge pull request #2791 from derekwaynecarr/salt_api_missing_cherrypy
Vagrant fix - Add python-cherrypy as explicit install for salt-api
2014-12-09 12:12:37 -08:00
Joe Beda
90f71ea4d9 Merge pull request #2805 from jlowdermilk/fix-salt
Fix conditional docker_opts in salt/docker/docker-defaults
2014-12-09 10:16:55 -08:00
Jeff Lowdermlk
0007257bce Fix conditional on grains.docker_opts in docker-defaults 2014-12-08 16:42:41 -08:00
Brendan Burns
5b33534dcf Merge pull request #2652 from justinsb/default_vpc_has_no_tags
Don't assume every AWS VPC has tags
2014-12-08 15:53:47 -08:00
Brendan Burns
30656d7522 Merge pull request #2653 from justinsb/default_cluster_monitoring
Default ENABLE_CLUSTER_MONITORING to false
2014-12-08 15:53:35 -08:00
derekwaynecarr
aacf2c2780 Add python-cherrypy as explicit install for salt-api 2014-12-08 11:36:26 -05:00
Brendan Burns
8364fa5c93 Fix detect-minions. 2014-12-05 15:42:28 -08:00
Jeff Lowdermilk
a1faab9ffe Merge pull request #2730 from satnam6502/scripting
Add missing project argument to gcloud commands
2014-12-04 14:30:20 -08:00
Satnam Singh
fcfdd48f8d Add missing project argument to gcloud commands 2014-12-03 15:38:40 -08:00
Satnam Singh
c2348052b0 Fix the addition of the logging.write scope to the MINION_SCOPES array 2014-12-02 20:25:26 -08:00
Brendan Burns
346dbc6de7 Merge pull request #2716 from zulily/fix-gce-provision-with-gcp-logging
Fix GCE scopes when using GCP Logging
2014-12-02 12:40:56 -08:00
Brendan Burns
b07515c5ea Add some backward compatability for GKE. 2014-12-02 11:32:45 -08:00
Steve Reed
d229c5ba51 Proper appending of logging.write scope to array 2014-12-02 10:29:10 -08:00
Alen Komljen
d83d269c27 Remove empty lines when file is generated from jinja template 2014-12-02 15:00:58 +01:00
Joe Beda
f8505cd286 For GCE, allow insecure registries anywhere in 10.0.0.0/8. 2014-12-01 11:36:08 -08:00
Justin Santa Barbara
0b05068f40 Default ENABLE_CLUSTER_MONITORING to false
Otherwise kube-down fails because the variable is not defined
2014-11-27 18:07:51 -08:00
Justin Santa Barbara
f9a9c75697 Don't assume every AWS VPC has tags
The default VPC has no tags (by default), so we should use get()
2014-11-27 17:32:38 -08:00
Alen Komljen
249bbd7d9a Remove unused nsinit salt state 2014-11-27 09:59:25 +01:00
Tim Hockin
47141f05c7 standard config opt names: logging 2014-11-25 17:41:53 -08:00
Tim Hockin
52ad94d766 standard config opt names: node monitoring 2014-11-25 17:39:28 -08:00
Tim Hockin
fad806d1d1 standard config opt names: cluster monitoring 2014-11-25 17:38:30 -08:00
Tim Hockin
e359ad5902 Change tabs to spaces 2014-11-25 17:36:41 -08:00
Joe Beda
6d65805508 fixup! Convert gcutil to gcloud compute 2014-11-25 15:20:01 -08:00
Joe Beda
6ba07b38fc Convert gcutil to gcloud compute 2014-11-25 15:17:00 -08:00
Joe Beda
4a5a69b520 Upgrade docker to 1.3.2. 2014-11-25 14:46:25 -08:00
Joe Beda
2b712a744a Fix up salt ordering dependencies in kube-apiserver/init.sls. 2014-11-25 14:46:25 -08:00
Joe Beda
12add3bc66 Merge pull request #2579 from brendandburns/e2e
Add an e2e test for gce pd.
2014-11-25 09:08:40 -08:00
Brendan Burns
e1764e2e01 Add an e2e test for gce pd.
Add an example for gce pd.
Add an extra log message.
2014-11-25 09:02:00 -08:00
Tim Hockin
f24ea5ce59 Merge pull request #2592 from dchen1107/mirror-registry
Enable Docker Cache for OSS on gce.
2014-11-25 09:23:40 +08:00
Dawn Chen
1900f0db98 Enable Docker Cache for OSS on gce. 2014-11-24 16:51:17 -08:00
Brendan Burns
ab3cfc5f75 Update the ubuntu AMI 2014-11-24 16:34:48 -08:00
Tim Hockin
b6d8215f3a Merge pull request #2537 from dchen1107/mirror-registry
Enable docker registry cache. By default it is off
2014-11-25 03:46:35 +08:00
Dawn Chen
e13ce48676 Enable docker registry cache. By default it is off 2014-11-21 17:13:22 -08:00
Joe Beda
802d214ed0 Merge pull request #2461 from MSOpenTech/deploy
Bring Azure deploy scripts up to date
2014-11-20 17:15:44 -08:00
Joe Beda
658c5cdaaa Check in default blank file for kubelet/kubernetes_auth
This lets us eliminate some per-cloud stuff in our salt.  This is an alternate fix for #2475.
2014-11-20 17:01:28 -08:00
Jeff Mendoza
d0586ed066 Azure review fixes. 2014-11-20 16:40:35 -08:00
derekwaynecarr
1a894741b2 Fix vagrant regression 2014-11-20 10:39:09 -05:00
Brendan Burns
927088de83 Fix etcd unpack by adding a explicit x flag. 2014-11-19 11:33:50 -08:00
Jeff Mendoza
5d62ac1a56 Fix Azure util.sh boilerplate. 2014-11-19 10:25:27 -08:00
Jeff Mendoza
8b0f263c00 Rearrange cluster sanity checks for Azure. 2014-11-18 22:37:06 -08:00
Jeff Mendoza
9934a0ace4 Update cert generation for Azure. 2014-11-18 14:10:50 -08:00
Jeff Mendoza
1ee5ab5e5e Updates and formatting to azure scripts. 2014-11-18 14:10:18 -08:00
Eric Tune
67adf6473e Don't reference non-existent token file if not GCE. 2014-11-18 00:23:41 -08:00
Eric Tune
46dcacfa93 Kubelet talks securely to apiserver.
Configure apiserver to serve Securely on port 6443.
Generate token for kubelets during master VM startup.
Put token into file apiserver can get and another file the kubelets can get.
Added e2e test.
2014-11-18 00:23:41 -08:00
Brendan Burns
5122e4cc3a Remove deprecated nsinit from the node definition. 2014-11-17 22:20:57 -08:00
Brendan Burns
cea52d7e4f Merge pull request #2409 from mattmoor/master
Implements a credentialprovider library for use by DockerPuller.
2014-11-17 21:53:25 -08:00
Matt Moore
0c5d9ed0d2 Implements a credentialprovider library for use by DockerPuller.
This change refactors the way Kubelet's DockerPuller handles the docker config credentials to utilize a new credentialprovider library.

The credentialprovider library is based on several of the files from the Kubelet's dockertools directory, but supports a new pluggable model for retrieving a .dockercfg-compatible JSON blob with credentials.

With this change, the Kubelet will lazily ask for the docker config from a set of DockerConfigProvider extensions each time it needs a credential.

This change provides common implementations of DockerConfigProvider for:
 - "Default": load .dockercfg from disk
 - "Caching": wraps another provider in a cache that expires after a pre-specified lifetime.

GCP-only:
 - "google-dockercfg": reads a .dockercfg from a GCE instance's metadata
 - "google-dockercfg-url": reads a .dockercfg from a URL specified in a GCE instance's metadata.
 - "google-container-registry": reads an access token from GCE metadata into a password field.
2014-11-17 21:46:54 -08:00
Richard Larocque
914c5eb1f1 Chmod the right file in cluster/vagrant/util.sh
Most of platforms use ~/.kubernetes_auth, but Vagrant is different.
This commit fixes one instance where a setup script did not take this
difference into account.
2014-11-17 17:14:35 -08:00
Abhishek Gupta
65a4041d26 Fixing systemd service files to point to correct config/executors 2014-11-17 12:24:10 -08:00