Skip to content

Commit 82cd5c4

Browse files
committed
upgrade kubefed client to v0.6.1
Signed-off-by: yuswift <yuswiftli@yunify.com>
1 parent 828d2c6 commit 82cd5c4

File tree

12 files changed

+66
-70
lines changed

12 files changed

+66
-70
lines changed

go.mod

+15-16
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ require (
3434
github.com/fatih/structs v1.1.0
3535
github.com/ghodss/yaml v1.0.0
3636
github.com/go-ldap/ldap v3.0.3+incompatible
37-
github.com/go-logr/logr v0.1.0
38-
github.com/go-logr/zapr v0.1.1 // indirect
37+
github.com/go-logr/logr v0.3.0
3938
github.com/go-openapi/loads v0.19.5
4039
github.com/go-openapi/spec v0.19.7
4140
github.com/go-openapi/strfmt v0.19.5
@@ -55,8 +54,8 @@ require (
5554
github.com/kubernetes-csi/external-snapshotter/client/v3 v3.0.0
5655
github.com/kubesphere/sonargo v0.0.2
5756
github.com/mitchellh/mapstructure v1.2.2
58-
github.com/onsi/ginkgo v1.14.0
59-
github.com/onsi/gomega v1.10.1
57+
github.com/onsi/ginkgo v1.14.2
58+
github.com/onsi/gomega v1.10.3
6059
github.com/open-policy-agent/opa v0.18.0
6160
github.com/opencontainers/go-digest v1.0.0
6261
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
@@ -66,12 +65,12 @@ require (
6665
github.com/prometheus-community/prom-label-proxy v0.2.0
6766
github.com/prometheus-operator/prometheus-operator v0.42.2-0.20200928114327-fbd01683839a
6867
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.42.1
69-
github.com/prometheus/client_golang v1.7.1
68+
github.com/prometheus/client_golang v1.8.0
7069
github.com/prometheus/common v0.11.1
7170
github.com/prometheus/prometheus v1.8.2-0.20200907175821-8219b442c864
7271
github.com/sony/sonyflake v0.0.0-20181109022403-6d5bd6181009
7372
github.com/speps/go-hashids v2.0.0+incompatible
74-
github.com/spf13/cobra v1.0.0
73+
github.com/spf13/cobra v1.1.1
7574
github.com/spf13/pflag v1.0.5
7675
github.com/spf13/viper v1.4.0
7776
github.com/stretchr/testify v1.6.1
@@ -92,26 +91,26 @@ require (
9291
istio.io/api v0.0.0-20201113182140-d4b7e3fc2b44
9392
istio.io/client-go v0.0.0-20201113183938-0734e976e785
9493
istio.io/gogo-genproto v0.0.0-20201113182723-5b8563d8a012 // indirect
95-
k8s.io/api v0.19.0
96-
k8s.io/apiextensions-apiserver v0.18.6
97-
k8s.io/apimachinery v0.19.0
98-
k8s.io/apiserver v0.18.6
94+
k8s.io/api v0.19.3
95+
k8s.io/apiextensions-apiserver v0.19.3
96+
k8s.io/apimachinery v0.19.3
97+
k8s.io/apiserver v0.19.3
9998
k8s.io/cli-runtime v0.18.6
10099
k8s.io/client-go v12.0.0+incompatible
101100
k8s.io/code-generator v0.19.0
102-
k8s.io/component-base v0.18.6
101+
k8s.io/component-base v0.19.3
103102
k8s.io/klog v1.0.0
104103
k8s.io/klog/v2 v2.0.0
105-
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
106-
k8s.io/kubectl v0.18.6
104+
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488
105+
k8s.io/kubectl v0.19.3
107106
k8s.io/metrics v0.18.6
108-
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451
107+
k8s.io/utils v0.0.0-20201005171033-6301aaf42dc7
109108
kubesphere.io/client-go v0.0.0
110109
kubesphere.io/monitoring-dashboard v0.1.2
111110
sigs.k8s.io/application v0.8.4-0.20201016185654-c8e2959e57a0
112111
sigs.k8s.io/controller-runtime v0.6.4
113112
sigs.k8s.io/controller-tools v0.4.0
114-
sigs.k8s.io/kubefed v0.7.0
113+
sigs.k8s.io/kubefed v0.6.1
115114
sigs.k8s.io/kustomize v2.0.3+incompatible
116115
sigs.k8s.io/yaml v1.2.0
117116
)
@@ -742,7 +741,7 @@ replace (
742741
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.6.4
743742
sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.4.0
744743
sigs.k8s.io/kind => sigs.k8s.io/kind v0.8.1
745-
sigs.k8s.io/kubefed => sigs.k8s.io/kubefed v0.4.0
744+
sigs.k8s.io/kubefed => sigs.k8s.io/kubefed v0.6.1
746745
sigs.k8s.io/kustomize => sigs.k8s.io/kustomize v2.0.3+incompatible
747746
sigs.k8s.io/structured-merge-diff/v3 => sigs.k8s.io/structured-merge-diff/v3 v3.0.0
748747
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0

go.sum

+3-3
Original file line numberDiff line numberDiff line change
@@ -875,8 +875,8 @@ sigs.k8s.io/controller-runtime v0.6.4/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJU
875875
sigs.k8s.io/controller-tools v0.4.0 h1:9zIdrc6q9RKke8+DnVPVBVZ+cfF9L0TwM01cxNnklYo=
876876
sigs.k8s.io/controller-tools v0.4.0/go.mod h1:G9rHdZMVlBDocIxGkK3jHLWqcTMNvveypYJwrvYKjWU=
877877
sigs.k8s.io/kind v0.8.1/go.mod h1:oNKTxUVPYkV9lWzY6CVMNluVq8cBsyq+UgPJdvA3uu4=
878-
sigs.k8s.io/kubefed v0.4.0 h1:eNZ5SpblUBQEzPHs8XtAjEwmkbs498IhrGvqzdynHOY=
879-
sigs.k8s.io/kubefed v0.4.0/go.mod h1:YBq2sF7Usjfh1xmop6E7k+5USBYfhB5IMLitCoOnOkM=
878+
sigs.k8s.io/kubefed v0.6.1 h1:5NqfXCYPG1UC7H2KCs8tX77XN1ohHv+VegkZ69UWvF0=
879+
sigs.k8s.io/kubefed v0.6.1/go.mod h1:dP40OsC2z1m2uzkk8YiTMdaO/Y8/2zvAAWfGuYnJTKU=
880880
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
881881
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
882882
sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E=
@@ -885,4 +885,4 @@ sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
885885
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
886886
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
887887
vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc h1:MksmcCZQWAQJCTA5T0jgI/0sJ51AVm4Z41MrmfczEoc=
888-
vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
888+
vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=

vendor/modules.txt

+16-16
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ github.com/go-kit/kit/log/level
190190
github.com/go-ldap/ldap
191191
# github.com/go-logfmt/logfmt v0.5.0 => github.com/go-logfmt/logfmt v0.5.0
192192
github.com/go-logfmt/logfmt
193-
# github.com/go-logr/logr v0.1.0 => github.com/go-logr/logr v0.1.0
193+
# github.com/go-logr/logr v0.3.0 => github.com/go-logr/logr v0.1.0
194194
github.com/go-logr/logr
195195
# github.com/go-openapi/analysis v0.19.10 => github.com/go-openapi/analysis v0.19.10
196196
github.com/go-openapi/analysis
@@ -376,7 +376,7 @@ github.com/nxadm/tail/watch
376376
github.com/nxadm/tail/winfile
377377
# github.com/oklog/ulid v1.3.1 => github.com/oklog/ulid v1.3.1
378378
github.com/oklog/ulid
379-
# github.com/onsi/ginkgo v1.14.0 => github.com/onsi/ginkgo v1.14.0
379+
# github.com/onsi/ginkgo v1.14.2 => github.com/onsi/ginkgo v1.14.0
380380
github.com/onsi/ginkgo
381381
github.com/onsi/ginkgo/config
382382
github.com/onsi/ginkgo/internal/codelocation
@@ -396,7 +396,7 @@ github.com/onsi/ginkgo/reporters/stenographer
396396
github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable
397397
github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty
398398
github.com/onsi/ginkgo/types
399-
# github.com/onsi/gomega v1.10.1 => github.com/onsi/gomega v1.10.1
399+
# github.com/onsi/gomega v1.10.3 => github.com/onsi/gomega v1.10.1
400400
github.com/onsi/gomega
401401
github.com/onsi/gomega/format
402402
github.com/onsi/gomega/gbytes
@@ -516,7 +516,7 @@ github.com/prometheus/alertmanager/api/v2/client/receiver
516516
github.com/prometheus/alertmanager/api/v2/client/silence
517517
github.com/prometheus/alertmanager/api/v2/models
518518
github.com/prometheus/alertmanager/pkg/labels
519-
# github.com/prometheus/client_golang v1.7.1 => github.com/prometheus/client_golang v1.7.1
519+
# github.com/prometheus/client_golang v1.8.0 => github.com/prometheus/client_golang v1.7.1
520520
github.com/prometheus/client_golang/api
521521
github.com/prometheus/client_golang/api/prometheus/v1
522522
github.com/prometheus/client_golang/prometheus
@@ -580,7 +580,7 @@ github.com/spf13/afero
580580
github.com/spf13/afero/mem
581581
# github.com/spf13/cast v1.3.0 => github.com/spf13/cast v1.3.0
582582
github.com/spf13/cast
583-
# github.com/spf13/cobra v1.0.0 => github.com/spf13/cobra v0.0.5
583+
# github.com/spf13/cobra v1.1.1 => github.com/spf13/cobra v0.0.5
584584
github.com/spf13/cobra
585585
# github.com/spf13/jwalterweatherman v1.0.0 => github.com/spf13/jwalterweatherman v1.0.0
586586
github.com/spf13/jwalterweatherman
@@ -649,7 +649,7 @@ go.uber.org/atomic
649649
go.uber.org/multierr
650650
# go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee => go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee
651651
go.uber.org/tools/update-license
652-
# go.uber.org/zap v1.13.0 => go.uber.org/zap v1.13.0
652+
# go.uber.org/zap v1.16.0 => go.uber.org/zap v1.13.0
653653
go.uber.org/zap
654654
go.uber.org/zap/buffer
655655
go.uber.org/zap/internal/bufferpool
@@ -714,7 +714,7 @@ golang.org/x/sys/unix
714714
golang.org/x/sys/windows
715715
golang.org/x/sys/windows/registry
716716
golang.org/x/sys/windows/svc/eventlog
717-
# golang.org/x/text v0.3.3 => golang.org/x/text v0.3.0
717+
# golang.org/x/text v0.3.4 => golang.org/x/text v0.3.0
718718
golang.org/x/text/encoding
719719
golang.org/x/text/encoding/charmap
720720
golang.org/x/text/encoding/htmlindex
@@ -1015,7 +1015,7 @@ istio.io/client-go/pkg/listers/security/v1beta1
10151015
# istio.io/gogo-genproto v0.0.0-20201113182723-5b8563d8a012 => istio.io/gogo-genproto v0.0.0-20201113182723-5b8563d8a012
10161016
istio.io/gogo-genproto/googleapis/google/api
10171017
istio.io/gogo-genproto/googleapis/google/rpc
1018-
# k8s.io/api v0.19.0 => k8s.io/api v0.18.6
1018+
# k8s.io/api v0.19.3 => k8s.io/api v0.18.6
10191019
k8s.io/api/admission/v1
10201020
k8s.io/api/admission/v1beta1
10211021
k8s.io/api/admissionregistration/v1
@@ -1059,7 +1059,7 @@ k8s.io/api/settings/v1alpha1
10591059
k8s.io/api/storage/v1
10601060
k8s.io/api/storage/v1alpha1
10611061
k8s.io/api/storage/v1beta1
1062-
# k8s.io/apiextensions-apiserver v0.18.6 => k8s.io/apiextensions-apiserver v0.18.6
1062+
# k8s.io/apiextensions-apiserver v0.19.3 => k8s.io/apiextensions-apiserver v0.18.6
10631063
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
10641064
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
10651065
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1
@@ -1077,7 +1077,7 @@ k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensio
10771077
k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces
10781078
k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1
10791079
k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1
1080-
# k8s.io/apimachinery v0.19.0 => k8s.io/apimachinery v0.18.6
1080+
# k8s.io/apimachinery v0.19.3 => k8s.io/apimachinery v0.18.6
10811081
k8s.io/apimachinery/pkg/api/equality
10821082
k8s.io/apimachinery/pkg/api/errors
10831083
k8s.io/apimachinery/pkg/api/meta
@@ -1137,7 +1137,7 @@ k8s.io/apimachinery/pkg/watch
11371137
k8s.io/apimachinery/third_party/forked/golang/json
11381138
k8s.io/apimachinery/third_party/forked/golang/netutil
11391139
k8s.io/apimachinery/third_party/forked/golang/reflect
1140-
# k8s.io/apiserver v0.18.6 => k8s.io/apiserver v0.18.6
1140+
# k8s.io/apiserver v0.19.3 => k8s.io/apiserver v0.18.6
11411141
k8s.io/apiserver/pkg/admission
11421142
k8s.io/apiserver/pkg/admission/configuration
11431143
k8s.io/apiserver/pkg/admission/initializer
@@ -1516,7 +1516,7 @@ k8s.io/code-generator/cmd/lister-gen/args
15161516
k8s.io/code-generator/cmd/lister-gen/generators
15171517
k8s.io/code-generator/pkg/namer
15181518
k8s.io/code-generator/pkg/util
1519-
# k8s.io/component-base v0.18.6 => k8s.io/component-base v0.18.6
1519+
# k8s.io/component-base v0.19.3 => k8s.io/component-base v0.18.6
15201520
k8s.io/component-base/cli/flag
15211521
k8s.io/component-base/featuregate
15221522
k8s.io/component-base/logs
@@ -1537,7 +1537,7 @@ k8s.io/klog
15371537
k8s.io/klog/klogr
15381538
# k8s.io/klog/v2 v2.0.0 => k8s.io/klog/v2 v2.0.0
15391539
k8s.io/klog/v2
1540-
# k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 => k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
1540+
# k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488 => k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
15411541
k8s.io/kube-openapi/cmd/openapi-gen
15421542
k8s.io/kube-openapi/cmd/openapi-gen/args
15431543
k8s.io/kube-openapi/pkg/builder
@@ -1550,7 +1550,7 @@ k8s.io/kube-openapi/pkg/util
15501550
k8s.io/kube-openapi/pkg/util/proto
15511551
k8s.io/kube-openapi/pkg/util/proto/validation
15521552
k8s.io/kube-openapi/pkg/util/sets
1553-
# k8s.io/kubectl v0.18.6 => k8s.io/kubectl v0.18.6
1553+
# k8s.io/kubectl v0.19.3 => k8s.io/kubectl v0.18.6
15541554
k8s.io/kubectl/pkg/cmd/util
15551555
k8s.io/kubectl/pkg/scheme
15561556
k8s.io/kubectl/pkg/util/interrupt
@@ -1571,7 +1571,7 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1
15711571
k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1alpha1/fake
15721572
k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1
15731573
k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1/fake
1574-
# k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 => k8s.io/utils v0.0.0-20200603063816-c1c6865ac451
1574+
# k8s.io/utils v0.0.0-20201005171033-6301aaf42dc7 => k8s.io/utils v0.0.0-20200603063816-c1c6865ac451
15751575
k8s.io/utils/buffer
15761576
k8s.io/utils/exec
15771577
k8s.io/utils/integer
@@ -1653,7 +1653,7 @@ sigs.k8s.io/controller-tools/pkg/schemapatcher
16531653
sigs.k8s.io/controller-tools/pkg/schemapatcher/internal/yaml
16541654
sigs.k8s.io/controller-tools/pkg/version
16551655
sigs.k8s.io/controller-tools/pkg/webhook
1656-
# sigs.k8s.io/kubefed v0.4.0 => sigs.k8s.io/kubefed v0.4.0
1656+
# sigs.k8s.io/kubefed v0.6.1 => sigs.k8s.io/kubefed v0.6.1
16571657
sigs.k8s.io/kubefed/pkg/apis
16581658
sigs.k8s.io/kubefed/pkg/apis/core/common
16591659
sigs.k8s.io/kubefed/pkg/apis/core/v1alpha1

vendor/sigs.k8s.io/kubefed/pkg/apis/core/v1beta1/federatedtypeconfig_types.go

+7-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/kubefed/pkg/apis/core/v1beta1/kubefedconfig_types.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/kubefed/pkg/apis/scheduling/v1alpha1/replicaschedulingpreference_types.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/kubefed/pkg/controller/util/controllerconfig.go

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)