From b9cb6dddd45bf8dbac6d74b7b214278cb97c5703 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Tue, 9 Feb 2021 14:27:33 -0700 Subject: [PATCH] use cluster api version number --- go.mod | 2 +- go.sum | 6 ++++-- pkg/cluster/machine/machine.go | 2 +- pkg/kubernetes/version.go | 4 ---- 4 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 pkg/kubernetes/version.go diff --git a/go.mod b/go.mod index dae51ff9..9a4a605a 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.6.1 github.com/thanhpk/randstr v1.0.4 - github.com/weaveworks/cluster-api-provider-existinginfra v0.1.1 + github.com/weaveworks/cluster-api-provider-existinginfra v0.2.1-0.20210209210435-f28d15d4b252 github.com/weaveworks/footloose v0.0.0-20200918140536-ff126705213e github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab github.com/weaveworks/launcher v0.0.0-20180824102238-59a4fcc32c9c diff --git a/go.sum b/go.sum index 33d0aa22..945434b8 100644 --- a/go.sum +++ b/go.sum @@ -849,8 +849,10 @@ github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv github.com/vishvananda/netlink v1.0.0/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= -github.com/weaveworks/cluster-api-provider-existinginfra v0.1.1 h1:uAveHJzhMQMG0FEKNZ4AbP0s7ZxX+xR2Rk1cibQIqWs= -github.com/weaveworks/cluster-api-provider-existinginfra v0.1.1/go.mod h1:YEi5vGmSucFgcmHl+mUIp8dfm4aX3UO5tuUzSoh5Pfs= +github.com/weaveworks/cluster-api-provider-existinginfra v0.2.0 h1:J9mGNaGdoyT76BhyDE5fN/D+Fku5NIB7Mzpm9JQkbdM= +github.com/weaveworks/cluster-api-provider-existinginfra v0.2.0/go.mod h1:YEi5vGmSucFgcmHl+mUIp8dfm4aX3UO5tuUzSoh5Pfs= +github.com/weaveworks/cluster-api-provider-existinginfra v0.2.1-0.20210209210435-f28d15d4b252 h1:G58bHlBXyc9O31GoiLJiq9k/myPJIdg5XCnHKG6Wgeg= +github.com/weaveworks/cluster-api-provider-existinginfra v0.2.1-0.20210209210435-f28d15d4b252/go.mod h1:YEi5vGmSucFgcmHl+mUIp8dfm4aX3UO5tuUzSoh5Pfs= github.com/weaveworks/footloose v0.0.0-20200918140536-ff126705213e h1:lW0k9X2U0S+6Kq5qoYQaDKrUCS50x2M7ZivVpOFgTso= github.com/weaveworks/footloose v0.0.0-20200918140536-ff126705213e/go.mod h1:nxDdCjg1kb5+luh4mUCp+mtBZIWrhzoLIArrD99y+Sc= github.com/weaveworks/go-checkpoint v0.0.0-20170503165305-ebbb8b0518ab h1:mW+hgchD9qUUBqnuaDBj7BkcpFPk/FxeFcUFI5lvvUw= diff --git a/pkg/cluster/machine/machine.go b/pkg/cluster/machine/machine.go index a48a90da..5c205c84 100644 --- a/pkg/cluster/machine/machine.go +++ b/pkg/cluster/machine/machine.go @@ -6,7 +6,7 @@ import ( "github.com/blang/semver" existinginfra1 "github.com/weaveworks/cluster-api-provider-existinginfra/apis/cluster.weave.works/v1alpha3" capeimachine "github.com/weaveworks/cluster-api-provider-existinginfra/pkg/cluster/machine" - "github.com/weaveworks/wksctl/pkg/kubernetes" + "github.com/weaveworks/cluster-api-provider-existinginfra/pkg/kubernetes" "k8s.io/apimachinery/pkg/util/validation/field" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3" ) diff --git a/pkg/kubernetes/version.go b/pkg/kubernetes/version.go deleted file mode 100644 index 20a968a2..00000000 --- a/pkg/kubernetes/version.go +++ /dev/null @@ -1,4 +0,0 @@ -package kubernetes - -// DefaultVersionsRange is the default Kubernetes versions' range used by WKS to validate Kubernetes versions. -const DefaultVersionsRange = ">=1.16.1 <=1.20.x"