Commit Graph

8339 Commits

Author SHA1 Message Date
Eric Paris
06c1fe4567 Instructions to back-merge release branches into master
This allows us to continue on branched like v0.14.1, v0.14.2, and tag on
that branch.  But it will merge those tags into master so git describe
picks up the changes.
2015-04-01 14:36:52 -07:00
Eric Paris
eb4568b32a update instructions to make it clear to get review 2015-04-01 14:36:41 -07:00
Daniel Smith
dedd4b052a Remove pods from the assumed pod list when they are deleted 2015-04-01 14:34:15 -07:00
Zach Loafman
2ad77fd9e5 Kubernetes version v0.14.0-dev 2015-03-30 11:03:04 -07:00
Zach Loafman
575bf6dcd0 Kubernetes version v0.14.0 2015-03-30 11:02:57 -07:00
Victor Marmol
22670de524 Merge pull request #6092 from derekwaynecarr/limit_range_default
Eliminate trailing commas
2015-03-30 09:41:17 -07:00
Victor Marmol
a4daa88fdc Merge pull request #6090 from justinsb/use_s3_bucket_location
Use the correct region for the S3 bucket
2015-03-30 09:40:42 -07:00
Victor Marmol
2f6c3d9f4d Merge pull request #6155 from simon3z/node-ready-event
nodes: record an event on NodeReady changes
2015-03-30 09:32:02 -07:00
Jeff Lowdermilk
ea01d7f0e0 Merge pull request #6121 from satnam6502/fluentd-gcp-image
Create gcr.io image for Fluentd to Cloud Logging
2015-03-30 09:05:05 -07:00
Federico Simoncelli
0e60374346 nodes: record an event on NodeReady changes
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
2015-03-30 12:01:09 -04:00
Victor Marmol
d5ce931f0b Merge pull request #6069 from simon3z/kubelet-reboot-logic
node: move the reboot detection logic to kubelet
2015-03-30 08:45:37 -07:00
Victor Marmol
ff03b721fe Merge pull request #6160 from justinsb/aws_dont_list_until_ready
Don't list AWS instances until they are actually ready
2015-03-30 08:34:54 -07:00
Victor Marmol
a922bf9d2c Merge pull request #6157 from AntonioMeireles/drop_remaining_cadvisor_refs
remove remaining references to containerized cadvisor.
2015-03-30 08:06:53 -07:00
Justin Santa Barbara
63f63aa9de Don't list AWS instances until they are actually ready 2015-03-30 08:06:18 -07:00
Victor Marmol
3490e67ff9 Merge pull request #6117 from brendandburns/api3
Add params for the proxy when installing the API, this fixes some swagger validation errors.
2015-03-30 08:02:27 -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
Victor Marmol
b63794cba8 Merge pull request #6130 from eparis/tag-version
Do not allow minor release which is not a decendant of the release branc...
2015-03-30 08:02:01 -07:00
Victor Marmol
7823014807 Merge pull request #6143 from brendandburns/e2e2
Pick up the latest updates to go-restful.
2015-03-30 08:01:48 -07:00
Victor Marmol
0c75f26a74 Merge pull request #6148 from zmerlynn/brctl_complaint
Fix "brctl: invalid command" message appearing in startup logs
2015-03-30 08:01:30 -07:00
Victor Marmol
58bc479e81 Merge pull request #6149 from ghodss/update-gce-quickstart
Update GCE getting started guide to include gcloud preview
2015-03-30 08:01:16 -07:00
António Meireles
0b793a6c74 remove remaining references to containerized cadvisor.
since GoogleCloudPlatform/kubernetes#5308 got merged cadvisor facilities are
built-in in kubelet, so time to update the 'screenshots'...

