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

1425 Commits (0076c181c7ffa757401db6df256492b5ce6ec415)

Author SHA1 Message Date
Zach Loafman 0c107e4c44 Also push .sha1 for devel builds 
And adds a .sha1 cache file to indicate what file was already pushed
to GCS, and how to force it if not, removing a few seconds off a
kube-up/push if you're just cycling.

With this and #7602, all TAR_URLS will have a .sha1 as well.
 2015-05-04 17:45:34 -07:00
Victor Marmol d159f4cb2e Merge pull request #7740 from zmerlynn/docker_fallback 
Update non-GCE Salt distros to 1.6.0, fallback to ContainerVM Docker version on GCE
 2015-05-04 17:03:13 -07:00
Zach Loafman 2b3e52c230 Use built-in ContainerVM Docker version rather than installing lxc-docker 2015-05-04 16:33:00 -07:00
Robert Bailey 9718d667a7 Merge pull request #7744 from zmerlynn/allow_builtin_salt 
Skip SaltStack install if it's already installed
 2015-05-04 16:32:56 -07:00
Zach Loafman dd7f3f7df7 Skip SaltStack install if it's already installed 
Next ContainerVM image will have SaltStack in it. Also be a little
less persnickety if it's found running. This isn't the case, but we
don't have to be aggressive.
 2015-05-04 16:12:53 -07:00
Eric Paris f416289a85 update all python with boilerplate 2015-05-04 18:37:47 -04:00
Robert Bailey c6d4c24f37 Merge pull request #7736 from justinsb/aws_fix_known_tokens_file 
AWS: Fix variable naming that meant not all tokens were written
 2015-05-04 14:34:11 -07:00
Justin Santa Barbara 96f0a39172 AWS: Fix variable naming that meant not all tokens were written 
To resolve the inconsistency, chose to go closer to GCE
 2015-05-04 17:28:24 -04:00
Nikhil Jindal 2ae13693ab Merge pull request #7675 from cjcullen/cbr0 
Fix kube2sky flakes. Fix tools.GetEtcdVersion to work with etcd > 2.0.7
 2015-05-04 14:23:29 -07: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
CJ Cullen a21713a771 Fix kube2sky flakes. Fix tools.GetEtcdVersion to work with etcd > 2.0.7 2015-05-04 13:01:35 -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
Yu-Ju Hong 5270ce6d28 Merge pull request #7671 from vmarmol/fix-metadata 
Make rkt-install a oneshot.
 2015-05-04 10:50:36 -07:00
Yu-Ju Hong c3ba88296b Merge pull request #7665 from vmarmol/cluster-rkt 
Provide container_runtime flag to Kubelet in CoreOS.
 2015-05-04 10:06:58 -07:00
BenTheElder 7ea1ccd7a3 Set vagrant test cluster default NUM_MINIONS=2 2015-05-04 04:19:20 -04: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
Victor Marmol 9253249b19 Make rkt-install a oneshot. 
This will make our dependencies wait for us before they execute.
 2015-05-01 17:44:44 -07:00
Victor Marmol 727016dc30 Provide container_runtime flag to Kubelet in CoreOS. 2015-05-01 17:02:33 -07: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
Vish Kannan 3cc53127de Merge pull request #7626 from crossorigin/heapster-0.11.0 
bump heapster to v0.11.0 and grafana to v0.7.0
 2015-05-01 14:24:25 -07:00
Robert Bailey 14c2fb11e1 Don't exit abruptly if there aren't yet any minions right after 
the cluster is created.
 2015-05-01 13:51:59 -07:00
Ido Shamun e86316bc4d revert back INFLUXDB_EXTERNAL_URL to api v1beta1 2015-05-01 21:13:04 +03:00
Ido Shamun 37040fb0e3 bump heapster to v0.11.0 and grafana to v0.7.0 2015-05-01 19:42:30 +03:00
Eric Tune dc137a47eb Merge pull request #7209 from you-n-g/master 
change the current dir to the config dir
 2015-05-01 08:29:49 -07:00
