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

Revendor k8s.io/utils and use diff+fields from there #74015

Closed
wants to merge 7 commits into from
Closed

Revendor k8s.io/utils and use diff+fields from there #74015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2b0b72e
bump(k8s.io/utils): cdba02414f767c89d729b1b9e61d9891f4e82b35
sttts Feb 13, 2019
6eee0cb
Update imports: k8s.io/{apimachinery/pkg/util -> utils}/diff
sttts Feb 13, 2019
75e6348
Remove k8s.io/apimachinery/pkg/util/diff/
sttts Feb 13, 2019
bfe3e19
apimachinery: alias k8s.io/utils/fields.Path into pkg/util/validation…
sttts Feb 13, 2019
cc64f23
kubeadm: allow k8s.io/utils/diff imports
sttts Feb 15, 2019
352009a
import-restrictions.yaml: allow k8s.io/utils for all staging repos
sttts Feb 15, 2019
b13b8a0
Update staging godeps
sttts Feb 15, 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
34 changes: 21 additions & 13 deletions Godeps/Godeps.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

420 changes: 420 additions & 0 deletions Godeps/LICENSES
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cmd/cloud-controller-manager/app/options/BUILD
View file
Open in desktop
Expand Up @@ -57,9 +57,9 @@ go_test(
"//cmd/controller-manager/app/options:go_default_library",
"//pkg/controller/apis/config:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",
"//staging/src/k8s.io/component-base/config:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/utils/diff:go_default_library",
],
)
2 changes: 1 addition & 1 deletion cmd/cloud-controller-manager/app/options/options_test.go
View file
Open in desktop
Expand Up @@ -25,11 +25,11 @@ import (
"github.com/spf13/pflag"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/diff"
apiserveroptions "k8s.io/apiserver/pkg/server/options"
componentbaseconfig "k8s.io/component-base/config"
cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
"k8s.io/utils/diff"
)