Signed-off-by: António Meireles <antonio.meireles@reformi.st>
2015-03-30 15:27:23 +01:00
Federico Simoncelli
fe2d1f6762 node: move the reboot detection logic to kubelet
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
2015-03-30 09:33:07 -04:00
Federico Simoncelli
604e0ad328 kubelet: move getNodeReference logic into a function
Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
2015-03-30 09:33:00 -04:00
gmarek
7bbf526a1f Merge pull request #6141 from zmerlynn/master_by_name
GCE node salt: Use the master FQDN, not the master IP
2015-03-30 10:15:56 +02:00
gmarek
aa29f84d0c Merge pull request #6142 from ddysher/fix-doc
Fix docs
2015-03-30 10:14:20 +02:00
gmarek
f02c64d620 Merge pull request #6144 from you-n-g/master
remove cmd arg from ClientMapperForCommand
2015-03-30 10:07:39 +02:00
Sam Ghods
ef77349306 Update GCE getting started guide to include gcloud preview 2015-03-29 18:37:01 -07:00
Zach Loafman
b3636bba34 Fix "brctl: invalid command" message appearing in startup logs
We were actually failing to call brctl in configure-vm.sh. I finally
tracked it down to the attempt to delete the docker0 bridge. This
particular package was getting installed later by Salt anyways, so
all this PR is doing is moving the package install up from Salt to
bash.

Also adds some minor logging.
2015-03-29 18:30:33 -07:00
Brendan Burns
f826bf6b46 Pick up the latest updates to go-restful. 2015-03-28 22:05:33 -07:00
Deyuan Deng
f35dc54d62 Fix docs 2015-03-28 23:42:54 -04:00
Zach Loafman
708553f0bb GCE node salt: Use the master FQDN, not the master IP
This will allow us to upgrade the master by full re-provision, without
even bothering to reserve the IP.
2015-03-28 13:44:45 -07:00
Zach Loafman
8a7a127352 Merge pull request #6137 from GoogleCloudPlatform/revert-4442-docker_etcd
Revert "Running etcd 2.0.5 in a pod on master"
2015-03-28 07:39:47 -07:00
Zach Loafman
848134fdfa Revert "Running etcd 2.0.5 in a pod on master" 2015-03-28 07:36:39 -07:00
Brendan Burns
ee0d71aac6 Fix up parameter handling. Also handle type mapping between Go and JSON 2015-03-27 21:43:16 -07:00
Brendan Burns
d70d2d20cd Add params for the proxy when installing the API. 2015-03-27 21:43:16 -07:00
Victor Marmol
b9499b8c5b Merge pull request #6126 from ghodss/reduce-some-kubectl-spacing
Reduce some tab spacing in kubectl
2015-03-27 18:34:36 -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
Eric Paris
329f9a0e99 Do not allow minor release which is not a decendant of the release branch
This does some git magic to make sure you do not tag a branch with
v0.13.3 unless that branch is a decendant of the release-0.13 branch
upstream.

Don't allow v0.13.4 if v0.13.3 doesn't exit

Don't allow v0.13.3 if v0.13.3 already exits
2015-03-27 21:24:10 -04:00
Dawn Chen
296fafa955 Merge pull request #6129 from yujuhong/container_status
Kubelet: allow docker to examine terminated container
2015-03-27 18:18:18 -07:00
Sam Ghods
f8d8b09a0a Reduce some tab spacing in kubectl 2015-03-27 18:05:20 -07:00
Yu-Ju Hong
3ad0e22cdd Kubelet: allow docker to examine terminated container
Removing the if statement so that docker can continue returning the status of
terminated containers.
2015-03-27 18:04:50 -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
Victor Marmol
3bc933645b Merge pull request #6083 from jlowdermilk/fix-log
Fix kubectl log for single-container pods
2015-03-27 17:51:33 -07:00
Abhishek Shah
7750f35e7c Running etcd 2.0.5 in a pod on master 2015-03-27 17:50:10 -07:00
Victor Marmol
76b5b79106 Merge pull request #6127 from yujuhong/sethost
Kubelet: set host field in the pending pod status
2015-03-27 17:37:14 -07:00
Yu-Ju Hong
372c5c9f3a Kubelet: set host field in the pending pod status
Otherwise, the apiserver would reject the update.
2015-03-27 17:26:47 -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
e114075032 Create gcr.io image for Fluentd to Cloud Logging 2015-03-27 16:34:04 -07:00
Jeff Lowdermilk
320df1d2ad Merge pull request #6116 from satnam6502/fluentd-es
Update Salt config use gcr.io Fluentd to ES image
2015-03-27 16:30:05 -07:00
Zach Loafman
e91b77cbec Merge pull request #6104 from eparis/tag-version
make mark-new-release.sh do branching and tell you exactly what to do ne...
2015-03-27 16:17:45 -07:00