Eric Tune dddf414cf5 Merge pull request #7195 from mbruzek/add-charms 
Add the Juju charms to Kubernetes
 2015-04-30 16:26:58 -07:00
Alex Robinson 8d24f73bab Merge pull request #7579 from satnam6502/fluentd-es-image 
Improve comment in Fluentd to ES logging config file
 2015-04-30 13:45:03 -07:00
Alex Robinson f30ed069c0 Merge pull request #7588 from satnam6502/fluentd-gcp-image 
Trim Fleuntd tag for Cloud Logging
 2015-04-30 13:44:39 -07:00
Satnam Singh 95007d7217 Improve comment in Fluentd to ES logging config file 2015-04-30 13:42:30 -07:00
Satnam Singh 941a457851 Trim Fleuntd tag for Cloud Logging 2015-04-30 13:39:35 -07:00
Victor Marmol dad73fa94a Merge pull request #7569 from bakins/kubernetes-master-name 
GCE CoreOS cluster - set master name based on variable
 2015-04-30 12:59:41 -07:00
Alex Robinson 58ede77a58 Merge pull request #7539 from satnam6502/master 
Trim cluster log tags to pod name and container name
 2015-04-30 10:29:41 -07:00
Zach Loafman 6a0fab3d34 Fix the fix for GKE kube-down 
Fixes issue in #7565
 2015-04-30 10:23:21 -07:00
Brian Akins b311a12d90 Use the variable as this changes based on environment. 2015-04-30 12:40:09 -04:00
Jeff Lowdermilk 996168dced fix kube-down for provider gke 2015-04-30 09:22:17 -07:00
Matt Bruzek 74c00d431e Removing unused scripts from km and kubernetes. 2015-04-30 09:27:51 +02:00
Young f181e98ebd change the current dir to the config dir 
Otherwise the script can't run in other dirs.
 2015-04-30 14:38:56 +08:00
Satnam Singh e65f0aafd5 Trim cluster log tags to pod name and container name 2015-04-29 18:24:13 -07:00
Quinton Hoole a2fe8a9e6c Merge pull request #7527 from cjcullen/dns 
Bump kube2sky to 1.2. Point it at https endpoint (3rd try).
 2015-04-29 18:00:14 -07:00
CJ Cullen 44cffec157 Bump kube2sky to 1.2. Point it at https endpoint (3rd try). 2015-04-29 14:58:56 -07:00
Yifan Gu 9ba1839f52 cluster/gce/coreos: Add metadata-service in node.yaml 2015-04-29 14:58:26 -07:00
Abhishek Shah 96439b5a52 logs for master components 2015-04-29 09:51:09 -07:00
Victor Marmol fc34277d8e Merge pull request #7445 from dchen1107/rkt-support 
Bring up a kuberenetes cluster using coreos image as worker nodes
 2015-04-28 18:04:42 -07:00
Zach Loafman 89195b0a14 Merge pull request #7461 from cjcullen/dns 
Revert kube2sky from 1.2 back to 1.1 until we figure out why it's flaky.
 2015-04-28 17:23:55 -07:00
Satnam Singh dc31c58443 Upgrade Elasticsearch to 1.5.2 for cluster logging 2015-04-28 16:20:03 -07:00
Dawn Chen 876f8beec9 Remove unused node-name attribute 2015-04-28 16:13:26 -07:00
Dawn Chen 13a0b033e2 Bring up a cluster using coreos image for worker nodes. 2015-04-28 16:13:26 -07:00
Dawn Chen 5fa11322f8 Factory out debian e.g. ContainerVM image specific support to its own 
helper utility library.
 2015-04-28 16:07:57 -07:00
Fabio Yeon 0a8d8c1579 Merge pull request #7460 from roberthbailey/validate-cluster 
Make validate cluster more reliable
 2015-04-28 15:57:43 -07:00
