github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17232 from deads2k/gv-restmapping-2

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-17 03:33:24 -08:00
parent cae1f4095a 303bcad398
commit 125ab2cad1
19 changed files with 384 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/cmd/rollingupdate.go
View File

@@ -29,6 +29,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -382,8 +383,9 @@ func isReplicasDefaulted(info *resource.Info) bool {
// was unable to recover versioned info
return false
}
switch info.Mapping.APIVersion {
case "v1":
switch info.Mapping.GroupVersionKind.GroupVersion() {
case unversioned.GroupVersion{Version: "v1"}:
if rc, ok := info.VersionedObject.(*v1.ReplicationController); ok {
return rc.Spec.Replicas == nil
}