From 516c2f8d8baccbe8f708ac421824cad50fedbe16 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Wed, 1 Jul 2020 08:33:25 +0300 Subject: [PATCH] Use github.com/blang/semver/v4 --- channels/pkg/api/BUILD.bazel | 2 +- channels/pkg/api/channel.go | 2 +- channels/pkg/channels/BUILD.bazel | 4 ++-- channels/pkg/channels/addons.go | 2 +- channels/pkg/channels/addons_test.go | 2 +- channels/pkg/channels/channel_version.go | 2 +- channels/pkg/cmd/BUILD.bazel | 2 +- channels/pkg/cmd/apply_channel.go | 2 +- cmd/kops/BUILD.bazel | 2 +- cmd/kops/create_cluster.go | 2 +- cmd/kops/upgrade_cluster.go | 2 +- nodeup/pkg/model/BUILD.bazel | 4 ++-- nodeup/pkg/model/context.go | 2 +- nodeup/pkg/model/kube_proxy_test.go | 2 +- nodeup/pkg/model/protokube.go | 2 +- pkg/apis/kops/BUILD.bazel | 4 ++-- pkg/apis/kops/channel.go | 2 +- pkg/apis/kops/semver_test.go | 2 +- pkg/apis/kops/util/BUILD.bazel | 4 ++-- pkg/apis/kops/util/versions.go | 2 +- pkg/apis/kops/util/versions_test.go | 2 +- pkg/apis/kops/validation/BUILD.bazel | 2 +- pkg/apis/kops/validation/validation.go | 2 +- pkg/assets/BUILD.bazel | 2 +- pkg/assets/builder.go | 2 +- pkg/k8sversion/BUILD.bazel | 2 +- pkg/k8sversion/version.go | 2 +- pkg/model/BUILD.bazel | 2 +- pkg/model/components/BUILD.bazel | 2 +- pkg/model/components/apiserver.go | 2 +- pkg/model/components/context.go | 2 +- pkg/model/context.go | 2 +- tests/integration/channel/BUILD.bazel | 2 +- tests/integration/channel/integration_test.go | 2 +- upup/pkg/fi/cloudup/BUILD.bazel | 2 +- upup/pkg/fi/cloudup/apply_cluster.go | 2 +- upup/pkg/fi/cloudup/populate_instancegroup_spec.go | 2 +- 37 files changed, 41 insertions(+), 41 deletions(-) diff --git a/channels/pkg/api/BUILD.bazel b/channels/pkg/api/BUILD.bazel index 6417e8601c0ef..6ef2f4e805cb8 100644 --- a/channels/pkg/api/BUILD.bazel +++ b/channels/pkg/api/BUILD.bazel @@ -6,7 +6,7 @@ go_library( importpath = "k8s.io/kops/channels/pkg/api", visibility = ["//visibility:public"], deps = [ - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", ], ) diff --git a/channels/pkg/api/channel.go b/channels/pkg/api/channel.go index 9903075c63d03..32eb826643b91 100644 --- a/channels/pkg/api/channel.go +++ b/channels/pkg/api/channel.go @@ -19,7 +19,7 @@ package api import ( "fmt" - "github.com/blang/semver" + "github.com/blang/semver/v4" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/channels/pkg/channels/BUILD.bazel b/channels/pkg/channels/BUILD.bazel index b6094d929cb01..c205cfd8fed68 100644 --- a/channels/pkg/channels/BUILD.bazel +++ b/channels/pkg/channels/BUILD.bazel @@ -14,7 +14,7 @@ go_library( "//channels/pkg/api:go_default_library", "//upup/pkg/fi/utils:go_default_library", "//util/pkg/vfs:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", @@ -31,7 +31,7 @@ go_test( deps = [ "//channels/pkg/api:go_default_library", "//upup/pkg/fi/utils:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/github.com/stretchr/testify/require:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/channels/pkg/channels/addons.go b/channels/pkg/channels/addons.go index 88359f11f434b..431fbd083a2bd 100644 --- a/channels/pkg/channels/addons.go +++ b/channels/pkg/channels/addons.go @@ -21,7 +21,7 @@ import ( "net/url" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "k8s.io/klog" "k8s.io/kops/channels/pkg/api" "k8s.io/kops/upup/pkg/fi/utils" diff --git a/channels/pkg/channels/addons_test.go b/channels/pkg/channels/addons_test.go index 156c43a44fe58..990df7604f3d7 100644 --- a/channels/pkg/channels/addons_test.go +++ b/channels/pkg/channels/addons_test.go @@ -20,7 +20,7 @@ import ( "net/url" "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/channels/pkg/channels/channel_version.go b/channels/pkg/channels/channel_version.go index 1f299a74a4b94..0402f02fa6e1f 100644 --- a/channels/pkg/channels/channel_version.go +++ b/channels/pkg/channels/channel_version.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/channels/pkg/cmd/BUILD.bazel b/channels/pkg/cmd/BUILD.bazel index 9c461a958924c..3164bd50915f9 100644 --- a/channels/pkg/cmd/BUILD.bazel +++ b/channels/pkg/cmd/BUILD.bazel @@ -15,7 +15,7 @@ go_library( deps = [ "//channels/pkg/channels:go_default_library", "//util/pkg/tables:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/viper:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", diff --git a/channels/pkg/cmd/apply_channel.go b/channels/pkg/cmd/apply_channel.go index 724e4f31a97c2..93f919cc720a1 100644 --- a/channels/pkg/cmd/apply_channel.go +++ b/channels/pkg/cmd/apply_channel.go @@ -24,7 +24,7 @@ import ( "os" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/spf13/cobra" "k8s.io/kops/channels/pkg/channels" "k8s.io/kops/util/pkg/tables" diff --git a/cmd/kops/BUILD.bazel b/cmd/kops/BUILD.bazel index 68605e68713ce..aaf6751d48aa6 100644 --- a/cmd/kops/BUILD.bazel +++ b/cmd/kops/BUILD.bazel @@ -95,7 +95,7 @@ go_library( "//util/pkg/text:go_default_library", "//util/pkg/ui:go_default_library", "//util/pkg/vfs:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/github.com/ghodss/yaml:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/cobra/doc:go_default_library", diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go index 8a2181580e71f..9454d74df97d6 100644 --- a/cmd/kops/create_cluster.go +++ b/cmd/kops/create_cluster.go @@ -27,7 +27,7 @@ import ( "strconv" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/spf13/cobra" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" diff --git a/cmd/kops/upgrade_cluster.go b/cmd/kops/upgrade_cluster.go index fdef65613af34..ab981504493c7 100644 --- a/cmd/kops/upgrade_cluster.go +++ b/cmd/kops/upgrade_cluster.go @@ -22,7 +22,7 @@ import ( "os" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "github.com/spf13/cobra" "k8s.io/klog" diff --git a/nodeup/pkg/model/BUILD.bazel b/nodeup/pkg/model/BUILD.bazel index dd371cefc9b51..4bc4ee9c5616b 100644 --- a/nodeup/pkg/model/BUILD.bazel +++ b/nodeup/pkg/model/BUILD.bazel @@ -69,7 +69,7 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/aws/ec2metadata:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws/session:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -114,7 +114,7 @@ go_test( "//util/pkg/exec:go_default_library", "//util/pkg/hashing:go_default_library", "//util/pkg/vfs:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/nodeup/pkg/model/context.go b/nodeup/pkg/model/context.go index 6e839a4d87133..36397253ca8a0 100644 --- a/nodeup/pkg/model/context.go +++ b/nodeup/pkg/model/context.go @@ -37,7 +37,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/blang/semver" + "github.com/blang/semver/v4" ) // NodeupModelContext is the context supplied the nodeup tasks diff --git a/nodeup/pkg/model/kube_proxy_test.go b/nodeup/pkg/model/kube_proxy_test.go index fef649755bb6e..05118e5545a3d 100644 --- a/nodeup/pkg/model/kube_proxy_test.go +++ b/nodeup/pkg/model/kube_proxy_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/kops/util/pkg/architectures" "k8s.io/kops/util/pkg/exec" - "github.com/blang/semver" + "github.com/blang/semver/v4" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/nodeup/pkg/model/protokube.go b/nodeup/pkg/model/protokube.go index 342c82f4fc866..e3f5e883b4665 100644 --- a/nodeup/pkg/model/protokube.go +++ b/nodeup/pkg/model/protokube.go @@ -35,7 +35,7 @@ import ( "k8s.io/kops/upup/pkg/fi/nodeup/nodetasks" "k8s.io/kops/util/pkg/proxy" - "github.com/blang/semver" + "github.com/blang/semver/v4" "k8s.io/klog" ) diff --git a/pkg/apis/kops/BUILD.bazel b/pkg/apis/kops/BUILD.bazel index 8fec778d09aab..9d755d57ff496 100644 --- a/pkg/apis/kops/BUILD.bazel +++ b/pkg/apis/kops/BUILD.bazel @@ -27,7 +27,7 @@ go_library( "//pkg/apis/kops/util:go_default_library", "//upup/pkg/fi/utils:go_default_library", "//util/pkg/vfs:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", @@ -46,7 +46,7 @@ go_test( embed = [":go_default_library"], deps = [ "//upup/pkg/fi/utils:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/gopkg.in/inf.v0:go_default_library", ], ) diff --git a/pkg/apis/kops/channel.go b/pkg/apis/kops/channel.go index dee561b1a5778..3db640ae8a25a 100644 --- a/pkg/apis/kops/channel.go +++ b/pkg/apis/kops/channel.go @@ -20,7 +20,7 @@ import ( "fmt" "net/url" - "github.com/blang/semver" + "github.com/blang/semver/v4" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" "k8s.io/kops/pkg/apis/kops/util" diff --git a/pkg/apis/kops/semver_test.go b/pkg/apis/kops/semver_test.go index 354fc4ac7739a..305927481eb2c 100644 --- a/pkg/apis/kops/semver_test.go +++ b/pkg/apis/kops/semver_test.go @@ -19,7 +19,7 @@ package kops import ( "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" ) // Test_SemverOrdering is a test of semver ordering, but highlights the case that trips everyone one: diff --git a/pkg/apis/kops/util/BUILD.bazel b/pkg/apis/kops/util/BUILD.bazel index 1097bb67d414e..c5e7196b12fda 100644 --- a/pkg/apis/kops/util/BUILD.bazel +++ b/pkg/apis/kops/util/BUILD.bazel @@ -9,7 +9,7 @@ go_library( importpath = "k8s.io/kops/pkg/apis/kops/util", visibility = ["//visibility:public"], deps = [ - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], @@ -23,7 +23,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", ], diff --git a/pkg/apis/kops/util/versions.go b/pkg/apis/kops/util/versions.go index 06fc18cdefc14..f406398c216f1 100644 --- a/pkg/apis/kops/util/versions.go +++ b/pkg/apis/kops/util/versions.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "k8s.io/klog" ) diff --git a/pkg/apis/kops/util/versions_test.go b/pkg/apis/kops/util/versions_test.go index 5b1aef63d8e93..ca1ead438b6c1 100644 --- a/pkg/apis/kops/util/versions_test.go +++ b/pkg/apis/kops/util/versions_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" ) func Test_ParseKubernetesVersion(t *testing.T) { diff --git a/pkg/apis/kops/validation/BUILD.bazel b/pkg/apis/kops/validation/BUILD.bazel index 3d95305389621..dafccfcece5e9 100644 --- a/pkg/apis/kops/validation/BUILD.bazel +++ b/pkg/apis/kops/validation/BUILD.bazel @@ -23,7 +23,7 @@ go_library( "//upup/pkg/fi:go_default_library", "//upup/pkg/fi/cloudup/awsup:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws/arn:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/golang.org/x/net/ipv4:go_default_library", "//vendor/golang.org/x/net/ipv6:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/validation:go_default_library", diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index 828ba73f0050f..665ea189c718b 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -23,7 +23,7 @@ import ( "regexp" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/pkg/assets/BUILD.bazel b/pkg/assets/BUILD.bazel index cee1c1b0f41d1..3c72b16051b6a 100644 --- a/pkg/assets/BUILD.bazel +++ b/pkg/assets/BUILD.bazel @@ -13,7 +13,7 @@ go_library( "//pkg/values:go_default_library", "//util/pkg/hashing:go_default_library", "//util/pkg/vfs:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], diff --git a/pkg/assets/builder.go b/pkg/assets/builder.go index 4b32e7a2615ff..ad1b4a4f70ad3 100644 --- a/pkg/assets/builder.go +++ b/pkg/assets/builder.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/blang/semver" + "github.com/blang/semver/v4" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/klog" "k8s.io/kops/pkg/apis/kops" diff --git a/pkg/k8sversion/BUILD.bazel b/pkg/k8sversion/BUILD.bazel index bc25187f94303..ad6b66d04f68f 100644 --- a/pkg/k8sversion/BUILD.bazel +++ b/pkg/k8sversion/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/apis/kops/util:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", ], ) diff --git a/pkg/k8sversion/version.go b/pkg/k8sversion/version.go index 50da9e2b1a8aa..302edb5abb7c8 100644 --- a/pkg/k8sversion/version.go +++ b/pkg/k8sversion/version.go @@ -17,7 +17,7 @@ limitations under the License. package k8sversion import ( - "github.com/blang/semver" + "github.com/blang/semver/v4" "k8s.io/kops/pkg/apis/kops/util" ) diff --git a/pkg/model/BUILD.bazel b/pkg/model/BUILD.bazel index ffb92cdd0b4de..08da1553e754d 100644 --- a/pkg/model/BUILD.bazel +++ b/pkg/model/BUILD.bazel @@ -50,7 +50,7 @@ go_library( "//upup/pkg/fi/utils:go_default_library", "//util/pkg/architectures:go_default_library", "//util/pkg/vfs:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/github.com/ghodss/yaml:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library", diff --git a/pkg/model/components/BUILD.bazel b/pkg/model/components/BUILD.bazel index d6fff0656fea0..1501a18de0821 100644 --- a/pkg/model/components/BUILD.bazel +++ b/pkg/model/components/BUILD.bazel @@ -29,7 +29,7 @@ go_library( "//upup/pkg/fi/cloudup/gce:go_default_library", "//upup/pkg/fi/loader:go_default_library", "//util/pkg/vfs:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/model/components/apiserver.go b/pkg/model/components/apiserver.go index f06791eacb7f7..a117c12cd4593 100644 --- a/pkg/model/components/apiserver.go +++ b/pkg/model/components/apiserver.go @@ -26,7 +26,7 @@ import ( "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/loader" - "github.com/blang/semver" + "github.com/blang/semver/v4" ) // KubeAPIServerOptionsBuilder adds options for the apiserver to the model diff --git a/pkg/model/components/context.go b/pkg/model/components/context.go index 79e85cc8113ec..c8b4dba99da6a 100644 --- a/pkg/model/components/context.go +++ b/pkg/model/components/context.go @@ -30,7 +30,7 @@ import ( "k8s.io/kops/upup/pkg/fi/cloudup/gce" "k8s.io/kops/util/pkg/vfs" - "github.com/blang/semver" + "github.com/blang/semver/v4" "k8s.io/klog" ) diff --git a/pkg/model/context.go b/pkg/model/context.go index 02a960b67d0fd..e3d9d26341ca4 100644 --- a/pkg/model/context.go +++ b/pkg/model/context.go @@ -33,7 +33,7 @@ import ( "k8s.io/kops/upup/pkg/fi/cloudup/awstasks" "k8s.io/kops/upup/pkg/fi/cloudup/awsup" - "github.com/blang/semver" + "github.com/blang/semver/v4" utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/klog" ) diff --git a/tests/integration/channel/BUILD.bazel b/tests/integration/channel/BUILD.bazel index d94d40cb769c4..59ae0036bbaca 100644 --- a/tests/integration/channel/BUILD.bazel +++ b/tests/integration/channel/BUILD.bazel @@ -9,7 +9,7 @@ go_test( ], deps = [ "//pkg/apis/kops:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", ], ) diff --git a/tests/integration/channel/integration_test.go b/tests/integration/channel/integration_test.go index 5ab00de8b2be1..b9bc94e5ac780 100644 --- a/tests/integration/channel/integration_test.go +++ b/tests/integration/channel/integration_test.go @@ -21,7 +21,7 @@ import ( "path" "testing" - "github.com/blang/semver" + "github.com/blang/semver/v4" "k8s.io/kops/pkg/apis/kops" ) diff --git a/upup/pkg/fi/cloudup/BUILD.bazel b/upup/pkg/fi/cloudup/BUILD.bazel index 34408a218a4f9..b255a89588cde 100644 --- a/upup/pkg/fi/cloudup/BUILD.bazel +++ b/upup/pkg/fi/cloudup/BUILD.bazel @@ -78,7 +78,7 @@ go_library( "//vendor/github.com/Masterminds/sprig:go_default_library", "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library", - "//vendor/github.com/blang/semver:go_default_library", + "//vendor/github.com/blang/semver/v4:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index d404fe72a4be0..92d794bfc8dcf 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -24,7 +24,7 @@ import ( "path" "strings" - "github.com/blang/semver" + "github.com/blang/semver/v4" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" kopsbase "k8s.io/kops" diff --git a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go index 99de277d2d93a..db6ebf9374fb5 100644 --- a/upup/pkg/fi/cloudup/populate_instancegroup_spec.go +++ b/upup/pkg/fi/cloudup/populate_instancegroup_spec.go @@ -19,7 +19,7 @@ package cloudup import ( "fmt" - "github.com/blang/semver" + "github.com/blang/semver/v4" "k8s.io/klog" "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops/util"