Dawn Chen 8963347b9e Introduce MASTER_IMAGE, MINION_IMAGE and OS_DISTRIBUTION to config-default 
for enable coreos and rocket support
 2015-04-28 15:31:09 -07:00
CJ Cullen 2b50ee53e0 Revert the change that bumped kube2sky from 1.1->1.2 until we figure out why it's flaky. 2015-04-28 14:57:44 -07:00
Robert Bailey a7e62d17ff Make validate cluster more reliable (it should retry checking the 
server if a subshell returns a non-zero exit status).
 2015-04-28 14:57:14 -07:00
Robert Bailey 8206aa9eac Salt configuration to add basic auth to GCE. 2015-04-28 14:07:54 -07:00
Alex Robinson 566f0d4724 Fix GCE logging scope name. 2015-04-28 13:44:30 -07:00
Alex Robinson 3e841510de Merge pull request #7393 from satnam6502/fluentd-gcp-image 
New Fluentd to Cloud Logging Dockerfile with args
 2015-04-28 11:01:14 -07:00
Alex Robinson 5b5525dca5 Merge pull request #7324 from vishh/log_scope 
Enable logging.write scope for minions.
 2015-04-28 11:00:10 -07:00
Vishnu Kannan 9c66305f8c Enable logging.write scope by default for nodes. This is required for storing events in 
Google Cloud Logging via heapster.
 2015-04-28 10:55:06 -07:00
Satnam Singh 20a0905d61 New Fluentd to Cloud Logging Dockerfile with args 2015-04-28 10:30:32 -07:00
Victor Marmol 094e5545d2 Merge pull request #7310 from rjnagal/node 
Fix the binary path reported by get-kube script.
 2015-04-28 08:24:37 -07:00
Derek Carr 824d830747 Merge pull request #7427 from jsafrane/devel/fix-vagrant2 
Fixed name of kube-proxy path in deployment scripts.
 2015-04-28 10:24:52 -04:00
Wojciech Tyczynski 92a0b385c7 Merge pull request #7274 from satnam6502/v1beta3 
Convert node level logging agents to v1beta3
 2015-04-28 10:32:37 +02:00
Jan Safranek 6e810492fb Fixed name of kube-proxy path in deployment scripts. 2015-04-28 10:10:37 +02:00
Satnam Singh 4a0cc7905d Convert node level logging agents to v1beta3 2015-04-27 17:21:42 -07:00
Alex Robinson 743945f3aa Merge pull request #7384 from a-robinson/opts 
Remove unused env variable from the fluentd dockerfiles
 2015-04-27 17:18:17 -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
Alex Robinson ada9242155 Remove unused env variable from the fluentd dockerfiles and make their apt-get 
arguments consistent.
 2015-04-27 20:47:38 +00:00
Brendan Burns a02823c0db Merge pull request #7344 from roberthbailey/google-storage-ssl 
Fetch resources from storage.googleapis.com over SSL.
 2015-04-27 12:24:46 -07:00
Brendan Burns 637cd57a25 Merge pull request #6606 from gust1n/aws-existing-vpc 
AWS: Improving getting existing VPC and subnet
 2015-04-27 11:11:25 -07:00
Zach Loafman b8de4960ac Merge pull request #7367 from erictune/cleanupkubadmintoken 
Remove apparently dead code from Azure scripts.
 2015-04-27 10:13:40 -07:00
Zach Loafman 5ccfc0a225 Merge pull request #6006 from justinsb/aws_multiple_clusters 
First step to supporting multiple k8s clusters
 2015-04-27 10:11:03 -07:00
Eric Tune 9b31a76651 Remove apparently dead code from Azure scripts. 2015-04-27 10:08:50 -07: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
Zach Loafman df1cfae368 Merge pull request #7326 from roberthbailey/client-cert-auth 
Pass the CA root cert into the apiserver
 2015-04-27 07:48:59 -07:00