func TestDefaultFlags(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kube-apiserver/app/options/BUILD
View file
Open in desktop
Expand Up @@ -49,7 +49,6 @@ go_test(
"//pkg/kubeapiserver/options:go_default_library",
"//pkg/kubelet/client:go_default_library",
"//pkg/master/reconcilers:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library",
"//staging/src/k8s.io/apiserver/plugin/pkg/audit/buffered:go_default_library",
Expand All @@ -59,6 +58,7 @@ go_test(
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
"//staging/src/k8s.io/component-base/cli/globalflag:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/utils/diff:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/kube-apiserver/app/options/options_test.go
View file
Open in desktop
Expand Up @@ -24,7 +24,6 @@ import (

"github.com/spf13/pflag"

"k8s.io/apimachinery/pkg/util/diff"
apiserveroptions "k8s.io/apiserver/pkg/server/options"
"k8s.io/apiserver/pkg/storage/storagebackend"
auditbuffered "k8s.io/apiserver/plugin/pkg/audit/buffered"
Expand All @@ -36,6 +35,7 @@ import (
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
"k8s.io/kubernetes/pkg/master/reconcilers"
"k8s.io/utils/diff"
)

func TestAddFlags(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kube-controller-manager/app/options/BUILD
View file
Open in desktop
Expand Up @@ -77,9 +77,9 @@ go_test(
"//cmd/controller-manager/app/options:go_default_library",
"//pkg/controller/apis/config:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",
"//staging/src/k8s.io/component-base/config:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/utils/diff:go_default_library",
],
)
2 changes: 1 addition & 1 deletion cmd/kube-controller-manager/app/options/options_test.go
View file
Open in desktop
Expand Up @@ -26,11 +26,11 @@ import (
"github.com/spf13/pflag"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/diff"
apiserveroptions "k8s.io/apiserver/pkg/server/options"
componentbaseconfig "k8s.io/component-base/config"
cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
"k8s.io/utils/diff"
)

func TestAddFlags(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kube-proxy/app/BUILD
View file
Open in desktop
Expand Up @@ -167,9 +167,9 @@ go_test(
"//pkg/proxy/apis/config:go_default_library",
"//pkg/util/configz:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/component-base/config:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/k8s.io/utils/diff:go_default_library",
"//vendor/k8s.io/utils/pointer:go_default_library",
] + select({
"@io_bazel_rules_go//go/platform:android": [
Expand Down
2 changes: 1 addition & 1 deletion cmd/kube-proxy/app/server_test.go
View file
Open in desktop
Expand Up @@ -30,11 +30,11 @@ import (
"github.com/stretchr/testify/assert"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/diff"
componentbaseconfig "k8s.io/component-base/config"
api "k8s.io/kubernetes/pkg/apis/core"
kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config"
"k8s.io/kubernetes/pkg/util/configz"
"k8s.io/utils/diff"
utilpointer "k8s.io/utils/pointer"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/kube-scheduler/app/options/BUILD
View file
Open in desktop
Expand Up @@ -71,9 +71,9 @@ go_test(
"//cmd/kube-scheduler/app/config:go_default_library",
"//pkg/scheduler/apis/config:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/rand:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",
"//staging/src/k8s.io/component-base/config:go_default_library",
"//vendor/k8s.io/utils/diff:go_default_library",
],
)
2 changes: 1 addition & 1 deletion cmd/kube-scheduler/app/options/options_test.go
View file
Open in desktop
Expand Up @@ -29,10 +29,10 @@ import (
"time"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/diff"
apiserveroptions "k8s.io/apiserver/pkg/server/options"
componentbaseconfig "k8s.io/component-base/config"
kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/utils/diff"
)

func TestSchedulerOptions(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions cmd/kubeadm/.import-restrictions
View file
Open in desktop
Expand Up @@ -39,6 +39,7 @@
{
"SelectorRegexp": "k8s[.]io/utils",
"AllowedPrefixes": [
"k8s.io/utils/diff"
"k8s.io/utils/exec",
"k8s.io/utils/integer",
"k8s.io/utils/path",
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubelet/app/options/BUILD
View file
Open in desktop
Expand Up @@ -73,8 +73,8 @@ go_test(
srcs = ["options_test.go"],
embed = [":go_default_library"],
deps = [
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/utils/diff:go_default_library",
],
)
2 changes: 1 addition & 1 deletion cmd/kubelet/app/options/options_test.go
View file
Open in desktop
Expand Up @@ -23,8 +23,8 @@ import (

"github.com/spf13/pflag"

"k8s.io/apimachinery/pkg/util/diff"
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/utils/diff"
)

func newKubeletServerOrDie() *KubeletServer {
Expand Down
1 change: 0 additions & 1 deletion hack/.golint_failures
View file
Open in desktop
Expand Up @@ -483,7 +483,6 @@ staging/src/k8s.io/apimachinery/pkg/test
staging/src/k8s.io/apimachinery/pkg/types
staging/src/k8s.io/apimachinery/pkg/util/cache
staging/src/k8s.io/apimachinery/pkg/util/clock
staging/src/k8s.io/apimachinery/pkg/util/diff
staging/src/k8s.io/apimachinery/pkg/util/errors
staging/src/k8s.io/apimachinery/pkg/util/framer
staging/src/k8s.io/apimachinery/pkg/util/httpstream
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/persistentvolume/BUILD
View file
Open in desktop
Expand Up @@ -33,8 +33,8 @@ go_test(
deps = [
"//pkg/apis/core:go_default_library",
"//pkg/features:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature/testing:go_default_library",
"//vendor/k8s.io/utils/diff:go_default_library",
],
)
2 changes: 1 addition & 1 deletion pkg/api/persistentvolume/util_test.go
View file
Open in desktop
Expand Up @@ -21,11 +21,11 @@ import (
"reflect"
"testing"

"k8s.io/apimachinery/pkg/util/diff"
utilfeature "k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/features"
"k8s.io/utils/diff"
)

func TestDropDisabledFields(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/persistentvolumeclaim/BUILD
View file
Open in desktop
Expand Up @@ -37,8 +37,8 @@ go_test(
deps = [
"//pkg/apis/core:go_default_library",
"//pkg/features:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature/testing:go_default_library",
"//vendor/k8s.io/utils/diff:go_default_library",
],
)
2 changes: 1 addition & 1 deletion pkg/api/persistentvolumeclaim/util_test.go
View file
Open in desktop
Expand Up @@ -21,11 +21,11 @@ import (
"reflect"
"testing"

"k8s.io/apimachinery/pkg/util/diff"
utilfeature "k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
"k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/features"
"k8s.io/utils/diff"
)

func TestDropAlphaPVCVolumeMode(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/pod/BUILD
View file
Open in desktop
Expand Up @@ -42,10 +42,10 @@ go_test(
"//pkg/security/apparmor:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature/testing:go_default_library",
"//vendor/k8s.io/utils/diff:go_default_library",
],
)
2 changes: 1 addition & 1 deletion pkg/api/pod/util_test.go
View file
Open in desktop
Expand Up @@ -24,14 +24,14 @@ import (

"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/validation/field"
utilfeature "k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/security/apparmor"
"k8s.io/utils/diff"
)

func TestPodSecrets(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/podsecuritypolicy/BUILD
View file
Open in desktop
Expand Up @@ -38,8 +38,8 @@ go_test(
"//pkg/apis/core:go_default_library",
"//pkg/apis/policy:go_default_library",
"//pkg/features:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature/testing:go_default_library",
"//vendor/k8s.io/utils/diff:go_default_library",
],
)
2 changes: 1 addition & 1 deletion pkg/api/podsecuritypolicy/util_test.go
View file
Open in desktop
Expand Up @@ -21,12 +21,12 @@ import (
"reflect"
"testing"

"k8s.io/apimachinery/pkg/util/diff"
utilfeature "k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/apis/policy"
"k8s.io/kubernetes/pkg/features"
"k8s.io/utils/diff"
)

func TestDropAllowedProcMountTypes(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/resourcequota/BUILD
View file
Open in desktop
Expand Up @@ -19,9 +19,9 @@ go_test(
deps = [
"//pkg/apis/core:go_default_library",
"//pkg/features:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature/testing:go_default_library",
"//vendor/k8s.io/utils/diff:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/api/resourcequota/util_test.go
View file
Open in desktop
Expand Up @@ -21,11 +21,11 @@ import (
"reflect"
"testing"

"k8s.io/apimachinery/pkg/util/diff"
utilfeature "k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/features"
"k8s.io/utils/diff"
)

func TestDropDisabledFields(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/testing/BUILD
View file
Open in desktop
Expand Up @@ -102,13 +102,13 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/protobuf:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer/streaming:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/json:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/github.com/gogo/protobuf/proto:go_default_library",
"//vendor/github.com/google/gofuzz:go_default_library",
"//vendor/github.com/json-iterator/go:go_default_library",
"//vendor/k8s.io/utils/diff:go_default_library",
],
)
2 changes: 1 addition & 1 deletion pkg/api/testing/conversion_test.go
View file
Open in desktop
Expand Up @@ -25,10 +25,10 @@ import (
apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/api/testapi"
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/utils/diff"
)

func BenchmarkPodConversion(b *testing.B) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/testing/copy_test.go
View file
Open in desktop
Expand Up @@ -28,8 +28,8 @@ import (
"k8s.io/apimachinery/pkg/api/apitesting/roundtrip"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/utils/diff"
)

func TestDeepCopyApiObjects(t *testing.T) {
Expand Down