From c3f6418b59b6299f34d20f8d4e68675d80be8f49 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 14:16:48 -0700 Subject: [PATCH 1/4] Moved pkg/kubectl/util/deployment to staging --- pkg/kubectl/util/deployment/BUILD | 32 ------------------- .../pkg}/util/deployment/deployment.go | 0 2 files changed, 32 deletions(-) delete mode 100644 pkg/kubectl/util/deployment/BUILD rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/deployment/deployment.go (100%) diff --git a/pkg/kubectl/util/deployment/BUILD b/pkg/kubectl/util/deployment/BUILD deleted file mode 100644 index 5fffa4803e1..00000000000 --- a/pkg/kubectl/util/deployment/BUILD +++ /dev/null @@ -1,32 +0,0 @@ -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", - visibility = ["//visibility:public"], - deps = [ - "//staging/src/k8s.io/api/apps/v1:go_default_library", - "//staging/src/k8s.io/api/core/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", - "//staging/src/k8s.io/client-go/kubernetes/typed/apps/v1:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -) diff --git a/pkg/kubectl/util/deployment/deployment.go b/staging/src/k8s.io/kubectl/pkg/util/deployment/deployment.go similarity index 100% rename from pkg/kubectl/util/deployment/deployment.go rename to staging/src/k8s.io/kubectl/pkg/util/deployment/deployment.go From 11c5bd1b2f884be520a1c98e70d0088fce3ebb34 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 14:20:19 -0700 Subject: [PATCH 2/4] Updated imports for util/deployment --- pkg/kubectl/describe/versioned/describe.go | 2 +- pkg/kubectl/history.go | 2 +- pkg/kubectl/rollback.go | 2 +- pkg/kubectl/rolling_updater.go | 3 ++- pkg/kubectl/rollout_status.go | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go index 0ad7e070b3b..b82891bbcbc 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -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" diff --git a/pkg/kubectl/history.go b/pkg/kubectl/history.go index a1a4829aeb6..382c6dd4463 100644 --- a/pkg/kubectl/history.go +++ b/pkg/kubectl/history.go @@ -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" ) diff --git a/pkg/kubectl/rollback.go b/pkg/kubectl/rollback.go index bd7e2c7c855..63d2edd290a 100644 --- a/pkg/kubectl/rollback.go +++ b/pkg/kubectl/rollback.go @@ -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 ( diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index fbd423038e7..3d7b15bc17e 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -34,9 +34,10 @@ 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/kubernetes/pkg/kubectl/util/podutils" "k8s.io/utils/integer" utilpointer "k8s.io/utils/pointer" ) diff --git a/pkg/kubectl/rollout_status.go b/pkg/kubectl/rollout_status.go index 932e905175e..d6f39d71398 100644 --- a/pkg/kubectl/rollout_status.go +++ b/pkg/kubectl/rollout_status.go @@ -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. From 2c536a2c3318e5cf9ee87d1a05122e72517c188c Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 14:27:57 -0700 Subject: [PATCH 3/4] Updates to dependencies including go.mod, go.sum, and BUILD files --- pkg/kubectl/BUILD | 2 +- pkg/kubectl/describe/versioned/BUILD | 2 +- pkg/kubectl/util/BUILD | 1 - staging/src/k8s.io/kubectl/BUILD | 1 + .../k8s.io/kubectl/pkg/util/deployment/BUILD | 33 +++++++++++++++++++ vendor/modules.txt | 1 + 6 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 staging/src/k8s.io/kubectl/pkg/util/deployment/BUILD diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 357bd596816..9c3ea11028e 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -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", diff --git a/pkg/kubectl/describe/versioned/BUILD b/pkg/kubectl/describe/versioned/BUILD index 814ef60661f..892ae6f2f9b 100644 --- a/pkg/kubectl/describe/versioned/BUILD +++ b/pkg/kubectl/describe/versioned/BUILD @@ -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", ], diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index 2eccecc86ef..780337528d7 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -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", diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 3d4df4bf4af..67f8923de36 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -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", diff --git a/staging/src/k8s.io/kubectl/pkg/util/deployment/BUILD b/staging/src/k8s.io/kubectl/pkg/util/deployment/BUILD new file mode 100644 index 00000000000..a2a728566d6 --- /dev/null +++ b/staging/src/k8s.io/kubectl/pkg/util/deployment/BUILD @@ -0,0 +1,33 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["deployment.go"], + 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", + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes/typed/apps/v1:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/vendor/modules.txt b/vendor/modules.txt index d9069351916..3cbc0b808b3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1638,6 +1638,7 @@ k8s.io/kubectl/pkg/util/podutils k8s.io/kubectl/pkg/util/printers k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term +k8s.io/kubectl/pkg/util/deployment # k8s.io/kubelet v0.0.0 => ./staging/src/k8s.io/kubelet k8s.io/kubelet/config/v1beta1 # k8s.io/legacy-cloud-providers v0.0.0 => ./staging/src/k8s.io/legacy-cloud-providers From 6f120f9660f56d6050864b9da7233222ae231118 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 14:43:36 -0700 Subject: [PATCH 4/4] Updated publishing dependencies rules --- pkg/kubectl/rolling_updater.go | 1 - staging/publishing/rules.yaml | 24 ++++++++++++------------ vendor/modules.txt | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index 3d7b15bc17e..ea730072c31 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -37,7 +37,6 @@ import ( deploymentutil "k8s.io/kubectl/pkg/util/deployment" "k8s.io/kubectl/pkg/util/podutils" "k8s.io/kubernetes/pkg/kubectl/util" - "k8s.io/kubernetes/pkg/kubectl/util/podutils" "k8s.io/utils/integer" utilpointer "k8s.io/utils/pointer" ) diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index dab1c1c8275..da3587b7c40 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -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 diff --git a/vendor/modules.txt b/vendor/modules.txt index 3cbc0b808b3..3f13d203f7b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1633,12 +1633,12 @@ 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 k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term -k8s.io/kubectl/pkg/util/deployment # k8s.io/kubelet v0.0.0 => ./staging/src/k8s.io/kubelet k8s.io/kubelet/config/v1beta1 # k8s.io/legacy-cloud-providers v0.0.0 => ./staging/src/k8s.io/legacy-cloud-providers