Robert Bailey a9f8f17299 Fetch the kibana tar.gz over SSL. 2015-04-26 21:57:49 -07:00
Robert Bailey 225da3f88f Fetch resources from storage.googleapis.com over SSL. 2015-04-26 21:51:37 -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
saadali acbd3d78f1 Specify host/container ports for InfluxDB, so that the UI is accessible. 2015-04-24 16:22:50 -07:00
Rohit Jnagal d60c86a3a7 Fix the binary path reported by get-kube script. 2015-04-24 21:31:21 +00:00
Brian Grant 60d7bad147 Merge pull request #7128 from nikhiljindal/fixbeta1tests 
Removing more references to v1beta1 from pkg/
 2015-04-24 11:07:53 -07:00
Satnam Singh b6bee06c20 Merge pull request #7269 from zmerlynn/lose_one_sanity 
Remove buggy GCE post turn-up cluster validation code (rely on validate-cluster.sh)
 2015-04-24 10:56:20 -07:00
Brendan Burns 49977e6a47 Revert "Update docker examples to 0.15.0" 2015-04-24 10:05:27 -07:00
Dawn Chen 2128d4e251 Merge pull request #7261 from erictune/kube_env 
Pass KUBELET_TOKEN in kube-env metadata.
 2015-04-24 10:03:34 -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
nikhiljindal dcc368c781 Removing more references to v1beta1 from pkg/ 2015-04-24 00:45:17 -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
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
CJ Cullen e982ac5b55 Change kube2sky to use token-system-dns secret, point at https endpoint (instead of kubernetes-ro service). 2015-04-21 23:10:12 -07:00
fabioy acb64e66e8 Fix validate-cluster.sh to work on Mac. 2015-04-21 17:51:35 -07:00
Brendan Burns 78dabbdb7f Fix the ssh-to-node to actually fail on failures. 2015-04-21 15:27:38 -07:00
Brendan Burns 71e6b05825 Fix kube-apiserver restart. 2015-04-21 15:11:00 -07:00
Matt Bruzek 9ca54b3cb6 Merge branch 'master' of github.com:GoogleCloudPlatform/kubernetes into add-charms 2015-04-21 16:55:00 -05:00
Matt Bruzek 9d21292646 Changing bundle to v0.15.0 and docker git head. 2015-04-21 16:50:47 -05:00
Matt Bruzek 60e0a77a0c Removing cadvisor and normalizing python quotes. 2015-04-21 16:46:21 -05:00
Robert Bailey 0035781c50 Merge pull request #7137 from brendandburns/fix 
Fix kube-apiserver restart.
 2015-04-21 14:33:54 -07:00
Brendan Burns 9d715226d6 Fix kube-apiserver restart. 2015-04-21 13:59:26 -07:00
Robert Bailey 8745ebce15 Revert "Rollback "validate-cluster.sh" to previous version." 2015-04-21 13:30:16 -07:00
Robert Bailey b9904f63d4 Merge pull request #7124 from fabioy/revert-validate.fix 
Rollback "validate-cluster.sh" to previous version.
 2015-04-21 12:29:54 -07:00
Robert Bailey a50e02bb3b Merge pull request #7078 from jlowdermilk/gke-kubectl 
Use standalone kubectl for gke, remove special case for vagrant
 2015-04-21 12:11:45 -07:00
Fabio Yeon 12db42e4f0 Rollback "validate-cluster.sh" to previous version. 2015-04-21 12:09:34 -07:00
Jeff Lowdermilk 70a576e25a Use standalone kubectl for gke, remove special case for vagrant 
also fix hack/local-up-cluster.sh kubeconfig instructions
 2015-04-21 11:01:45 -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
Eric Tune 2ca8a9d15d Added kube-proxy token. 
Generates the new token on AWS, GCE, Vagrant.
Renames instance metadata from "kube-token" to "kubelet-token".
(Is this okay for GKE?)

