Use github.com/blang/semver/v4

kubernetes · Jul 1, 2020 · 516c2f8 · 516c2f8
1 parent c78d2c9
commit 516c2f8
Show file tree

Hide file tree

Showing 37 changed files with 41 additions and 41 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"