Zach Loafman
c85f20021b
Revert "Versioning docs and examples for 0.21.2"
...
This reverts commit baf92e62a0
2015-07-10 17:06:22 -07:00
Zach Loafman
bc4e751093
Kubernetes version v0.21.2-dev
2015-07-10 17:06:22 -07:00
Zach Loafman
4e89f2e667
Kubernetes version v0.21.2
2015-07-10 17:06:22 -07:00
Zach Loafman
baf92e62a0
Versioning docs and examples for 0.21.2
2015-07-10 17:06:22 -07:00
Zach Loafman
6511067a1d
Merge pull request #11092 from zmerlynn/fix-gofmt-release-021
...
Fix gofmt from #11084
2015-07-10 17:02:39 -07:00
Zach Loafman
63c73a58a5
Fix gofmt from #11084
2015-07-10 17:01:28 -07:00
Zach Loafman
fd254169c6
Merge pull request #11087 from zmerlynn/automated-cherry-pick-of-#11084-on-upstream-release-0.21
...
Automated cherry pick of #11084
2015-07-10 15:54:32 -07:00
Brendan Burns
a93d33d961
add spec.host as a synonym for spec.nodeName in v1
2015-07-10 15:51:35 -07:00
Zach Loafman
54c0759ded
Merge pull request #11065 from zmerlynn/automated-cherry-pick-of-#10932-on-upstream-release-0.21
...
Automated cherry pick of #10932
2015-07-10 09:56:53 -07:00
Zach Loafman
d96d8163fa
Add skip/flaky arguments for the jenkins-gce-e2e-release job
...
I haven't added the job yet. Want to get the args in place first.
Related to #10676
2015-07-10 09:55:21 -07:00
Zach Loafman
a9c7d31dc7
Merge pull request #11034 from thockin/automated-cherry-pick-of-#11033-on-automated-cherry-pick-of-#11028-on-upstream-release-0.21
...
Automated cherry pick of #11028 and #11033 on upstream release 0.21
2015-07-10 08:24:33 -07:00
Tim Hockin
e1ead8f3dd
Only subst things that exist
2015-07-09 17:30:12 -07:00
Tim Hockin
ba8cf2c5f6
On release, always subst new version
2015-07-09 17:25:23 -07:00
Zach Loafman
3f14ca781b
Merge pull request #11023 from thockin/automated-cherry-pick-of-#10961-on-release-0.21
...
Automated cherry pick of #10961 on release 0.21
2015-07-09 16:05:23 -07:00
Tim Hockin
ec2dd1ecfb
Fix quoting issue on sed
2015-07-09 16:00:56 -07:00
Zach Loafman
32afe0ce7f
Merge pull request #11022 from thockin/automated-cherry-pick-of-#10896-on-release-0.21
...
Automated cherry pick of #10896 on release 0.21
2015-07-09 15:45:52 -07:00
Tim Hockin
82b246e487
Make READMEs clearer wrt versions
2015-07-09 15:31:05 -07:00
Tim Hockin
e445e836b1
reflow lines
2015-07-09 15:22:56 -07:00
Zach Loafman
e1cccbf318
Merge pull request #10969 from zmerlynn/release-0.21
...
Release 0.21.1
2015-07-08 19:11:13 -07:00
Zach Loafman
9d2691d48b
Kubernetes version v0.21.1-dev
2015-07-08 18:52:51 -07:00
Zach Loafman
906122a279
Kubernetes version v0.21.1
2015-07-08 18:52:51 -07:00
Zach Loafman
aa618a97f4
Versioning docs and examples for 0.21.1
2015-07-08 18:52:50 -07:00
Zach Loafman
5c41af424f
Merge pull request #10967 from thockin/automated-cherry-pick-of-#10488-on-upstream-release-0.21
...
Automated cherry pick of #10488 on upstream release 0.21
2015-07-08 18:33:28 -07:00
Justin Santa Barbara
d306738bec
Salt: re-remove comment block
...
It had been removed in upstream, but had been kept by mistake here.
2015-07-08 18:25:24 -07:00
Justin Santa Barbara
cee489d499
Salt: have kube-addons service depend on init file
...
For symmetry with systemd
2015-07-08 18:25:24 -07:00
Justin Santa Barbara
191528b782
Salt: Add service block for kube-proxy for systemd
...
We have the workaround for Salt's problems here, but we should still express
our intent.
2015-07-08 18:25:24 -07:00
Justin Santa Barbara
efce770fbb
Salt: clean daemon_args on RedHat, not systemd
...
I don't think it actually makes a difference based on how we're using it,
but this is now more of a precise change.
2015-07-08 18:25:24 -07:00
Justin Santa Barbara
aff1ffc319
Salt: Add more dependencies to systemd services
...
This may help Salt reload services correctly, although we still
need the script until Salt's bug with reloading services on systemd
is resolved.
Salt bug: https://github.com/saltstack/salt/issues/16778
2015-07-08 18:25:24 -07:00
Justin Santa Barbara
a5fa0b8bb5
Set standard bash options in services helper script
2015-07-08 18:25:23 -07:00
Justin Santa Barbara
d09c9fe355
Salt: support systemd (don't assume Redhat <=> systemd)
...
Also work around problems with Salt & systemd services, in particular
that Salt doesn't issue a daemon-reload.
2015-07-08 18:25:23 -07:00
Zach Loafman
51360aa350
Merge pull request #10947 from zmerlynn/automated-cherry-pick-of-#10562-on-upstream-release-0.21
...
Automated cherry pick of #10562
2015-07-08 16:07:48 -07:00
Zach Loafman
39c31bab40
Merge pull request #10939 from zmerlynn/automated-cherry-pick-of-#10884-on-upstream-release-0.21
...
Automated cherry pick of #10884 on upstream release 0.21
2015-07-08 16:06:23 -07:00
Zach Loafman
f4a8727642
Merge pull request #10942 from brendandburns/automated-cherry-pick-of-#10877-on-release-0.21
...
Automated cherry pick of #10877 on release 0.21
2015-07-08 16:05:28 -07:00
derekwaynecarr
e2583915e9
Missing ca crt in vagrant controllers
2015-07-08 12:33:01 -07:00
Brendan Burns
2c5e4a9555
Don't start Docker by default on AWS
2015-07-08 11:48:22 -07:00
Brendan Burns
fadb9e16d4
Generate a kubeconfig file for the kubelet.
2015-07-08 11:48:22 -07:00
Dawn Chen
940e555cdf
Upgrade to v6 from v5
2015-07-08 11:40:26 -07:00
Dawn Chen
3eb0444437
Disable liveness for dns due to #10659
2015-07-08 11:40:26 -07:00
Zach Loafman
708f3a9b55
Kubernetes version v0.21.0-dev
2015-07-07 14:56:55 -07:00
Zach Loafman
39b013a5d5
Kubernetes version v0.21.0
2015-07-07 14:56:55 -07:00
Zach Loafman
aa9d423e78
Versioning docs and examples for 0.21.0
2015-07-07 14:56:55 -07:00
Zach Loafman
daafc5be4b
Merge pull request #10839 from zmerlynn/fix-mark-new-version
...
Change build/mark-new-version.sh to always create a backmerge branch
2015-07-07 14:19:17 -07:00
Yu-Ju Hong
e29b76d46e
Merge pull request #10849 from bgrant0607/bugfix1
...
Update UI redirect to kube-system.
2015-07-07 13:18:04 -07:00
Brian Grant
ee06479a66
Update UI redirect to kube-system.
2015-07-07 18:21:07 +00:00
Yu-Ju Hong
530bff315f
Merge pull request #10719 from justinsb/aws_mountpoints
...
AWS: Some images require volume mounts on /dev/xvdX
2015-07-07 10:48:19 -07:00
Yu-Ju Hong
2337daf1f6
Merge pull request #10738 from feihujiang/updateNodeInfoOfNodeDoc
...
Update node info description in node.md
2015-07-07 10:47:03 -07:00
Yu-Ju Hong
76ec1be611
Merge pull request #10817 from satnam6502/sys-namespace
...
Change config files to kube-system which were missed in the original PR
2015-07-07 10:46:35 -07:00
Yu-Ju Hong
da25b1224f
Merge pull request #10786 from thockin/docs-networking
...
De-dup, cleanup, overhaul networking docs
2015-07-07 10:45:49 -07:00
Zach Loafman
0185809a35
Change build/mark-new-version.sh to always create a backmerge branch
...
that reverts the doc diff.
This changes mark-new-version to create a backmerge branch that will
additionally handle the revert of the doc diff that's now created for
every release.
Sidebar: I really wish I knew a good git visualizer for GitHub - this
thing is going to start creating some awesome Gordian knots of merges.
(Or more like little Omegas, since they basically just change
version/base.go.)
Fixes #10825
2015-07-07 10:44:00 -07:00
Yu-Ju Hong
0947b2715a
Merge pull request #9949 from iterion/aws-production-instance-types
...
AWS: Note about instance types
2015-07-07 10:16:22 -07:00