Having separate tokens for kubelet and kube-proxy permits
using principle of least privilege, makes it easy to
rate limit the clients separately, allows annotation
of apiserver logs with the client identity at a finer grain
than just source-ip.
 2015-04-21 09:21:31 -07:00
Matt Bruzek c1a56187b8 Removing debug statements from the python code. 2015-04-21 11:02:47 -05:00
Matt Bruzek 85e0e9d6c7 Adding a slash to continue the line. 2015-04-21 11:02:02 -05:00
Eric Tune 7475efbcfb Extend PR#5470 for AWS and Vagrant 2015-04-21 08:22:31 -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
Derek Carr b5d9afd093 Merge pull request #7099 from derekwaynecarr/fix_vagrant 
Fix vagrant regression from 6691
 2015-04-21 00:45:30 -04:00
derekwaynecarr 3fc627e416 Fix vagrant regression from 6691 2015-04-21 00:44:44 -04:00
Justin Santa Barbara 45b658ea7c AWS: don't try to create undefined config_dir 2015-04-20 19:14:16 -07:00
Brian Grant 9dcf3e0a33 Merge pull request #7082 from fabioy/api-cs.fix 
Fixed "componentstatuses" API object JSON descriptions.
 2015-04-20 18:10:36 -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
Fabio Yeon 81ef0198f4 Fixed "componentstatuses" API object JSON descriptions. 2015-04-20 17:28:13 -07:00
Vish Kannan db7a56529f Merge pull request #7077 from brendandburns/hyperkube 
Update docker examples to 0.15.0
 2015-04-20 19:48:49 -04:00
CJ Cullen ae3a0fe661 Merge pull request #7055 from erictune/kubeconfig-secrets 
Create system secrets in kubeconfig format
 2015-04-20 16:42:35 -07:00
Abhishek Shah f513aad380 kube-controller-manager in a pod. 2015-04-20 16:06:37 -07:00
Brendan Burns 8c947de4e2 Update docker examples to 0.15.0 2015-04-20 15:40:08 -07:00
Matt Bruzek f201379938 Merge pull request #1 from whitmo/new-cadvisor-port 
Change cadvisor port and point kubelet to find it
 2015-04-20 17:17:18 -05:00
Whit Morriss 7b3534e012 move cadvisor port to 4193 to avoid collision with kubelet 2015-04-20 17:07:19 -05: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
Matt Bruzek a5da3708d2 Removing old docs, setting latest false on docker 2015-04-20 17:00:41 -05:00
Matt Bruzek 7802db4862 Added protetecion if the arguments are not there. 2015-04-20 16:57:42 -05:00
Matt Bruzek 3dd62a5c65 Log the JSON output from BASH 2015-04-20 16:55:08 -05:00
Kenjiro Nakayama 2e702b0c61 Replace hostname -f with uname -n 2015-04-20 14:16:21 -07:00
Robert Bailey 82190a58b1 Merge pull request #7026 from justinsb/aws_use_ssl_for_salt 
AWS: master should download salt using SSL
 2015-04-20 11:58:47 -07:00
Jeff Lowdermilk 196b3d066d Merge pull request #6919 from zmerlynn/sharded-e2e 
Add hack/parallel-e2e.sh to run hack/e2e.go on multiple clusters
 2015-04-20 11:34:18 -07:00
Brendan Burns 7f75c982ce Merge pull request #6691 from jlowdermilk/gen-kubeconfig 
Generate kubeconfig for all providers in cluster/ that use auth
 2015-04-20 11:28:36 -07:00
Brendan Burns e079e23e47 Merge pull request #6597 from fabioy/kubectl-validate 
Add "kubectl validate" command to do a cluster health check.
 2015-04-20 11:21:06 -07:00
