Commit Graph

12112 Commits

Author SHA1 Message Date
Tim Hockin
677d0fdf87 Merge pull request #8782 from orangain/fix-kubectl-path-in-x86
kubectl's dir should be 386 not x86 in x86 enviroment
2015-05-28 16:59:25 -07:00
Clayton Coleman
2b8e918ed9 TTL is not preserved automatically during edit
Change the signature of GuaranteedUpdate so that TTL can
be more easily preserved. Allow a simpler (no ttl) and
more complex (response and node directly available, set ttl)
path for GuaranteedUpdate.  Add some tests to ensure this
doesn't blow up again.
2015-05-28 19:58:17 -04:00
Tim Hockin
2e7b6d94c2 Merge pull request #8955 from dchen1107/cleanup
Remove useless master component images after saving image as tar file.
2015-05-28 16:57:55 -07:00
Tim Hockin
d0daabb34b Merge pull request #8471 from bprashanth/scheduler_burst
Limit the scheduler to a burst qps of 30
2015-05-28 16:55:25 -07:00
Tim Hockin
9e486be743 Merge pull request #8795 from a-robinson/latency
Remove the clientID field from the apiserver request latency metric
2015-05-28 16:55:11 -07:00
Tim Hockin
7b7f4f6c76 Merge pull request #8913 from sroze/patch-1
Fix typo in Content-Type name
2015-05-28 16:54:56 -07:00
Tim Hockin
bade36c7dd Merge pull request #8826 from markturansky/b2d_fix
Fixed setNodeStatus to allow running on pods on OS X
2015-05-28 16:54:42 -07:00
Tim Hockin
e3283b700d Merge pull request #8968 from yifan-gu/rkt_doc
docs: Add README for getting started with rkt.
2015-05-28 16:54:10 -07:00
Tim Hockin
b72a8309b5 Merge pull request #8972 from lavalamp/networkTimeout
fix old networking test to use version 1.3
2015-05-28 16:53:40 -07:00
Tim Hockin
da78ab6b63 Merge pull request #8740 from thockin/nix-portal
Rename "portalIP" to "clusterIP"
2015-05-28 16:52:02 -07:00
Tim Hockin
35c7912a7a Merge pull request #8971 from krousey/go-restful_update
Update go-restful to get stable sorting in spec
2015-05-28 16:49:49 -07:00
Daniel Smith
779e0d8529 fix old networking test to use version 1.3 2015-05-28 16:49:25 -07:00
Kris Rousey
22b2c68c02 Update go-restful to get stable sorting in spec
This reverts commit 4a7071e7f7.
2015-05-28 16:43:13 -07:00
Tim Hockin
9a49e8155f Update generated code 2015-05-28 16:28:18 -07:00
Yifan Gu
e5d8a21290 docs: Add README for getting started with rkt. 2015-05-28 16:28:02 -07:00
Tim Hockin
e13d6078de Final pass looking for errant 'portal' strings 2015-05-28 16:10:44 -07:00
Tim Hockin
ac3cc3c518 Rename PORTAL_NET all over 2015-05-28 16:10:44 -07:00
Tim Hockin
3005471100 Add new apiserver flags for clusterIP (nee portal)
Leave old flags but marked as deprecated
2015-05-28 16:10:44 -07:00
Tim Hockin
4318ca5a8b Rename 'portal IP' to 'cluster IP' most everywhere
This covers obvious transforms, but not --portal_net, $PORTAL_NET and
similar.
2015-05-28 16:10:44 -07:00
Tim Hockin
46686616d4 Merge pull request #8967 from GoogleCloudPlatform/revert-8944-go-restful_update
Revert "Update go-restful to get stable sorting in spec"
2015-05-28 16:04:32 -07:00
Tim Hockin
4a7071e7f7 Revert "Update go-restful to get stable sorting in spec" 2015-05-28 16:04:11 -07:00
Tim Hockin
d639005422 Merge pull request #8965 from thockin/fix-build
Fix undetected merge conflict
2015-05-28 16:01:07 -07:00
Tim Hockin
b17e343afc Fix undetected merge conflict 2015-05-28 16:00:10 -07:00
Chao Xu
ba1f8209fe let the coreos bare_metal_offline.md point to examples/ rather than having its own examples 2015-05-28 15:57:34 -07:00
Tim Hockin
d355154181 Merge pull request #8556 from kargakis/label-parsing-fix
label: Invalidate empty or invalid value labels
2015-05-28 15:54:14 -07:00
Tim Hockin
32bb3ae8f1 Merge pull request #7775 from simon3z/cloud-provider-id
api: add the ProviderID attribute to NodeSpec
2015-05-28 15:54:00 -07:00
Tim Hockin
081ab3abac Merge pull request #8853 from caesarxuchao/HostToNodeName
update PodSpec.Host to PodSpec.NodeName
2015-05-28 15:50:12 -07:00
Tim Hockin
e0fe9bb4d6 Merge pull request #8959 from lavalamp/networkTimeout
Network timeout
2015-05-28 15:49:57 -07:00
Chao Xu
4ef7b33d4c update fedora_ansible_config.md to v1beta3 2015-05-28 15:43:09 -07:00
Tim Hockin
2c20c3664c Merge pull request #8902 from brendandburns/fix
Turn off certificate checking for Mavericks, as the curl is borked.
2015-05-28 15:32:50 -07:00
Tim Hockin
df4c591943 Merge pull request #8893 from jeffmendoza/patch-2
Wordpress Example: clarify GCE zone
2015-05-28 15:31:00 -07:00
Tim Hockin
4ac239499b Merge pull request #8904 from justinsb/fix_8903
GCE kube-up; write the marker only after we have uploaded the file
2015-05-28 15:30:47 -07:00
Tim Hockin
2cadd4c86e Merge pull request #8906 from justinsb/aws_volume_fixes
Fix AWS volumes
2015-05-28 15:30:33 -07:00
Tim Hockin
ba07e5d472 Merge pull request #8920 from whitmo/bundle-version-update
Update kubernetes version to 0.17.1 in bundle
2015-05-28 15:30:14 -07:00
Tim Hockin
8f1bc2ad77 Merge pull request #8922 from pmorie/mt-comment
Add comments in mt.go
2015-05-28 15:30:00 -07:00
Tim Hockin
72c2e3b8a1 Merge pull request #8944 from krousey/go-restful_update
Update go-restful to get stable sorting in spec
2015-05-28 15:29:43 -07:00
Tim Hockin
0dab399b6a Merge pull request #8948 from jlowdermilk/proxy-help
update/fix kubectl proxy example in help string
2015-05-28 15:29:11 -07:00
Tim Hockin
3274bd0674 Merge pull request #8952 from rjnagal/rc
Updated broken ordering of prerequisites.
2015-05-28 15:28:54 -07:00
Chao Xu
bac48b4120 update getting-started-guides/juju.md to v1beta3, following 4f1fe55a9e 2015-05-28 15:25:10 -07:00
Daniel Smith
c8f03fc354 fix timeout for networking test 2015-05-28 15:01:59 -07:00
Daniel Smith
0e49e1535f split into old/new networking test 2015-05-28 15:01:59 -07:00
Daniel Smith
d683548fd6 Revert "Revert "Revert "Revert "Fix networking test""""
This reverts commit 30ffe0325c.
2015-05-28 15:01:59 -07:00
Tim Hockin
44ed7a69c2 Merge pull request #8950 from caesarxuchao/azure-getting-started-guides
let azure getting started guides point to examples/
2015-05-28 15:01:54 -07:00
Tim Hockin
3e08cfb9f5 Merge pull request #8924 from erickhan/master
Update roadmap.md
2015-05-28 15:01:39 -07:00
Tim Hockin
e456e8d63e Merge pull request #8921 from wojtek-t/update_instructions
Update instructions on auto-generating conversions.
2015-05-28 15:01:24 -07:00
Tim Hockin
1087c12e63 Merge pull request #8909 from wojtek-t/fix_example_selflinks
Fix selfLinks in test examples to v1beta3
2015-05-28 15:01:02 -07:00
Tim Hockin
6fbaefdced Merge pull request #8897 from pweil-/reduce-merge-logging
reduce merge logging
2015-05-28 15:00:45 -07:00
Tim Hockin
eabc65149e Merge pull request #8896 from lavalamp/e2e-timeout
Give up waiting for failed pods + print status
2015-05-28 15:00:19 -07:00
Tim Hockin
3830c068b9 Merge pull request #8883 from yujuhong/kubelet_unittest2
Kubelet: clean up more unit tests
2015-05-28 15:00:02 -07:00
Tim Hockin
32859c3954 Merge pull request #8778 from kargakis/show-pod-number
Show pods number when describing services
2015-05-28 14:59:02 -07:00