Dawn Chen
cdaad413f7
Merge pull request #12370 from zmerlynn/automated-cherry-pick-of-#12366-upstream-release-1.0
...
Automated cherry pick of #12366
2015-08-06 17:29:59 -07:00
Brendan Burns
602cccd418
Merge pull request #12369 from brendandburns/automated-cherry-pick-of-#12325-release-1.0
...
Automated cherry pick of #12325
2015-08-06 17:17:16 -07:00
Zach Loafman
8573f427eb
Update GCE to container-vm-v20150806
...
Also changes the node image to default to master image
2015-08-06 16:42:52 -07:00
Brendan Burns
ed4c97f857
Add support for supervisord as a monit alternative.
2015-08-06 16:27:51 -07:00
Zach Loafman
aebf6b5566
Merge pull request #12367 from roberthbailey/automated-cherry-pick-of-#11483-#12349-upstream-release-1.0
...
Automated cherry pick of #11483 #12349
2015-08-06 16:26:49 -07:00
Robert Bailey
e703fe2329
Register the kubelet on the master node with an apiserver. This option is separated from the apiserver running locally on the master node so that it can be optionally enabled or disabled as needed.
...
Also, fix the healthchecking configuration for the master components, which
was previously only working by coincidence:
If a kubelet doesn't register with a master, it never bothers to figure out
what its local address is. In which case it ends up constructing a URL like
http://:8080/healthz for the http probe. This happens to work on the master
because all of the pods are using host networking and explicitly binding to
127.0.0.1. Once the kubelet is registered with the master and it determines
the local node address, it tries to healthcheck on an address where the pod
isn't listening and the kubelet periodically restarts each master component
when the liveness probe fails.
2015-08-06 16:13:35 -07:00
Robert Bailey
4df5815d62
Refactor the functions that generate auth for the kubelet and kubeproxy and remove the insecure configuration now that GKE has plumbed through certificates.
2015-08-06 16:13:34 -07:00
Wojciech Tyczynski
fd0a0ed26c
Merge pull request #12336 from devurandom/patch-1
...
Fix link to etcd on quay.io in from-scratch-guide
2015-08-06 15:10:13 +02:00
Dennis Schridde
7c8db7884b
Fix link to etcd on quay.io in from-scratch-guide
2015-08-06 12:03:23 +02:00
Alex Robinson
0005244e0b
Merge pull request #12318 from a-robinson/automated-cherry-pick-of-#12314-upstream-release-1.0
...
Bump the heapster pod's memory limit from 200MiB to 300MiB.
2015-08-05 17:28:09 -07:00
Alex Robinson
a8aa9491c9
Bump the heapster pod's memory limit from 200MiB to 300MiB.
2015-08-05 17:01:10 -07:00
Alex Robinson
74c09641ed
Merge pull request #12243 from vishh/v0.1.0
...
Updating heapster to v0.16.1.
2015-08-05 16:12:51 -07:00
Alex Mohr
e92c29e7e0
Merge pull request #12244 from a-robinson/automated-cherry-pick-of-#12240-upstream-release-1.0
...
Auto commit by PR queue bot
2015-08-05 01:24:35 -07:00
Alex Mohr
b7709d8e4f
Merge pull request #12237 from jbeda/automated-cherry-pick-of-#11390-upstream-release-1.0
...
Automated cherry pick of #11390 upstream release 1.0
2015-08-04 22:09:52 -07:00
Alex Robinson
f4b61b0359
Collect more of the VM's log files (monit, salt) in fluentd-es.
2015-08-04 19:58:01 -07:00
Alex Robinson
139d719ddf
Collect more of the VM's log files (monit, salt) in fluentd-gcp.
2015-08-04 19:58:01 -07:00
Vishnu Kannan
58259999ba
Updating heapster to v0.16.1.
2015-08-04 19:31:46 -07:00
Jean-Francois Chevrette
6cf78c7428
same change for minion provision script
2015-08-04 17:12:44 -07:00
Jean-Francois Chevrette
09116b6480
properly make sure that eth1 is not managed by NetworkManager
2015-08-04 17:12:44 -07:00
Jean-Francois Chevrette
fe99cd6fa1
restart network twice to workaround bug
2015-08-04 17:12:44 -07:00
Alex Mohr
fc9d43708e
Merge pull request #12225 from feelobot/patch-1
...
Auto commit by PR queue bot
2015-08-04 16:32:45 -07:00
Alex Mohr
15cf794d49
Merge pull request #12192 from wojtek-t/automated-cherry-pick-of-#11692-upstream-release-1.0
...
Auto commit by PR queue bot
2015-08-04 16:16:27 -07:00
Felix Rodriguez
e69a0a53ac
Update Kubectl Version
2015-08-04 14:05:46 -07:00
Wojciech Tyczynski
5f6187f70e
Swich to new gcloud API for GCE MIGs
2015-08-04 09:42:03 +02:00
Zach Loafman
7ab8b044f8
Merge pull request #12178 from saad-ali/automated-cherry-pick-of-#11873-upstream-release-1.0
...
Automated cherry pick of #11873 for 1.0.3 release
2015-08-03 17:07:21 -07:00
Zach Loafman
9b5a5e9db3
Merge pull request #12175 from cjcullen/automated-cherry-pick-of-#12028-upstream-release-1.0
...
Automated cherry pick of #12028
2015-08-03 17:04:40 -07:00
saadali
66d2230016
Fix flaky PD test by adding wait for detach
2015-08-03 16:20:15 -07:00
CJ Cullen
e0c51f6427
Make gce.ExternalID() use metadata server when requesting current external ID
...
Use the already computed instanceID instance of looking it up again.
2015-08-03 15:41:58 -07:00
Zach Loafman
171db6f75f
Merge pull request #12118 from brendandburns/release-1.0
...
Release 1.0.2
2015-07-31 22:02:55 -07:00
Brendan Burns
e310e619fc
Kubernetes version v1.0.2
2015-07-31 21:21:58 -07:00
Brendan Burns
2a19fa92fb
Versioning docs and examples for 1.0.2
2015-07-31 21:21:14 -07:00
Mike Danese
028393ee65
Merge pull request #12101 from zmerlynn/automated-cherry-pick-of-#11941-upstream-release-1.0
...
Automated cherry pick of #11941
2015-07-31 14:50:44 -07:00
Zach Loafman
fd23207b81
Enacting versioning.md
...
This PR changes how we version going forward in the following ways:
* mark-new-version.sh is changed to a new policy of just splitting
branches, rather than the old backmerge policy, as discussed in
vX.Y.0, and a tag for vX.(Y+1).0-alpha.0 back to master.
* I eliminated PRs back to master by making the version/base.go
gitVersion and gitCommit just be `export-subst`. I testing that this
works with GitHub's source export tarballs. There's no reason to
bother with forcing the version into `base.go` (especially twice). The
tarball versions outside a git tree aren't perfect (master looks like
"v0.0.0+hash", and the release branches look more accurate), but our
build contract has never allowed that version is perfect in this
situation, so I think we can relax this.
* That master tag gets picked up by "git describe" on master, so e.g.
master would have immediately become v1.1.0-alpha.0
* In order to be more semVer compatible, the gitVersion field for the
master branch now looks something like 1.1.0-alpha.0.6+84c76d1142ea4d.
This is a tiny translation of the "git describe". I did this because
there are a ton of consumers out there of the "gitVersion" field
expecting it to be the full version, but it would be nice if this
field were actually semver compliant. (1.1.0-alpha.0-6-84c76d1142ea4d
is, but it's not *usefully* so.)
Fixes #11495
2015-07-31 11:58:34 -07:00
Zach Loafman
2839494709
Merge pull request #12054 from a-robinson/automated-cherry-pick-of-#12024-#11963-upstream-release-1.0
...
Automated cherry pick of #12024 #11963
2015-07-31 05:34:28 -07:00
Zach Loafman
6b848d8ac7
Merge pull request #12057 from a-robinson/automated-cherry-pick-of-#12045-upstream-release-1.0
...
Automated cherry pick of #12045 upstream release 1.0
2015-07-31 05:32:08 -07:00
Zach Loafman
ef2eb89929
Merge pull request #12051 from saad-ali/automated-cherry-pick-of-#11128-#10986-#11561-upstream-release-1.0
...
Automated cherry pick of #11128 #10986 #11561 upstream release 1.0
2015-07-31 05:29:45 -07:00
Alex Robinson
a8740a6fc0
Update fluentd-es to collect etcd logs and remove merge conflict cruft.
2015-07-31 00:25:37 +00:00
Alex Robinson
74deb5ce5a
Make fluentd-gcp collect etcd's logs on the master.
2015-07-31 00:25:37 +00:00
Alex Robinson
971dfe53c7
Make the kubelet on a GCE master check instance metadata for manifests.
...
Primary motivation: enable GKE and other cluster-as-a-service folks to
easily run additional logic on the master without having to modify salt
or SSH to the master after it's been created.
2015-07-30 16:42:04 -07:00
Alex Robinson
4253e2e710
Limit the logging from kubelet attempting to read its manifest URL.
...
Without this, it logs an error every 20 seconds if nothing is at the
provided URL.
2015-07-30 16:42:03 -07:00
Alex Robinson
a25537d991
Support passing a header to the manifest URL in the kubelet.
...
Needed to support using GCE's v1 metadata API, which requires passing
the header "Metadata-Flavor: Google".
2015-07-30 16:42:03 -07:00
saadali
5f4fa0dfdf
Make GCE PD attach block on pending detach. Retry on detach/attach errors.
2015-07-30 15:47:09 -07:00
Wojciech Tyczynski
e95843aee4
Migrate tests to non-default namespaces
2015-07-30 15:47:08 -07:00
Justin Santa Barbara
3733d1588e
e2e: Add test to pd that disk contents are preserved
...
Issue #11012 reported that disk contents may be lost (sometimes).
We should have an e2e test to verify this is not happening.
(If it is happening, we should then fix it!)
2015-07-30 15:47:07 -07:00
Zach Loafman
7140a5cf6e
Merge pull request #12040 from zmerlynn/automated-cherry-pick-of-#11622-#11865-upstream-release-1.0
...
Automated cherry pick of #11622 #11865 upstream release 1.0
2015-07-30 15:39:41 -07:00
Zach Loafman
8f221eaa8d
Fixup for v1.0.1
2015-07-30 14:59:48 -07:00
Tim Hockin
c67350ef78
Apply version subst multiple times per line
2015-07-30 14:53:05 -07:00
nikhiljindal
6067244945
Extract out the versionize docs part in a separate script
2015-07-30 14:53:04 -07:00
Zach Loafman
819c2ccc9d
Merge pull request #12044 from thockin/release-1.0
...
Wrap IS_VERSIONED in munge delims on release-1.0
2015-07-30 14:52:43 -07:00
Tim Hockin
362d0c9388
Wrap IS_VERSIONED in munge delims on release-1.0
2015-07-30 14:47:14 -07:00