Zach Loafman 68c9191cfc Allow CLUSTER_IP_RANGE/MINION_IP_RANGE to be overridden by KUBE_GCE_CLUSTER_CLASS_B 2015-04-20 11:17:21 -07:00
Jeff Lowdermilk 3787fc5eca set KUBECONFIG in common.sh, default to new location 
and preserve value in ginkgo e2e test driver
 2015-04-20 11:07:35 -07:00
Lénaïc Huard 08f17bfa70 Make libvirt-coreos cluster use create-kubeconfig 2015-04-20 11:07:35 -07:00
Jeff Lowdermilk 4f6dc99075 Generate kubeconfig for all providers in cluster/ that use auth 2015-04-20 11:07:35 -07:00
Brendan Burns ba95c8a176 Merge pull request #7014 from a-robinson/dirname 
Move the logging-related directories to where I think they belong
 2015-04-20 10:50:09 -07:00
Eric Tune 424ae1d67a Fix kube-addon retrying. 2015-04-20 07:38:39 -07:00
Justin Santa Barbara 7d3fe2154e AWS: master should download salt using SSL 
The minion already does, but the master was using plain http.
 2015-04-18 12:38:52 -07:00
Alex Robinson 059a8c92bd Move the logging-related directories to where I think they belong. 
1. Move fluentd-gcp to be a core cluster addon, rather than a contrib.
2. Get rid of the synthetic logger under contrib, since the exact same
synthetic logger was also included in the logging-demo.
3. Move the logging-demo to examples, since it's effectively an example.

We should also consider adding on a GCP section to the logging-demo
example :)
 2015-04-17 23:59:50 +00:00
Robert Bailey eb1ea26995 Merge pull request #7012 from jlowdermilk/export-kubeconfig 
export KUBECONFIG so callers of common.sh functions can use it
 2015-04-17 16:37:10 -07:00
Jeff Lowdermilk 1c265f3784 export KUBECONFIG so callers of common.sh functions can use it 2015-04-17 16:22:07 -07:00
Brian Grant 2775b9e0de Merge pull request #6998 from zmerlynn/make_reboot_work 
Make reboots work on GCE/GKE
 2015-04-17 16:10:32 -07:00
Matt Bruzek 57683ce0ec Adding deployer to the dependency list. 2015-04-17 17:25:23 -05:00
Matt Bruzek 89043414f6 Changed the kube-up logic to use local bundles and charms. 
Implemented a feature of kube-down
Corrected a bug on bootstrap of Juju environment.
 2015-04-17 17:23:53 -05:00
Matt Bruzek 8f038a82a4 Adding a python file to parse the IP addresses. 2015-04-17 17:22:48 -05:00
Matt Bruzek af8f31a0cd Adding the Juju charms to the cluster directory. 2015-04-17 17:21:37 -05:00
Matt Bruzek 4ff2e53fee Adding the initial Juju bundle to the cluster 2015-04-17 17:20:07 -05:00
Brian Grant 4b377e2ef6 Merge pull request #6977 from justinsb/move_var_lib_kubelet 
AWS: Move /var/lib/kubelet to /mnt
 2015-04-17 12:43:01 -07:00
Zach Loafman bcb63642b8 Make reboots work on GCE/GKE 
* Fixes an issue where salt-minion would actually come up after reboot
(upstart is horrible obnoxious)
* Caches .deb downloads
* Handles PD remount on reboot correctly
* Notes a future optimization

Fixes #5666
 2015-04-17 12:12:00 -07:00
Fabio Yeon c6ef2ddf8a Fix "validate-cluster.sh" to use "kubectl get componentstatus". 2015-04-17 11:59:53 -07:00
Zach Loafman aca8452a21 Merge pull request #6994 from cjcullen/staticip 
Reserve Master IP before creating Master VM
 2015-04-17 11:48:48 -07:00
