kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use github.com/blang/semver/v4

This commit is contained in:
Ciprian Hacman 2020-07-01 08:33:25 +03:00
parent c23d51b2d3
commit a7c8d2087c
37 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/pkg/api/BUILD.bazel
View File

@ -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",
],
)

2
channels/pkg/api/channel.go
View File

@ -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"
)

4
channels/pkg/channels/BUILD.bazel
View File

@ -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",

2
channels/pkg/channels/addons.go
View File

@ -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"

2
channels/pkg/channels/addons_test.go
View File

@ -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"

2
channels/pkg/channels/channel_version.go
View File

@ -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"

2
channels/pkg/cmd/BUILD.bazel
View File

@ -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",

2
channels/pkg/cmd/apply_channel.go
View File

@ -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"

2
cmd/kops/BUILD.bazel
View File

@ -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",

2
cmd/kops/create_cluster.go
View File

@ -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"

2
cmd/kops/upgrade_cluster.go
View File

@ -22,7 +22,7 @@ import (
"os"
"strings"
"github.com/blang/semver"
"github.com/blang/semver/v4"
"github.com/spf13/cobra"
"k8s.io/klog"

4
nodeup/pkg/model/BUILD.bazel
View File

@ -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",

2
nodeup/pkg/model/context.go
View File

@ -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

2
nodeup/pkg/model/kube_proxy_test.go
View File

@ -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"

2
nodeup/pkg/model/protokube.go
View File

@ -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"
)

4
pkg/apis/kops/BUILD.bazel
View File

@ -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",
],
)

2
pkg/apis/kops/channel.go
View File

@ -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"

2
pkg/apis/kops/semver_test.go
View File

@ -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:

4
pkg/apis/kops/util/BUILD.bazel
View File

@ -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",
],

2
pkg/apis/kops/util/versions.go
View File

@ -20,7 +20,7 @@ import (
"fmt"
"strings"
"github.com/blang/semver"
"github.com/blang/semver/v4"
"k8s.io/klog"
)

2
pkg/apis/kops/util/versions_test.go
View File

@ -21,7 +21,7 @@ import (
"reflect"
"testing"
"github.com/blang/semver"
"github.com/blang/semver/v4"
)
func Test_ParseKubernetesVersion(t *testing.T) {

2
pkg/apis/kops/validation/BUILD.bazel
View File

@ -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",

2
pkg/apis/kops/validation/validation.go
View File

@ -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"

2
pkg/assets/BUILD.bazel
View File

@ -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",
],

2
pkg/assets/builder.go
View File

@ -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"

2
pkg/k8sversion/BUILD.bazel
View File

@ -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",
],
)

2
pkg/k8sversion/version.go
View File

@ -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"
)

2
pkg/model/BUILD.bazel
View File

@ -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",

2
pkg/model/components/BUILD.bazel
View File

@ -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",

2
pkg/model/components/apiserver.go
View File

@ -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

2
pkg/model/components/context.go
View File

@ -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"
)

2
pkg/model/context.go
View File

@ -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"
)

2
tests/integration/channel/BUILD.bazel
View File

@ -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",
],
)

2
tests/integration/channel/integration_test.go
View File

@ -21,7 +21,7 @@ import (
"path"
"testing"
"github.com/blang/semver"
"github.com/blang/semver/v4"
"k8s.io/kops/pkg/apis/kops"
)

2
upup/pkg/fi/cloudup/BUILD.bazel
View File

@ -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",

2
upup/pkg/fi/cloudup/apply_cluster.go
View File

@ -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"

2
upup/pkg/fi/cloudup/populate_instancegroup_spec.go
View File

@ -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"