Commit Graph

13639 Commits

Author SHA1 Message Date
k8s-merge-robot
5f5ac27996 Merge pull request #22502 from caesarxuchao/ignore-notfound-etcd
Auto commit by PR queue bot
2016-03-11 15:53:51 -08:00
k8s-merge-robot
de7193a095 Merge pull request #22788 from justinsb/fix_22786
Auto commit by PR queue bot
2016-03-11 15:13:06 -08:00
k8s-merge-robot
949b2e612a Merge pull request #22791 from justinsb/fix_15073
Auto commit by PR queue bot
2016-03-11 13:43:32 -08:00
Brian Grant
b7984b2fa7 Merge pull request #22862 from jlowdermilk/typo
fix typo in kubectl run help string
2016-03-11 12:26:48 -08:00
Brian Grant
d514a65c8d Merge pull request #22802 from ncdc/httpstream-reset-streams-when-closing-connection
Close streams with Reset instead of Close when closing streaming connections
2016-03-11 12:21:19 -08:00
Brian Grant
3defbc6680 Merge pull request #22410 from nikhiljindal/apiReferenceFlag
Deprecating --api-version flag
2016-03-11 12:14:43 -08:00
Brian Grant
532ba5a3c6 Merge pull request #21535 from AdoHe/restore_secure_etcd
restore ability to run against secured etcd
2016-03-11 12:14:06 -08:00
nikhiljindal
593b78f925 Deprecating --api-version flag 2016-03-11 10:12:44 -08:00
Jeff Lowdermilk
627615c870 fix typo in kubectl run help string 2016-03-11 10:11:14 -08:00
Brian Grant
5cc7790f45 Merge pull request #22853 from deads2k/parse-version
allow resource.version.group in kubectl
2016-03-11 10:11:00 -08:00
Brian Grant
c6b4518aed Merge pull request #22666 from pmorie/pod-ip-flake-redux
Fix flake in pod IP as env var e2e
2016-03-11 09:42:40 -08:00
Andy Goldstein
7230bd1096 Fix rkt GetPods() order
Use an array to store the pod IDs and use that to build the pod array with consistent ordering,
instead of map ordering, which is random and causes test flakes.
2016-03-11 12:32:22 -05:00
Brian Grant
1c50f1831c Merge pull request #22849 from soltysh/issue22836
Added api discovery to kubectl run, based on which we decide which generators to use
2016-03-11 09:04:12 -08:00
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
Andy Goldstein
01b33ec330 Close streams with Reset instead of Close when closing streaming connections
This ensures that the call to close the underlying streaming connection will execute immediately,
instead of waiting for all streams to gracefully shut down.
2016-03-11 11:28:08 -05:00
AdoHe
7228b9b987 restore ability to run against secured etcd 2016-03-11 11:21:16 -05:00
Maciej Szulik
f27871e60d Added api discovery to kubectl run, based on which we decide which generators to use 2016-03-11 16:59:14 +01:00
deads2k
5bd161a9cc allow resource.version.group in kubectl 2016-03-11 10:21:50 -05:00
k8s-merge-robot
502d2457bb Merge pull request #22682 from smarterclayton/credential_logging
Auto commit by PR queue bot
2016-03-11 05:32:03 -08:00
k8s-merge-robot
accd6a49be Merge pull request #22767 from yifan-gu/rkt_getpods
Auto commit by PR queue bot
2016-03-11 04:08:38 -08:00
Brian Grant
e5748a44d6 Merge pull request #22840 from liggitt/preferred-gvk
Prefer fetched version when determining HPA group version kind
2016-03-11 00:41:39 -08:00
Brian Grant
5bd45d26ac Merge pull request #22772 from AdoHe/kubectl_update_wide
update wide option output
2016-03-10 23:19:02 -08:00
harry
5b359213b1 Refactor env into sub pkg
Refactor env into sub pkg
2016-03-11 13:52:45 +08:00
AdoHe
9788101e11 update wide option output 2016-03-11 00:29:37 -05:00
k8s-merge-robot
65605023d5 Merge pull request #22602 from justinsb/multizone_label_dynamic_pvs
Auto commit by PR queue bot
2016-03-10 21:19:05 -08:00
Jordan Liggitt
560b02b3ec Prefer fetched version when determining HPA group version kind 2016-03-11 00:03:38 -05:00
k8s-merge-robot
a5369a2c1e Merge pull request #22828 from janetkuo/scale-down-flake
Auto commit by PR queue bot
2016-03-10 20:40:23 -08:00
k8s-merge-robot
144e818ae0 Merge pull request #22811 from madhusudancs/kubectl-rs-autoscale
Auto commit by PR queue bot
2016-03-10 17:16:26 -08:00
Janet Kuo
4a181dacec Fix the possible negative scale down value; add logs when scaling down 2016-03-10 16:01:18 -08:00
k8s-merge-robot
7341b0a265 Merge pull request #22766 from aveshagarwal/master-limitranges-validation-fix
Auto commit by PR queue bot
2016-03-10 15:59:23 -08:00
Madhusudan.C.S
dfc62b56cc Enable kubectl autoscale for replica sets.
Also add some tests for it.
2016-03-10 15:05:54 -08:00
k8s-merge-robot
5db0feb202 Merge pull request #22017 from caesarxuchao/fix-21955
Auto commit by PR queue bot
2016-03-10 14:37:43 -08:00
Paul Morie
5194c12d9e Fix flake in pod IP as env var e2e 2016-03-10 16:32:03 -05:00
k8s-merge-robot
5b00059fd2 Merge pull request #22762 from soltysh/job_run
Auto commit by PR queue bot
2016-03-10 13:22:29 -08:00
Andy Goldstein
cdd339505e Merge pull request #22758 from madhusudancs/replicaset-nonpointer-template
ReplicaSetSpec.Template shouldn't be a pointer.
2016-03-10 15:35:04 -05:00
Maciej Szulik
de83631768 Added job/v1 generator to kubectl run 2016-03-10 19:56:57 +01:00
deads2k
7fdbea8a53 add user-agent defaulting for discovery 2016-03-10 13:32:31 -05:00
Avesh Agarwal
427774306c Fix validation of resources (cpu, memory, storage) for limit range types. 2016-03-10 11:33:53 -05:00
Justin Santa Barbara
16730aba96 AWS: Tag created EBS volumes with our cluster tag
Fix #22792
2016-03-10 08:13:50 -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
Wojciech Tyczynski
b264805796 JSON serializer implements serializer interface 2016-03-10 13:26:05 +01:00
Justin Santa Barbara
0921af4aca AWS: Don't pass empty filters to AWS requests
It gives an error: `The filter 'null' is invalid`

Instead of a zero-length filter list, provide a nil value.

Fix #22786
2016-03-10 07:22:31 -05:00
Wojciech Tyczynski
0e73783c68 Fix resthandler_test in Go 1.6 2016-03-10 13:03:02 +01:00
Justin Santa Barbara
7c82fe7389 AWS: Increase timeout deleting ELB; log remaining security groups
Either ELB is slow to delete (in which case the bumped timeout will
help), or the security groups are otherwise blocked (in which case
logging them will help us track this down).

Fix #17626
2016-03-10 06:57:13 -05:00
Madhusudan.C.S
6fc1837e5e Auto-generated code. 2016-03-09 21:24:24 -08:00
Madhusudan.C.S
db48dcf583 ReplicaSetSpec.Template shouldn't be a pointer.
PodTemplateSpec should be consistent for all the types in extensions/v1beta1.

See PR #19510.
2016-03-09 21:24:16 -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
Yifan Gu
56be600c2b rkt: Fix GetPods().
Group containers from different rkt pods into one k8s pod if
they have the same k8s pod UID.
2016-03-09 17:46:44 -08:00