Commit Graph

26404 Commits

Author SHA1 Message Date
k8s-merge-robot
c9b3b007cd Merge pull request #22808 from madhusudancs/kubectl-rs-cp-testdata
Auto commit by PR queue bot
2016-03-10 14:37:45 -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
k8s-merge-robot
45fff81123 Merge pull request #22801 from piosz/heapster
Auto commit by PR queue bot
2016-03-10 14:03:54 -08:00
k8s-merge-robot
dec124bd57 Merge pull request #22805 from NeilHanlon/master
Auto commit by PR queue bot
2016-03-10 13:22:32 -08: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
Andy Goldstein
d5d3f92de6 Merge pull request #22806 from derekwaynecarr/devel_doc
Comment that godep versions 54 or above do not play nice with Kubernetes
2016-03-10 15:29:48 -05:00
Brian Grant
621856e8f5 Merge pull request #22812 from eparis/update-godep-license
Update godep license after fixing sort
2016-03-10 12:25:20 -08:00
Eric Paris
503af7d044 Update Godep/LICENSES
So hopefully travis will be happy....
2016-03-10 14:07:10 -05:00
Eric Paris
c8d3a06223 Use LC_ALL=C when calling sort 2016-03-10 14:07:09 -05:00
Maciej Szulik
de83631768 Added job/v1 generator to kubectl run 2016-03-10 19:56:57 +01:00
Madhusudan.C.S
9c011c6e0f Copy replicaset example yamls to hack/testdata directory. 2016-03-10 10:53:29 -08:00
k8s-merge-robot
31903c8bb1 Merge pull request #22594 from justinsb/aws_ulite
Auto commit by PR queue bot
2016-03-10 10:15:28 -08:00
derekwaynecarr
26de7a7df5 Comment that godep versions 54 or above do not play nice with Kubernetes 2016-03-10 13:12:53 -05:00
Neil Hanlon
df7f55f616 Fix typo of "attempts" in vsphere util.sh during checks. 2016-03-10 13:05:19 -05:00
k8s-merge-robot
1460f24746 Merge pull request #22744 from sdminonne/libvirt_coreos
Auto commit by PR queue bot
2016-03-10 09:36:19 -08:00
k8s-merge-robot
b33ff00b16 Merge pull request #22691 from mkulke/fix-mysql-cinder-example
Auto commit by PR queue bot
2016-03-10 09:36:16 -08:00
Piotr Szczesniak
dda0c96f0b Bumped Heapster to v0.20.0-alpha12 2016-03-10 18:25:51 +01:00
k8s-merge-robot
ff43bee118 Merge pull request #22790 from wojtek-t/add_implements_serializer
Auto commit by PR queue bot
2016-03-10 08:10:21 -08:00
Wojciech Tyczynski
b264805796 JSON serializer implements serializer interface 2016-03-10 13:26:05 +01: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
Salvatore Dario Minonne
a313f552b4 libvirt_coreos: Add DNS and reaise loglevel 2016-03-10 10:28:46 +01: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
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
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