Skip to content

Commit

Permalink
UPSTREAM: <carry>: Updating and vendoring go modules after an upstrea…
Browse files Browse the repository at this point in the history 
…m rebase

# Conflicts:
#	vendor/github.com/google/go-tpm/tpmutil/BUILD

# Conflicts:
#	vendor/github.com/googleapis/gax-go/v2/BUILD
#	vendor/golang.org/x/oauth2/google/BUILD
#	vendor/golang.org/x/oauth2/google/internal/externalaccount/BUILD
#	vendor/golang.org/x/sys/unix/BUILD
#	vendor/golang.org/x/sys/windows/BUILD
#	vendor/google.golang.org/api/internal/gensupport/BUILD
#	vendor/google.golang.org/api/option/internaloption/BUILD
#	vendor/google.golang.org/protobuf/types/descriptorpb/BUILD

# Conflicts:
#	vendor/github.com/modern-go/reflect2/BUILD
#	vendor/golang.org/x/net/idna/BUILD
#	vendor/golang.org/x/term/BUILD
#	vendor/k8s.io/apimachinery/pkg/runtime/serializer/json/BUILD
#	vendor/k8s.io/apimachinery/pkg/util/cache/BUILD
#	vendor/k8s.io/apimachinery/pkg/util/json/BUILD
#	vendor/k8s.io/apimachinery/pkg/util/managedfields/BUILD
#	vendor/k8s.io/apimachinery/pkg/util/net/BUILD
#	vendor/k8s.io/apimachinery/pkg/util/validation/BUILD
#	vendor/k8s.io/apimachinery/pkg/util/wait/BUILD
#	vendor/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/BUILD
#	vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/mutating/BUILD
#	vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/validating/BUILD
#	vendor/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/BUILD
#	vendor/k8s.io/apiserver/pkg/apis/apiserver/v1beta1/BUILD
#	vendor/k8s.io/apiserver/pkg/apis/flowcontrol/bootstrap/BUILD
#	vendor/k8s.io/apiserver/pkg/audit/BUILD
#	vendor/k8s.io/apiserver/pkg/authentication/token/cache/BUILD
#	vendor/k8s.io/apiserver/pkg/endpoints/filterlatency/BUILD
#	vendor/k8s.io/apiserver/pkg/endpoints/filters/BUILD
#	vendor/k8s.io/apiserver/pkg/endpoints/handlers/BUILD
#	vendor/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/BUILD
#	vendor/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/BUILD
#	vendor/k8s.io/apiserver/pkg/endpoints/metrics/BUILD
#	vendor/k8s.io/apiserver/pkg/endpoints/request/BUILD
#	vendor/k8s.io/apiserver/pkg/endpoints/responsewriter/BUILD
#	vendor/k8s.io/apiserver/pkg/registry/generic/BUILD
#	vendor/k8s.io/apiserver/pkg/registry/generic/registry/BUILD
#	vendor/k8s.io/apiserver/pkg/server/BUILD
#	vendor/k8s.io/apiserver/pkg/server/dynamiccertificates/BUILD
#	vendor/k8s.io/apiserver/pkg/server/egressselector/metrics/BUILD
#	vendor/k8s.io/apiserver/pkg/server/filters/BUILD
#	vendor/k8s.io/apiserver/pkg/server/healthz/BUILD
#	vendor/k8s.io/apiserver/pkg/server/httplog/BUILD
#	vendor/k8s.io/apiserver/pkg/server/options/BUILD
#	vendor/k8s.io/apiserver/pkg/server/routes/BUILD
#	vendor/k8s.io/apiserver/pkg/storage/cacher/BUILD
#	vendor/k8s.io/apiserver/pkg/storage/etcd3/BUILD
#	vendor/k8s.io/apiserver/pkg/storage/storagebackend/BUILD
#	vendor/k8s.io/apiserver/pkg/util/apihelpers/BUILD
#	vendor/k8s.io/apiserver/pkg/util/flowcontrol/BUILD
#	vendor/k8s.io/apiserver/pkg/util/flowcontrol/debug/BUILD
#	vendor/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/BUILD
#	vendor/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/promise/BUILD
#	vendor/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/BUILD
#	vendor/k8s.io/apiserver/pkg/util/flowcontrol/format/BUILD
#	vendor/k8s.io/apiserver/pkg/util/flowcontrol/metrics/BUILD
#	vendor/k8s.io/apiserver/pkg/util/flowcontrol/request/BUILD
#	vendor/k8s.io/apiserver/pkg/util/openapi/BUILD
#	vendor/k8s.io/client-go/applyconfigurations/apps/v1/BUILD
#	vendor/k8s.io/client-go/applyconfigurations/apps/v1beta1/BUILD
#	vendor/k8s.io/client-go/applyconfigurations/apps/v1beta2/BUILD
#	vendor/k8s.io/client-go/applyconfigurations/core/v1/BUILD
#	vendor/k8s.io/client-go/applyconfigurations/meta/v1/BUILD
#	vendor/k8s.io/client-go/discovery/fake/BUILD
#	vendor/k8s.io/client-go/informers/BUILD
#	vendor/k8s.io/client-go/informers/autoscaling/BUILD
#	vendor/k8s.io/client-go/informers/flowcontrol/BUILD
#	vendor/k8s.io/client-go/kubernetes/BUILD
#	vendor/k8s.io/client-go/kubernetes/fake/BUILD
#	vendor/k8s.io/client-go/kubernetes/scheme/BUILD
#	vendor/k8s.io/client-go/plugin/pkg/client/auth/exec/BUILD
#	vendor/k8s.io/client-go/rest/BUILD
#	vendor/k8s.io/client-go/tools/cache/BUILD
#	vendor/k8s.io/client-go/tools/events/BUILD
#	vendor/k8s.io/client-go/tools/leaderelection/BUILD
#	vendor/k8s.io/client-go/tools/record/BUILD
#	vendor/k8s.io/client-go/util/cert/BUILD
#	vendor/k8s.io/client-go/util/flowcontrol/BUILD
#	vendor/k8s.io/client-go/util/workqueue/BUILD
#	vendor/k8s.io/cloud-provider/app/BUILD
#	vendor/k8s.io/cloud-provider/controllers/node/BUILD
#	vendor/k8s.io/cloud-provider/controllers/nodelifecycle/BUILD
#	vendor/k8s.io/cloud-provider/controllers/route/BUILD
#	vendor/k8s.io/cloud-provider/node/helpers/BUILD
#	vendor/k8s.io/cloud-provider/options/BUILD
#	vendor/k8s.io/component-base/cli/flag/BUILD
#	vendor/k8s.io/component-base/cli/globalflag/BUILD
#	vendor/k8s.io/component-base/config/BUILD
#	vendor/k8s.io/component-base/config/v1alpha1/BUILD
#	vendor/k8s.io/component-base/logs/BUILD
#	vendor/k8s.io/controller-manager/app/BUILD
#	vendor/k8s.io/controller-manager/pkg/clientbuilder/BUILD
#	vendor/k8s.io/kube-openapi/pkg/handler/BUILD
#	vendor/k8s.io/kubernetes/pkg/controller/BUILD
#	vendor/k8s.io/kubernetes/pkg/util/taints/BUILD
  • Loading branch information
