Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move pkg/kubectl/util/deployment to staging #79189

Merged
merged 4 commits into from
Jun 25, 2019
Merged

Move pkg/kubectl/util/deployment to staging #79189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3f6418
Moved pkg/kubectl/util/deployment to staging
seans3 Jun 19, 2019
11c5bd1
Updated imports for util/deployment
seans3 Jun 19, 2019
2c536a2
Updates to dependencies including go.mod, go.sum, and BUILD files
seans3 Jun 19, 2019
6f120f9
Updated publishing dependencies rules
seans3 Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/kubectl/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/describe/versioned/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
],
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/describe/versioned/describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/history.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/rollback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/rolling_updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubectl/rollout_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion pkg/kubectl/util/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
24 changes: 12 additions & 12 deletions staging/publishing/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions staging/src/k8s.io/kubectl/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion pkg/kubectl/util/deployment/BUILD → .../k8s.io/kubectl/pkg/util/deployment/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
0 pkg/kubectl/util/deployment/deployment.go → ...kubectl/pkg/util/deployment/deployment.go
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,6 +1633,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
Expand Down