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

463 Commits (823ab24068f83ec72d1ca7addefa3e3490f58fbf)

Author SHA1 Message Date
Brendan Burns 824122f410 Merge pull request #2651 from justinsb/specify_zone_to_ec2 
Specify AWS_DEFAULT_REGION to match configured region
 2014-12-19 12:26:40 -08:00
Max Forbes c3efef86d0 Add GKE as a provider. 2014-12-19 11:47:06 -08:00
Brendan Burns bd712b61e6 Merge branch 'master' of https://github.com/dutchcoders/kubernetes into dutchcoders-master 
Conflicts:
	cluster/aws/config-default.sh
	cluster/saltbase/salt/kube-controller-manager/default
 2014-12-19 11:45:46 -08:00
bgrant0607 4943ee7b65 Merge pull request #3034 from a-robinson/pd-up 
Store all of the master's persistent data on a separate "data" PD when running on GCE
 2014-12-18 16:05:47 -08:00
Daniel Smith cd2432891d Merge pull request #3038 from vishh/fix_monitoring 
Fix bug in gce monitoring setup.
 2014-12-18 13:07:18 -08:00
Vishnu Kannan aa7a311c34 Fix bug in gce monitoring setup. 2014-12-18 20:47:41 +00:00
Alex Robinson f892e84e0a Store all of the master's persistent data on a separate "data" 
persistent disk when running on GCE.

I'll follow up soon with a second PR that enables kube-push to
completely bring down the master VM and replace it with a new one.
 2014-12-18 20:24:57 +00:00
Jordan Liggitt 2de478f16c Make cert CN unique to avoid certificate serial number clashes 2014-12-18 15:13:32 -05:00
Joe Beda eed5252993 Merge pull request #3023 from tozd/fix-salt-deps 
Add missing Salt requisites
 2014-12-18 09:16:16 -08:00
Jernej Kos 430a04af45 Added missing Salt requisites. 2014-12-18 10:29:39 +01:00
CJ Cullen 90364b30b0 Only create a single firewall rule for all minions. 2014-12-17 17:10:07 -08:00
Joe Beda 428aeacf6d Rework vagrant cluster set up. 
* Have a single config file that mirrors other cluster providers
* Warn users not to use 'vagrant up' directly
* Allow 'extra' parameters to the docker daemon.  Fixes #2685
* Renumbers things so that they are more sane.  Master/minions are 10.245.1.x, container subnets are 10.246.x.1/24, portal is 10.247.0.0/16
 2014-12-17 13:23:39 -08:00
Daniel Smith 8e33229792 Merge pull request #2991 from dchen1107/newdocker 
Move salt based clusters to Docker 1.4.1
 2014-12-16 16:57:31 -08:00
Filipe Brandenburger da4967fe38 Merge pull request #2988 from jbeda/yaml-quote 
Quote strings in bash populated YAML files.
 2014-12-16 16:26:22 -08:00
Joe Beda 2fc02cb06a Quote strings in bash populated YAML files. 
Quoting is hard.  When writing strings into YAML files, wrap them in single quotes.  Also escape any embedded single quotes in those strings via a double signle quote ('').
 2014-12-16 16:13:46 -08:00
Dawn Chen c053ec63c5 Move salt based clusters to Docker 1.4.1 2014-12-16 15:54:26 -08:00
Joe Beda 911a437c1b Make the test for the 'docker_opts' grain more robust. 
Fixes #2982
 2014-12-16 14:26:36 -08:00
Brendan Burns 58ba3c7faa Merge pull request #2976 from dchen1107/newdocker 
Move salt based clusters to Docker 1.4.0
 2014-12-16 12:14:54 -08:00
Dawn Chen 04b136a7db Move salt based clusters to Docker 1.4.0 2014-12-16 11:58:45 -08:00
Joe Beda 308b078ee7 Merge pull request #2857 from jainvipin/master 
ubuntu getting started guide
 2014-12-15 16:13:25 -08:00
Vipin Jain cf24c77e78 ubuntu getting started guide 2014-12-15 15:43:35 -08:00
Brendan Burns f2a5457296 Merge pull request #2952 from satnam6502/colour 
Avoid redeclaration errors for kube-up.sh
 2014-12-15 15:33:33 -08:00
Satnam Singh c928c43a15 Avoid redeclaration errors for kube-up.sh 2014-12-15 15:23:04 -08:00
Steve Reed eb0a11717f Look up master node IP address in a loop 2014-12-15 14:38:30 -08:00
Joe Beda 056fdbb9b8 Merge pull request #2943 from brendandburns/flags 
Add a log level flag.
 2014-12-15 12:59:08 -08:00
Brendan Burns 878d85df0c Add a log level flag. 2014-12-15 12:00:29 -08:00
Max Forbes bea37d5b17 Fix up e2e tests. 2014-12-15 11:53:51 -08:00
Brendan Burns 19c88643b8 Merge pull request #2923 from satnam6502/kubelet-log 
Collect Kubelet logs with Fluentd->(Elasticsearch|Cloud Logging)
 2014-12-15 11:46:33 -08:00
