Skip to content

Commit

Permalink
Bump Kubernetes dependency to v1.28.13
Browse files Browse the repository at this point in the history
  • Loading branch information
chengxiangdong committed Aug 20, 2024
1 parent 1b11f63 commit 7d35c73
Show file tree
Hide file tree
Showing 2,046 changed files with 149,356 additions and 47,740 deletions.
4 changes: 3 additions & 1 deletion cmd/cloud-controller-manager/cloud-controller-manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
cloudprovider "k8s.io/cloud-provider"
"k8s.io/cloud-provider/app"
"k8s.io/cloud-provider/app/config"
"k8s.io/cloud-provider/names"
"k8s.io/cloud-provider/options"
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/component-base/logs"
Expand All @@ -52,7 +53,8 @@ func main() {
}

fss := cliflag.NamedFlagSets{}
command := app.NewCloudControllerManagerCommand(ccmOptions, cloudInitializer, app.DefaultInitFuncConstructors, fss, wait.NeverStop)
aliases := names.CCMControllerAliases()
command := app.NewCloudControllerManagerCommand(ccmOptions, cloudInitializer, app.DefaultInitFuncConstructors, aliases, fss, wait.NeverStop)

// TODO: once we switch everything over to Cobra commands, we can go back to calling
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
Expand Down
181 changes: 95 additions & 86 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,78 +1,81 @@
module sigs.k8s.io/cloud-provider-huaweicloud

go 1.19
go 1.20

require (
github.com/fsnotify/fsnotify v1.6.0
github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.16
github.com/onsi/ginkgo/v2 v2.6.1
github.com/onsi/gomega v1.24.1
github.com/onsi/ginkgo/v2 v2.9.4
github.com/onsi/gomega v1.27.6
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/spf13/pflag v1.0.5
google.golang.org/grpc v1.49.0
google.golang.org/grpc v1.56.3
gopkg.in/gcfg.v1 v1.2.3
k8s.io/api v0.26.4
k8s.io/apimachinery v0.26.4
k8s.io/client-go v0.26.4
k8s.io/cloud-provider v0.26.4
k8s.io/component-base v0.26.4
k8s.io/api v0.28.13
k8s.io/apimachinery v0.28.13
k8s.io/client-go v0.28.13
k8s.io/cloud-provider v0.28.13
k8s.io/component-base v0.28.13
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.80.1
k8s.io/kubernetes v1.26.4
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
k8s.io/klog/v2 v2.100.1
k8s.io/kubernetes v1.28.13
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // 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/cel-go v0.12.6 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cel-go v0.16.1 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // 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/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/cobra v1.6.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
go.etcd.io/etcd/client/v3 v3.5.5 // indirect
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
Expand All @@ -81,62 +84,68 @@ require (
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.16.1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.6 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/warnings.v0 v0.1.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.26.4 // indirect
k8s.io/component-helpers v0.26.4 // indirect
k8s.io/controller-manager v0.26.4 // indirect
k8s.io/kms v0.26.4 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.36 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
k8s.io/apiextensions-apiserver v0.0.0 // indirect
k8s.io/apiserver v0.28.13 // indirect
k8s.io/component-helpers v0.28.13 // indirect
k8s.io/controller-manager v0.28.13 // indirect
k8s.io/kms v0.28.13 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.26.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.4
k8s.io/apimachinery => k8s.io/apimachinery v0.26.4
k8s.io/apiserver => k8s.io/apiserver v0.26.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.4
k8s.io/client-go => k8s.io/client-go v0.26.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.4
k8s.io/code-generator => k8s.io/code-generator v0.26.4
k8s.io/component-base => k8s.io/component-base v0.26.4
k8s.io/component-helpers => k8s.io/component-helpers v0.26.4
k8s.io/controller-manager => k8s.io/controller-manager v0.26.4
k8s.io/cri-api => k8s.io/cri-api v0.26.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.4
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.4
k8s.io/kubectl => k8s.io/kubectl v0.26.4
k8s.io/kubelet => k8s.io/kubelet v0.26.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.4
k8s.io/metrics => k8s.io/metrics v0.26.4
k8s.io/mount-utils => k8s.io/mount-utils v0.26.4
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.4
k8s.io/api => k8s.io/api v0.28.13
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.13
k8s.io/apimachinery => k8s.io/apimachinery v0.28.13
k8s.io/apiserver => k8s.io/apiserver v0.28.13
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.13
k8s.io/client-go => k8s.io/client-go v0.28.13
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.13
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.13
k8s.io/code-generator => k8s.io/code-generator v0.28.13
k8s.io/component-base => k8s.io/component-base v0.28.13
k8s.io/component-helpers => k8s.io/component-helpers v0.28.13
k8s.io/controller-manager => k8s.io/controller-manager v0.28.13
k8s.io/cri-api => k8s.io/cri-api v0.28.13
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.13
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.13
k8s.io/endpointslice => k8s.io/endpointslice v0.28.13
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.13
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.13
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.13
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.13
k8s.io/kubectl => k8s.io/kubectl v0.28.13
k8s.io/kubelet => k8s.io/kubelet v0.28.13
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.13
k8s.io/metrics => k8s.io/metrics v0.28.13
k8s.io/mount-utils => k8s.io/mount-utils v0.28.13
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.13
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.13
)
Loading

0 comments on commit 7d35c73

Please sign in to comment.