github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48295 from mengqiy/kubectl_util

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 48295, 48298, 47339, 44910, 48037)

eliminate kubectl dependency on k8s.io/kubernetes/pkg/util

Ref: https://github.com/kubernetes/kubernetes/issues/48209

/assign @apelisse @monopole 

cc: @pwittrock 
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-06-30 14:34:24 -07:00 committed by GitHub
commit 3dcd3089f8
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/BUILD
View File

@ -145,7 +145,6 @@ go_library(
"//pkg/kubectl/util:go_default_library", "//pkg/kubectl/util:go_default_library",
"//pkg/printers:go_default_library", "//pkg/printers:go_default_library",
"//pkg/printers/internalversion:go_default_library", "//pkg/printers/internalversion:go_default_library",
"//pkg/util:go_default_library",
"//pkg/util/slice:go_default_library", "//pkg/util/slice:go_default_library",
"//vendor/github.com/emicklei/go-restful-swagger12:go_default_library", "//vendor/github.com/emicklei/go-restful-swagger12:go_default_library",
"//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/golang/glog:go_default_library",

2
pkg/kubectl/proxy_server.go
View File

@ -29,7 +29,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/kubectl/util"
) )
const ( const (

4
pkg/kubectl/stop.go
View File

@ -38,7 +38,6 @@ import (
coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion"
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
"k8s.io/kubernetes/pkg/util"
) )
const ( const (
@ -401,7 +400,8 @@ func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Durati
deployment, err := reaper.updateDeploymentWithRetries(namespace, name, func(d *extensions.Deployment) { deployment, err := reaper.updateDeploymentWithRetries(namespace, name, func(d *extensions.Deployment) {
// set deployment's history and scale to 0 // set deployment's history and scale to 0
// TODO replace with patch when available: https://github.com/kubernetes/kubernetes/issues/20527 // TODO replace with patch when available: https://github.com/kubernetes/kubernetes/issues/20527
d.Spec.RevisionHistoryLimit = util.Int32Ptr(0) rhl := int32(0)
d.Spec.RevisionHistoryLimit = &rhl
d.Spec.Replicas = 0 d.Spec.Replicas = 0
d.Spec.Paused = true d.Spec.Paused = true
}) })

5
pkg/kubectl/util/BUILD
View File

@ -7,7 +7,10 @@ load(
go_library( go_library(
name = "go_default_library", name = "go_default_library",
srcs = ["util.go"], srcs = [
"umask.go",
"util.go",
],
tags = ["automanaged"], tags = ["automanaged"],
visibility = ["//build/visible_to:pkg_kubectl_util_CONSUMERS"], visibility = ["//build/visible_to:pkg_kubectl_util_CONSUMERS"],
deps = [ deps = [

0
pkg/util/umask.go → pkg/kubectl/util/umask.go
View File

1
pkg/util/BUILD
View File

@ -13,7 +13,6 @@ go_library(
srcs = [ srcs = [
"doc.go", "doc.go",
"template.go", "template.go",
"umask.go",
"util.go", "util.go",
], ],
tags = ["automanaged"], tags = ["automanaged"],