Brendan Burns 68c1ac210b Merge pull request #2940 from deads2k/deads-validate-cluster-broken 
validate-cluster is broken for vagrant
 2014-12-15 11:44:58 -08:00
deads2k 81e01e5099 validate-cluster is broken 2014-12-15 14:07:38 -05:00
deads2k fd53795bc9 fix e2e for all providers except gce 2014-12-15 11:04:13 -05:00
Satnam Singh b4fcdd7e47 Collect Kubelet logs with Fluentd->Elasticsearch and Fluentd->Cloud Logging 2014-12-14 01:47:48 -08:00
Satnam Singh 91a75c7620 Add missing detect-project to detect-minions 2014-12-12 15:29:58 -08:00
Filipe Brandenburger d762dc46e9 Merge pull request #2816 from satnam6502/robust 
Make multiple attempts to sanity check (GCE) and validate (ALL) cluster
 2014-12-12 14:26:07 -08:00
Satnam Singh 1ce71d1e33 Make multiple attempts to sanity check (GCE) and validate (ALL) cluster 2014-12-12 13:53:57 -08:00
Joe Beda c9acafc98a Move salt based clusters to Docker 1.3.3 
Part of #2896
 2014-12-12 12:18:07 -08:00
Brendan Burns 9742911697 Only delete attached boot disks, don't delete other attached disks. 2014-12-11 17:09:53 -08:00
Filipe Brandenburger 45dbf16be7 Merge pull request #2803 from satnam6502/cluster 
Make kube-down more robust for GCE provider
 2014-12-11 15:39:22 -08:00
Satnam Singh d0eeebaa66 Make kube-down more robust for GCE provider 2014-12-11 14:47:38 -08:00
Brendan Burns 6e397cfe31 Merge pull request #2870 from zulily/fix-rackspace-cloud-files-url 
Fixes malformed OBJECT_URL in rackspace setup script
 2014-12-11 13:18:26 -08:00
Steve Reed 4c312caeb0 Fixes the minion yaml as well 2014-12-11 13:01:05 -08:00
Steve Reed d4f71b7d4a Fixes malformed OBJECT_URL in rackspace setup script 2014-12-11 12:18:45 -08:00
Brendan Burns 149881e13e Actually set repository QPS in the kubelet. 2014-12-11 12:06:40 -08:00
Joe Beda 89011f26f4 remove SSLv3 support in nginx config 2014-12-10 13:17:02 -08:00
Eric Tune edeb96dca9 Merge pull request #2772 from rlarocque2/apiserver_auth 
Implement apiserver communication for Vagrant
 2014-12-10 07:13:40 -08:00
Daniel Smith 0f88d149cd Merge pull request #2818 from dchen1107/containervm 
Using container-vm-v20141208 as the default image on GCE.
 2014-12-09 17:55:19 -08:00
Dawn Chen d767e71475 Using container-vm-v20141208 as the default image on GCE. 2014-12-09 17:11:23 -08:00
Brendan Burns 3a7dd589d5 Merge pull request #2735 from erictune/proxy_no_etcd 
Use apiserver instead of etcd for kube-proxy.
 2014-12-09 15:27:20 -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
Richard Larocque 7d37b24cc7 Implement apiserver communication for Vagrant 
This implementation is based on the GCE impementation from
618a367dbb48dbaa9c3b50e877858d854322fd0b.
 2014-12-05 12:49:51 -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
Eric Tune 65b38e7af7 Use apiserver instead of etcd for kube-proxy. 
For cloud-providers that use salt, have kube-proxy use
apiserver instead of etcd as a config source.
 2014-12-02 22:21:01 -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 a549468853 Specify AWS_DEFAULT_REGION to match configured region 
The AWS CLI is configured with a default region, but it might not match
the configured Kubernetes region.  Specify the region to be sure.
 2014-11-27 17:56:14 -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
Remco 83f3982eee fix(aws): cloud provider wasn't set, corrected cloud config syntax 2014-11-26 17:30:35 +01:00
Remco 1265db9686 fix(aws): fix with non us standard region 2014-11-26 16:18:57 +01:00
Remco 6d79fab0c2 enhancement(aws): added logging variable and more verbose output 2014-11-26 16:18:26 +01:00
Remco cbaa48bbc2 enhancement(aws): using iam role to pass aws credentials 2014-11-26 16:16:57 +01:00
Remco 2118c31bdb enhancement(aws): checks for existing kubernetes vpc first 
without this check, kube-up creates a new vpc every time. Now it will
reuse the vpc tagged Kubernetes.
 2014-11-26 12:17:14 +01:00
Remco 72bd5311bf fix(aws): error with other instances without tags 
while starting the cluster, and having already other non-kubernetes
instances active without tags, an KeyError throwed.
 2014-11-26 12:15:51 +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