mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #79189 from seans3/move-kubectl-util-deployment
Move pkg/kubectl/util/deployment to staging
This commit is contained in:
commit
c3f208a07e
@ -62,7 +62,6 @@ go_library(
|
||||
"//pkg/kubectl/describe/versioned:go_default_library",
|
||||
"//pkg/kubectl/scheme:go_default_library",
|
||||
"//pkg/kubectl/util:go_default_library",
|
||||
"//pkg/kubectl/util/deployment:go_default_library",
|
||||
"//pkg/kubectl/util/slice:go_default_library",
|
||||
"//staging/src/k8s.io/api/apps/v1:go_default_library",
|
||||
"//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
|
||||
@ -87,6 +86,7 @@ go_library(
|
||||
"//staging/src/k8s.io/client-go/rest:go_default_library",
|
||||
"//staging/src/k8s.io/client-go/scale:go_default_library",
|
||||
"//staging/src/k8s.io/client-go/util/retry:go_default_library",
|
||||
"//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library",
|
||||
"//staging/src/k8s.io/kubectl/pkg/util/podutils:go_default_library",
|
||||
"//vendor/k8s.io/utils/integer:go_default_library",
|
||||
"//vendor/k8s.io/utils/pointer:go_default_library",
|
||||
|
@ -9,7 +9,6 @@ go_library(
|
||||
"//pkg/kubectl/describe:go_default_library",
|
||||
"//pkg/kubectl/scheme:go_default_library",
|
||||
"//pkg/kubectl/util/certificate:go_default_library",
|
||||
"//pkg/kubectl/util/deployment:go_default_library",
|
||||
"//pkg/kubectl/util/event:go_default_library",
|
||||
"//pkg/kubectl/util/fieldpath:go_default_library",
|
||||
"//pkg/kubectl/util/qos:go_default_library",
|
||||
@ -48,6 +47,7 @@ go_library(
|
||||
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
|
||||
"//staging/src/k8s.io/client-go/rest:go_default_library",
|
||||
"//staging/src/k8s.io/client-go/tools/reference:go_default_library",
|
||||
"//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library",
|
||||
"//vendor/github.com/fatih/camelcase:go_default_library",
|
||||
"//vendor/k8s.io/klog:go_default_library",
|
||||
],
|
||||
|
@ -65,10 +65,10 @@ import (
|
||||
"k8s.io/client-go/rest"
|
||||
"k8s.io/client-go/tools/reference"
|
||||
"k8s.io/klog"
|
||||
deploymentutil "k8s.io/kubectl/pkg/util/deployment"
|
||||
"k8s.io/kubernetes/pkg/kubectl/describe"
|
||||
"k8s.io/kubernetes/pkg/kubectl/scheme"
|
||||
"k8s.io/kubernetes/pkg/kubectl/util/certificate"
|
||||
deploymentutil "k8s.io/kubernetes/pkg/kubectl/util/deployment"
|
||||
"k8s.io/kubernetes/pkg/kubectl/util/event"
|
||||
"k8s.io/kubernetes/pkg/kubectl/util/fieldpath"
|
||||
"k8s.io/kubernetes/pkg/kubectl/util/qos"
|
||||
|
@ -34,9 +34,9 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/strategicpatch"
|
||||
"k8s.io/client-go/kubernetes"
|
||||
clientappsv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
|
||||
deploymentutil "k8s.io/kubectl/pkg/util/deployment"
|
||||
kapps "k8s.io/kubernetes/pkg/kubectl/apps"
|
||||
describe "k8s.io/kubernetes/pkg/kubectl/describe/versioned"
|
||||
deploymentutil "k8s.io/kubernetes/pkg/kubectl/util/deployment"
|
||||
sliceutil "k8s.io/kubernetes/pkg/kubectl/util/slice"
|
||||
)
|
||||
|
||||
|
@ -32,9 +32,9 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/json"
|
||||
"k8s.io/apimachinery/pkg/util/strategicpatch"
|
||||
"k8s.io/client-go/kubernetes"
|
||||
deploymentutil "k8s.io/kubectl/pkg/util/deployment"
|
||||
kapps "k8s.io/kubernetes/pkg/kubectl/apps"
|
||||
"k8s.io/kubernetes/pkg/kubectl/scheme"
|
||||
deploymentutil "k8s.io/kubernetes/pkg/kubectl/util/deployment"
|
||||
)
|
||||
|
||||
const (
|
||||
|
@ -34,9 +34,9 @@ import (
|
||||
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
|
||||
scaleclient "k8s.io/client-go/scale"
|
||||
"k8s.io/client-go/util/retry"
|
||||
deploymentutil "k8s.io/kubectl/pkg/util/deployment"
|
||||
"k8s.io/kubectl/pkg/util/podutils"
|
||||
"k8s.io/kubernetes/pkg/kubectl/util"
|
||||
deploymentutil "k8s.io/kubernetes/pkg/kubectl/util/deployment"
|
||||
"k8s.io/utils/integer"
|
||||
utilpointer "k8s.io/utils/pointer"
|
||||
)
|
||||
|
@ -23,8 +23,8 @@ import (
|
||||
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/runtime/schema"
|
||||
deploymentutil "k8s.io/kubectl/pkg/util/deployment"
|
||||
"k8s.io/kubernetes/pkg/kubectl/scheme"
|
||||
deploymentutil "k8s.io/kubernetes/pkg/kubectl/util/deployment"
|
||||
)
|
||||
|
||||
// StatusViewer provides an interface for resources that have rollout status.
|
||||
|
@ -67,7 +67,6 @@ filegroup(
|
||||
srcs = [
|
||||
":package-srcs",
|
||||
"//pkg/kubectl/util/certificate:all-srcs",
|
||||
"//pkg/kubectl/util/deployment:all-srcs",
|
||||
"//pkg/kubectl/util/event:all-srcs",
|
||||
"//pkg/kubectl/util/fieldpath:all-srcs",
|
||||
"//pkg/kubectl/util/hash:all-srcs",
|
||||
|
@ -614,21 +614,21 @@ rules:
|
||||
dir: staging/src/k8s.io/kubectl
|
||||
name: master
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: master
|
||||
- repository: apimachinery
|
||||
branch: master
|
||||
- repository: client-go
|
||||
branch: master
|
||||
- repository: api
|
||||
branch: master
|
||||
- repository: apimachinery
|
||||
branch: master
|
||||
- repository: client-go
|
||||
branch: master
|
||||
- source:
|
||||
branch: release-1.15
|
||||
dir: staging/src/k8s.io/kubectl
|
||||
name: release-1.15
|
||||
go: 1.12.5
|
||||
dependencies:
|
||||
- repository: api
|
||||
branch: release-1.15
|
||||
- repository: apimachinery
|
||||
branch: release-1.15
|
||||
- repository: client-go
|
||||
branch: release-12.0
|
||||
- repository: api
|
||||
branch: release-1.15
|
||||
- repository: apimachinery
|
||||
branch: release-1.15
|
||||
- repository: client-go
|
||||
branch: release-12.0
|
||||
|
@ -9,6 +9,7 @@ filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [
|
||||
":package-srcs",
|
||||
"//staging/src/k8s.io/kubectl/pkg/util/deployment:all-srcs",
|
||||
"//staging/src/k8s.io/kubectl/pkg/util/interrupt:all-srcs",
|
||||
"//staging/src/k8s.io/kubectl/pkg/util/podutils:all-srcs",
|
||||
"//staging/src/k8s.io/kubectl/pkg/util/printers:all-srcs",
|
||||
|
@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||
go_library(
|
||||
name = "go_default_library",
|
||||
srcs = ["deployment.go"],
|
||||
importpath = "k8s.io/kubernetes/pkg/kubectl/util/deployment",
|
||||
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/deployment",
|
||||
importpath = "k8s.io/kubectl/pkg/util/deployment",
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
"//staging/src/k8s.io/api/apps/v1:go_default_library",
|
1
vendor/modules.txt
vendored
1
vendor/modules.txt
vendored
@ -1635,6 +1635,7 @@ k8s.io/kube-proxy/config/v1alpha1
|
||||
# k8s.io/kube-scheduler v0.0.0 => ./staging/src/k8s.io/kube-scheduler
|
||||
k8s.io/kube-scheduler/config/v1alpha1
|
||||
# k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl
|
||||
k8s.io/kubectl/pkg/util/deployment
|
||||
k8s.io/kubectl/pkg/util/interrupt
|
||||
k8s.io/kubectl/pkg/util/podutils
|
||||
k8s.io/kubectl/pkg/util/printers
|
||||
|
Loading…
Reference in New Issue
Block a user