Commit Graph

26379 Commits

Author SHA1 Message Date
Justin Santa Barbara
e40595fa57 AWS volumes: Release disk from attaching map on error
If AWS gives us an actual error (vs just timing out), we know the disk
did not attach, and so we can remove it immediately from the attaching
map.
2016-03-11 11:40:39 -05:00
Justin Santa Barbara
79b2b7edef AWS EBS: Remove the attached volumes cache
There are known issues with the attached-volume state cache that just aren't
possible to fix with the current interface.

Replace it with a map of the active attach jobs (that was the original
requirement, to avoid a nasty race condition).

This costs us an extra DescribeInstance call on attach/detach, but that
seems worth it if it ends this class of bugs.

Fix #15073
2016-03-10 07:50:35 -05:00
k8s-merge-robot
d7a87c2285 Merge pull request #22741 from wojtek-t/refactor_protobuf_generator
Auto commit by PR queue bot
2016-03-10 03:28:19 -08:00
Wojciech Tyczynski
62dc80c9a2 Fix package 2016-03-10 08:21:01 +01:00
k8s-merge-robot
6773c2b60f Merge pull request #22769 from madhusudancs/scale-rc-rv
Auto commit by PR queue bot
2016-03-09 22:20:28 -08:00
k8s-merge-robot
0c10fce98c Merge pull request #22606 from fejta/deployment
Auto commit by PR queue bot
2016-03-09 21:46:15 -08:00
Madhusudan.C.S
e8ee3eda2a Pass ResourceVersion in Scale object back to RC before updating RC so that it can be used to check for conflicts. 2016-03-09 19:44:21 -08:00
k8s-merge-robot
108f722657 Merge pull request #22724 from madhusudancs/scale-hpa-stopgap-1.2
Auto commit by PR queue bot
2016-03-09 19:16:26 -08:00
Madhusudan.C.S
fe26381c90 Support for both map-based and set-based selectors in extensions/v1beta1.Scale
Here are a list of changes along with an explanation of how they work:
1. Add a new string field called TargetSelector to the external version of
   extensions Scale type (extensions/v1beta1.Scale). This is a serialized
   version of either the map-based selector (in case of ReplicationControllers)
   or the unversioned.LabelSelector struct (in case of Deployments and
   ReplicaSets).
2. Change the selector field in the internal Scale type (extensions.Scale) to
   unversioned.LabelSelector.
3. Add conversion functions to convert from two external selector fields to a
   single internal selector field. The rules for conversion are as follows:
   i.   If the target resource that this scale targets supports LabelSelector
        (Deployments and ReplicaSets), then serialize the LabelSelector and
        store the string in the TargetSelector field in the external version
        and leave the map-based Selector field as nil.
   ii.  If the target resource only supports a map-based selector
        (ReplicationControllers), then still serialize that selector and
	store the serialized string in the TargetSelector field. Also,
	set the the Selector map field in the external Scale type.
   iii. When converting from external to internal version, parse the
        TargetSelector string into LabelSelector struct if the string isn't
	empty. If it is empty, then check if the Selector map is set and just
	assign that map to the MatchLabels component of the LabelSelector.
   iv.  When converting from internal to external version, serialize the
        LabelSelector and store it in the TargetSelector field. If only
	the MatchLabel component is set, then also copy that value to
	the Selector map field in the external version.
4. HPA now just converts the LabelSelector field to a Selector interface
   type to list the pods.
5. Scale Get and Update etcd methods for Deployments and ReplicaSets now
   return extensions.Scale instead of autoscaling.Scale.
6. Consequently, SubresourceGroupVersion override and is "autoscaling"
   enabled check is now removed from pkg/master/master.go
7. Other small changes to labels package, fuzzer and LabelSelector
   helpers to piece this all together.
