From b0ad4a5a50ce8ae2de9c373e97021f3dfc9432d1 Mon Sep 17 00:00:00 2001 From: pixiake Date: Wed, 29 Jun 2022 07:44:48 +0800 Subject: [PATCH] update calico Signed-off-by: pixiake --- apis/kubekey/v1alpha2/default.go | 2 +- go.mod | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apis/kubekey/v1alpha2/default.go b/apis/kubekey/v1alpha2/default.go index bf32ac703..ace402a81 100644 --- a/apis/kubekey/v1alpha2/default.go +++ b/apis/kubekey/v1alpha2/default.go @@ -46,7 +46,7 @@ const ( DefaultRuncVersion = "v1.1.1" DefaultCrictlVersion = "v1.24.0" DefaultKubeVersion = "v1.23.7" - DefaultCalicoVersion = "v3.20.0" + DefaultCalicoVersion = "v3.23.2" DefaultFlannelVersion = "v0.15.1" DefaultCniVersion = "v0.9.1" DefaultCiliumVersion = "v1.8.3" diff --git a/go.mod b/go.mod index 068fb979b..d69a68481 100644 --- a/go.mod +++ b/go.mod @@ -11,12 +11,9 @@ require ( github.com/containerd/containerd v1.6.6 github.com/containers/image/v5 v5.21.1 github.com/deckarep/golang-set v1.8.0 - github.com/docker/distribution v2.8.1+incompatible github.com/dominodatalab/os-release v0.0.0-20190522011736-bcdb4a3e3c2f - github.com/emicklei/go-restful/v3 v3.8.0 github.com/estesp/manifest-tool/v2 v2.0.3 github.com/go-logr/logr v1.2.3 - github.com/golang/glog v1.0.0 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible github.com/lithammer/dedent v1.1.0 github.com/mitchellh/mapstructure v1.5.0 @@ -26,26 +23,18 @@ require ( github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84 github.com/pkg/errors v0.9.1 github.com/pkg/sftp v1.13.4 - github.com/prometheus/client_golang v1.11.1 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 github.com/sirupsen/logrus v1.8.1 github.com/spf13/cobra v1.4.0 - github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.11.0 golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 - golang.org/x/net v0.0.0-20220412020605-290c469a71a5 - golang.org/x/text v0.3.7 - gopkg.in/igm/sockjs-go.v2 v2.1.0 - gopkg.in/square/go-jose.v2 v2.5.1 gopkg.in/yaml.v2 v2.4.0 helm.sh/helm/v3 v3.7.2 k8s.io/api v0.23.6 - k8s.io/apiextensions-apiserver v0.23.5 k8s.io/apimachinery v0.23.6 k8s.io/cli-runtime v0.23.6 k8s.io/client-go v0.23.6 k8s.io/code-generator v0.23.6 - k8s.io/heapster v1.5.4 k8s.io/kubectl v0.23.6 k8s.io/utils v0.0.0-20211116205334-6203023598ed sigs.k8s.io/controller-runtime v0.11.2 @@ -86,12 +75,14 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/deislabs/oras v0.9.0 // indirect github.com/docker/cli v20.10.7+incompatible // indirect + github.com/docker/distribution v2.8.1+incompatible // indirect github.com/docker/docker v20.10.14+incompatible // indirect github.com/docker/docker-credential-helpers v0.6.4 // indirect github.com/docker/go-connections v0.4.1-0.20190612165340-fd1b1942c4d5 // indirect github.com/docker/go-metrics v0.0.1 // indirect github.com/docker/go-units v0.4.0 // indirect github.com/emicklei/go-restful v2.9.5+incompatible // indirect + github.com/emicklei/go-restful/v3 v3.8.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect github.com/fatih/color v1.13.0 // indirect @@ -106,6 +97,7 @@ require ( github.com/go-openapi/swag v0.19.14 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/glog v1.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/btree v1.0.1 // indirect @@ -168,6 +160,7 @@ require ( github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/proglottis/gpgme v0.1.1 // indirect + github.com/prometheus/client_golang v1.11.1 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.30.0 // indirect github.com/prometheus/procfs v0.7.3 // indirect @@ -178,6 +171,7 @@ require ( github.com/spf13/afero v1.8.2 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980 // indirect github.com/stretchr/testify v1.7.1 // indirect github.com/subosito/gotenv v1.2.0 // indirect @@ -199,10 +193,12 @@ require ( go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.19.1 // indirect golang.org/x/mod v0.5.0 // indirect + golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // 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-20220411194840-2f41105eb62f // indirect @@ -212,13 +208,17 @@ require ( google.golang.org/grpc v1.45.0 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/gorp.v1 v1.7.2 // indirect + gopkg.in/igm/sockjs-go.v2 v2.1.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect + gopkg.in/square/go-jose.v2 v2.5.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/apiextensions-apiserver v0.23.5 // indirect k8s.io/apiserver v0.23.5 // indirect k8s.io/component-base v0.23.6 // indirect k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect + k8s.io/heapster v1.5.4 // indirect k8s.io/klog/v2 v2.30.0 // indirect k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect oras.land/oras-go v0.4.0 // indirect