Derek Carr 40d0e559a6 Merge pull request #6983 from posita/vagrant-provider-support-2741 
READY FOR REVIEW - Fix #2741. Add support for alternate Vagrant providers: ...
 2015-04-17 14:42:19 -04:00
Robert Bailey 972cf60d2b Merge pull request #6957 from ArtfulCoder/no_monit 
remove unused file
 2015-04-17 11:40:36 -07:00
CJ Cullen 6a3c809833 Reserve Master IP before creating Master VM. 2015-04-17 11:36:00 -07:00
Zach Loafman 05d8e96cd4 Push the configure-vm.sh script when we push metadata 
This is needed when we upgrade (and useful when you're trying to
change the startup script for reboots).

Along the way: allow add-instance-metadata[-from-file] to take a
variable number of KVs.
 2015-04-17 11:27:48 -07:00
Matt Bogosian e8672e2242 Fix #2741. Add support for alternate Vagrant providers: VMWare Fusion, VMWare Workstation, and Parallels. 2015-04-17 11:26:29 -07:00
Jeff Lowdermilk 2a8291a67e Retry Move KUBECONFIG to common.sh, change default to new location 2015-04-17 10:33:12 -07:00
Justin Santa Barbara b2bce12b6c AWS: Move /var/lib/kubelet to /mnt 
The backing for empty-dir volumes otherwise consumes all our disk space
 2015-04-17 06:46:08 -07:00
Zach Loafman 94ae93a46b Merge pull request #6955 from ArtfulCoder/stop_spin_loop 
Docker Image install script - Sleep before each iteration of while loop
 2015-04-17 04:56:34 -07:00
Robert Bailey 723f2941e8 Revert "Move KUBECONFIG into common.sh, change default to new location" 2015-04-16 22:17:11 -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
Jeff Lowdermilk 5ce9b07cbe Move KUBECONFIG declaration into common.sh, change default to new location 2015-04-16 19:23:35 -07:00
Daniel Smith 288effa7c1 Merge pull request #6933 from bgrant0607/docfix 
Update docs. Add design principles.
 2015-04-16 16:55:10 -07:00
Brian Grant f1cea092df Update docs. Add design principles. Fixes #6133. Fixes #4182. 
# *** ERROR: *** docs are out of sync between cli and markdown
# run hack/run-gendocs.sh > docs/kubectl.md to regenerate

#
# Your commit will be aborted unless you regenerate docs.
    COMMIT_BLOCKED_ON_GENDOCS
 2015-04-16 22:13:44 +00:00