cloud-team-rebase-bot committed Jun 21, 2022
1 parent 2b16862 commit f4ecb7d
Show file tree
Hide file tree
Showing 1,000 changed files with 10,320 additions and 20,749 deletions.
138 changes: 23 additions & 115 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,23 @@ module k8s.io/cloud-provider-gcp
go 1.17

require (
cloud.google.com/go v0.99.0
github.com/evanphx/json-patch v4.12.0+incompatible
cloud.google.com/go v0.81.0
github.com/evanphx/json-patch v4.11.0+incompatible
github.com/gofrs/flock v0.7.1
github.com/google/go-cmp v0.5.6
github.com/google/go-tpm v0.3.2
github.com/google/go-cmp v0.5.5
github.com/google/go-tpm v0.2.0
github.com/google/uuid v1.1.4 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/onsi/ginkgo v1.14.1 // indirect
github.com/onsi/gomega v1.10.3 // indirect
github.com/prometheus/client_golang v1.11.0
github.com/spf13/cobra v1.2.1
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
google.golang.org/api v0.63.0
golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c
golang.org/x/tools v0.1.5 // indirect
google.golang.org/api v0.46.0
google.golang.org/grpc v1.38.0 // indirect
gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
gopkg.in/gcfg.v1 v1.2.0
gopkg.in/warnings.v0 v0.1.2
Expand All @@ -23,114 +29,16 @@ require (
k8s.io/client-go v9.0.0+incompatible
k8s.io/cloud-provider v0.23.6
k8s.io/cloud-provider-gcp/providers v0.0.0
k8s.io/code-generator v0.23.6
k8s.io/component-base v0.23.6
k8s.io/component-helpers v0.23.6
k8s.io/controller-manager v0.23.6
k8s.io/klog/v2 v2.30.0
k8s.io/kube-controller-manager v0.23.6
k8s.io/kubelet v0.23.6
k8s.io/kubernetes v1.23.6
k8s.io/metrics v0.23.6
k8s.io/utils v0.0.0-20211116205334-6203023598ed
sigs.k8s.io/controller-tools v0.8.0
)

require github.com/natefinch/atomic v1.0.1

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.16.1-0.20210702024009-ea6160c1d0e3 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gobuffalo/flect v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.4 // indirect
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/imdario/mergo v0.3.11 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.0 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/runc v1.0.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.28.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.0 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.0 // indirect
go.etcd.io/etcd/client/v3 v3.5.0 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/contrib v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect
go.opentelemetry.io/otel v0.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
go.opentelemetry.io/otel/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
go.opentelemetry.io/otel/trace v0.20.0 // indirect
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
golang.org/x/mod v0.4.2 // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/grpc v1.40.1 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/apiextensions-apiserver v0.23.6 // indirect
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
k8s.io/code-generator v0.22.2
k8s.io/component-base v0.22.0
k8s.io/component-helpers v0.22.0
k8s.io/controller-manager v0.22.0
k8s.io/klog/v2 v2.9.0
k8s.io/kube-controller-manager v0.22.0
k8s.io/kubelet v0.22.0
k8s.io/kubernetes v1.22.0
k8s.io/metrics v0.22.0
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
)

replace (
Expand Down

0 comments on commit f4ecb7d

Please sign in to comment.