8. Add unit tests to HPA targeting Deployments and ReplicaSets.
9. Add an e2e test to HPA targeting ReplicaSets.
2016-03-09 17:54:17 -08:00
k8s-merge-robot
af2f003585 Merge pull request #22740 from wojtek-t/fix_fake_handler_test
Auto commit by PR queue bot
2016-03-09 16:35:40 -08:00
k8s-merge-robot
bf3cc9d126 Merge pull request #22722 from spxtr/upgrades-wtf
Auto commit by PR queue bot
2016-03-09 14:41:02 -08:00
Joe Finney
0976ed59c9 Remove hack/e2e-internal/e2e-upgrade.sh. 2016-03-09 14:14:04 -08:00
k8s-merge-robot
36cb9d05ea Merge pull request #22728 from spxtr/tidy-shell
Auto commit by PR queue bot
2016-03-09 13:59:13 -08:00
Brian Grant
3f7f167790 Merge pull request #22743 from gmarek/register-kubelet
Make kubelet-perf 100 pod/node test work with registered master
2016-03-09 13:58:27 -08:00
Brian Grant
8cc91944e0 Merge pull request #22729 from david-mcmahon/mungedocs
Update the latestReleaseBranch to release-1.2 in the munger.
2016-03-09 13:39:40 -08:00
k8s-merge-robot
3081c10a40 Merge pull request #22632 from jsafrane/devel/fix-nfs-image
Auto commit by PR queue bot
2016-03-09 12:51:44 -08:00
k8s-merge-robot
16c42d9bdf Merge pull request #22749 from madhusudancs/fix-selector-operator-cases
Auto commit by PR queue bot
2016-03-09 12:11:27 -08:00
k8s-merge-robot
26e9f187d7 Merge pull request #22613 from jayunit100/e2e-volumes-simple
Auto commit by PR queue bot
2016-03-09 11:29:13 -08:00
k8s-merge-robot
cfb01cd077 Merge pull request #22748 from huang195/fix_broken_km_controller
Auto commit by PR queue bot
2016-03-09 10:51:26 -08:00
Madhusudan.C.S
6b34a2bac6 Selector operator strings should all be lowercase to be consistent with other operators. 2016-03-09 10:02:37 -08:00
k8s-merge-robot
3bd98fa96e Merge pull request #22414 from mfanjie/add-proxy-settings
Auto commit by PR queue bot
2016-03-09 09:58:04 -08:00
Joe Finney
9162cde8c8 Merge pull request #22714 from spxtr/e2e-1-2
Add kubernetes-e2e-gce-release-1.2 e2e suite.
2016-03-09 09:50:04 -08:00
Joe Finney
09c27cdabc Add kubernetes-e2e-gce-release-1.2 e2e suite. 2016-03-09 09:48:53 -08:00
k8s-merge-robot
ea4280a814 Merge pull request #22670 from spxtr/ssh-timeout
Auto commit by PR queue bot
2016-03-09 09:18:18 -08:00
HAI HUANG
85269ae1b0 fix broken km controller 2016-03-09 11:58:51 -05:00
gmarek
38411818ed Make kubelet-perf 100 pod/node test work with registered master 2016-03-09 16:05:04 +01:00
Wojciech Tyczynski
46ba2bfc89 Fix fake_handler test in Go 1.6 2016-03-09 14:24:42 +01:00
Wojciech Tyczynski
454468f5c2 Remove dead code 2016-03-09 12:19:02 +01:00
Wojciech Tyczynski
dcf292174e Refactor Rewrite functions 2016-03-09 12:19:02 +01:00
David McMahon
dae84f5306 Update the latestReleaseBranch to release-1.2 in the munger. 2016-03-08 18:59:28 -08:00
k8s-merge-robot
aca37830b1 Merge pull request #22720 from bprashanth/ing_e2e_masterip
Auto commit by PR queue bot
2016-03-08 18:26:57 -08:00
Joe Finney
9845639e14 Remove cluster/kube-env.sh. 2016-03-08 16:57:31 -08:00
Joe Finney
401985bf6c Move KUBERNETES_PROVIDER setting into cluster/kube-util.sh. 2016-03-08 16:51:20 -08:00
Joe Finney
e8fda8c9e8 Remove kube_server_version from cluster/kube-env.sh. 2016-03-08 16:07:04 -08:00
Prashanth Balasubramanian
f6c8b9b238 Don't list master node when looking to a NodePort node. 2016-03-08 15:12:13 -08:00
k8s-merge-robot
fa21ef11bd Merge pull request #22708 from mikedanese/revert-revert
Auto commit by PR queue bot
2016-03-08 14:51:25 -08:00
k8s-merge-robot
dba955e112 Merge pull request #22521 from wojtek-t/support_go_16_in_gofmt
Auto commit by PR queue bot
2016-03-08 13:14:45 -08:00
k8s-merge-robot
aaf31ac8dc Merge pull request #22709 from mikedanese/enable-master
Auto commit by PR queue bot
2016-03-08 12:29:52 -08:00
Mike Danese
d8eaed912a fix pod garbage collection test 2016-03-08 12:21:41 -08:00
k8s-merge-robot
3d58b9c07f Merge pull request #22678 from spxtr/feature-tests
Auto commit by PR queue bot
2016-03-08 11:53:58 -08:00
k8s-merge-robot
75699ff5ea Merge pull request #22458 from bprashanth/ing_tls_e2e
Auto commit by PR queue bot
2016-03-08 11:53:56 -08:00
Mike Danese
2d3b8ab1eb enable master kubelet in gce-default to match gce-test 2016-03-08 11:14:15 -08:00
k8s-merge-robot
43aa3d34ab Merge pull request #18338 from gmarek/register-kubelet
Auto commit by PR queue bot
2016-03-08 11:10:36 -08:00
Mike Danese
e0431d8409 Revert "Revert "continuously delete pods on nodes that don't exist""
This reverts commit da0a72f2c2.
2016-03-08 11:00:35 -08:00
Brian Grant
1c6a6aa8df Merge pull request #22697 from eparis/docs-readme-link
Fix docs README.md links to kubernetes.github.io
2016-03-08 07:41:55 -08:00
k8s-merge-robot
a6aaf81892 Merge pull request #22430 from gmarek/round-robin
Auto commit by PR queue bot
2016-03-08 07:18:03 -08:00
Eric Paris
ca40c5dccb Fix docs README.md links to kubernetes.github.io
kubernetes.github.io uses index not README for it's base dir. So we were
linking to the wrong place.
2016-03-08 10:07:41 -05:00
k8s-merge-robot
7e9256b39e Merge pull request #22383 from spxtr/core
Auto commit by PR queue bot
2016-03-08 06:44:18 -08:00
k8s-merge-robot
999e6311b5 Merge pull request #18672 from bprashanth/netexec
Auto commit by PR queue bot
2016-03-08 06:10:02 -08:00
k8s-merge-robot
55530bc8f7 Merge pull request #22664 from bprashanth/cleanup-hairpin
Auto commit by PR queue bot
2016-03-08 05:36:18 -08:00