Tim Hockin c2bacd588d Stop using dockerfile/* images 
As per
http://blog.docker.com/2015/03/updates-available-to-popular-repos-update-your-images/
docker has stopped answering dockerfile/redis and dockerfile/nginx.  Fix all
users in our tree.  Sadly this means a lot of published examples are now broken.
 2015-04-16 12:20:43 -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
Wojciech Tyczynski 1c47f2d70c Merge pull request #6873 from satnam6502/es-image 
Convert es-image for gcr.io
 2015-04-16 13:55:08 +02:00
derekwaynecarr d1668b1dfa Vagrant should not block on daemons that moved to pods 2015-04-15 23:15:34 -04:00
litian54 b5e4111234 Fix Jinja render bug if 'portal_net' or 'cluster_name' is undefined 2015-04-15 17:17:38 -07:00
Satnam Singh 4c0f06ec66 Convert es-image for gcr.io 2015-04-15 16:28:02 -04: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
Wojciech Tyczynski 4094505f84 Enable configuring size of minion disk 2015-04-15 11:19:43 +02: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
Dawn Chen cbe28f151e Merge pull request #6821 from justinsb/aws_dont_use_aws_conf 
Don't always use aws.conf
 2015-04-14 13:30:29 -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
Dawn Chen 913dc4e490 Revert "Use a helper to find built binaries" 2015-04-14 11:24:49 -07:00
Eric Tune c53b0c3869 Merge pull request #6275 from feihujiang/master 
Improve ubuntu-cluster setup scripts
 2015-04-14 09:51:33 -07:00
Dawn Chen 13b2243325 Merge pull request #6756 from lhuard1A/libvirt-coreos_etcd2 
libvirt-coreos cluster: Fix etcd versions incompatibility issue
 2015-04-14 09:34:00 -07: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
Dawn Chen 7bfe57b30d Merge pull request #6783 from eparis/use-hack-lib-find-binaries 
Use a helper to find built binaries
 2015-04-14 09:18:14 -07:00
Lénaïc Huard 11556dc927 libvirt-coreos cluster: Fix etcd versions incompatibility issue 
Whereas CoreOS is still shipped with etcd 0.4.9, kubernetes has moved to etcd 2.0.4.

This version mismatch makes kubernetes unable to use etcd.
Kubernetes’ logs are full of “502:  (unhandled http status [Temporary Redirect] with body []) [0]”

This change makes libvirt-coreos cluster explicitly use etcd v2.0.9 instead of the one shipped within CoreOS.
This change aims at being reverted once CoreOS will migrate to etcd 2.
This migration is tracked at:
https://github.com/coreos/bugs/issues/317
 2015-04-14 10:43:41 +02:00
Dawn Chen 6861e98ad8 Merge pull request #6785 from ArtfulCoder/apiserver-in-a-pod 
kube-apiserver in a pod.
 2015-04-13 16:10:37 -07:00
Dawn Chen 0bf08e242e Merge pull request #6757 from lhuard1A/libvirt-coreos_fix_wait-cluster-readiness 
libvirt-coreos cluster: fix wait-cluster-readiness for v1beta3 API
 2015-04-13 16:05:03 -07:00
Eric Paris 6d4ab258f0 Use a helper to find built binaries 
We should not be determining the arch/os and all the possible
directories binaries can live. Let a hack/lib/ helper do it for us.
 2015-04-13 18:57:36 -04: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
Lénaïc Huard a708407965 libvirt-coreos cluster: fix wait-cluster-readiness for v1beta3 API 
Fix the kubectl query to use to check the nodes readiness.
 2015-04-13 15:13:53 +02:00
feihujiang 7452860f30 Improve ubuntu-cluster setup scripts 
This PR implements #6266.

Make a copy for each of the original scripts, and modify the copies. These copies will be used as working scripts afterwards.

Improve ubuntu-cluster setup scripts
 2015-04-13 15:10:14 +08:00
Gareth Rushgrove d836762a68 Fix typo and incorrect service name in sample ubuntu default scripts 2015-04-12 14:41:03 +02:00
Robert Bailey d577db9987 Merge pull request #6721 from brendandburns/hyperkube 
Update to 0.14.2 in the docker k8s instructions.
 2015-04-10 23:45:36 -07:00
Dawn Chen 7f2f165797 Revert "kube-apiserver in a pod." 2015-04-10 22:54:52 -07:00
Brendan Burns 6217ae0242 Update to 0.14.2 in the docker k8s instructions. 2015-04-10 22:02:55 -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
Dawn Chen 23c9b1a04b Merge pull request #6709 from ArtfulCoder/apiserver-in-a-pod 
kube-apiserver in a pod.
 2015-04-10 16:34:24 -07:00
Victor Marmol 52d73951db Merge pull request #6710 from rjnagal/node 
Fix heapster config to talk to the right kubelet port.
 2015-04-10 16:12:42 -07:00
Rohit Jnagal 013653bd58 Fix heapster config to talk to the right kubelet port. 
The config was updated for v1bet1, but the tests are using v1beta3.
 2015-04-10 22:58:38 +00:00
Abhishek Shah 2f70395396 kube-apiserver in a pod. 2015-04-10 15:46:49 -07:00
Justin Santa Barbara 034412aff1 Support multiple k8s clusters 2015-04-10 13:25:43 -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