Skip to content
This repository has been archived by the owner on Jan 20, 2022. It is now read-only.

Update Kops dependency for Azure Blob Storage support #372

Merged
merged 3 commits into from
Dec 2, 2020
Merged

Update Kops dependency for Azure Blob Storage support #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
615139b
Upgrade kops dependency to master HEAD
rifelpet Nov 30, 2020
c2c970c
Upgrade klog to v2
rifelpet Nov 30, 2020
cc5d7b9
Fix deb-tools vendoring and bazel setup
rifelpet Dec 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion cmd/etcd-backup-ctl/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ go_library(
visibility = ["//visibility:private"],
deps = [
"//pkg/backup:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-backup-ctl/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"os"

"k8s.io/klog"
"k8s.io/klog/v2"
"kope.io/etcd-manager/pkg/backup"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-backup/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ go_library(
deps = [
"//pkg/backup:go_default_library",
"//pkg/backupcontroller:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-backup/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"os"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
"kope.io/etcd-manager/pkg/backup"
"kope.io/etcd-manager/pkg/backupcontroller"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-dump/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ go_library(
"//pkg/etcd:go_default_library",
"//pkg/etcd/dump:go_default_library",
"//pkg/etcdclient:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-dump/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
"kope.io/etcd-manager/pkg/backup"
"kope.io/etcd-manager/pkg/etcd"
"kope.io/etcd-manager/pkg/etcd/dump"
Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-manager-ctl/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ go_library(
"//pkg/backup:go_default_library",
"//pkg/commands:go_default_library",
"//vendor/github.com/golang/protobuf/proto:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-manager-ctl/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"os"

"github.com/golang/protobuf/proto"
"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/backup"
"kope.io/etcd-manager/pkg/commands"
Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-manager/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ go_library(
"//pkg/volumes/external:go_default_library",
"//pkg/volumes/gce:go_default_library",
"//pkg/volumes/openstack:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
"//vendor/k8s.io/kops/util/pkg/vfs:go_default_library",
],
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"strings"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
"k8s.io/kops/util/pkg/vfs"
apis_etcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/backup"
Expand Down
25 changes: 15 additions & 10 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module kope.io/etcd-manager

go 1.12

replace k8s.io/kops => k8s.io/kops v1.19.0-beta.1
replace k8s.io/kops => k8s.io/kops v1.19.0-alpha.5.0.20201129060248-dc1c2210cf77

// Version kubernetes-1.15.3
//replace k8s.io/kubernetes => k8s.io/kubernetes v1.19.0
Expand Down Expand Up @@ -77,25 +77,30 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.19.5-rc.0
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0

require (
cloud.google.com/go v0.51.0
cloud.google.com/go v0.54.0
github.com/aliyun/alibaba-cloud-sdk-go v1.61.264
github.com/aws/aws-sdk-go v1.35.10
github.com/aws/aws-sdk-go v1.35.24
github.com/blang/semver v3.5.1+incompatible
github.com/digitalocean/godo v1.19.0
github.com/digitalocean/godo v1.54.0
github.com/go-logr/logr v0.3.0 // indirect
github.com/golang/protobuf v1.4.2
github.com/gophercloud/gophercloud v0.11.1-0.20200518183226-7aec46f32c19
github.com/pkg/sftp v0.0.0-20180127012644-738e088bbd93 // indirect
go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5
golang.org/x/net v0.0.0-20200707034311-ab3426394381
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sys v0.0.0-20201126233918-771906719818 // indirect
golang.org/x/text v0.3.4 // indirect
golang.org/x/tools v0.0.0-20201125231158-b5590deeca9b // indirect
google.golang.org/api v0.22.0
google.golang.org/grpc v1.27.1
gopkg.in/gcfg.v1 v1.2.3
gopkg.in/yaml.v2 v2.3.0
honnef.co/go/tools v0.0.1-2020.1.4
k8s.io/apimachinery v0.19.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
honnef.co/go/tools v0.0.1-2020.1.6
k8s.io/apimachinery v0.20.0-beta.2
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.4.0
k8s.io/kops v0.0.0-00010101000000-000000000000
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
)
215 changes: 185 additions & 30 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/backup/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ go_library(
deps = [
"//pkg/apis/etcd:go_default_library",
"//pkg/ioutils:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
"//vendor/k8s.io/kops/util/pkg/vfs:go_default_library",
],
)
2 changes: 1 addition & 1 deletion pkg/backup/fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"sort"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
"kope.io/etcd-manager/pkg/apis/etcd"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/ioutils"
Expand Down
2 changes: 1 addition & 1 deletion pkg/backup/vfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
"k8s.io/kops/util/pkg/vfs"
"kope.io/etcd-manager/pkg/apis/etcd"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/backupcontroller/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ go_library(
"//pkg/contextutil:go_default_library",
"//pkg/etcd:go_default_library",
"//pkg/etcdclient:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/backupcontroller/cleanup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"

"kope.io/etcd-manager/pkg/backup"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/backupcontroller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"fmt"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/backup"
"kope.io/etcd-manager/pkg/contextutil"
Expand Down
2 changes: 1 addition & 1 deletion pkg/commands/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/etcd:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
"//vendor/k8s.io/kops/util/pkg/vfs:go_default_library",
],
)
2 changes: 1 addition & 1 deletion pkg/commands/vfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sort"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
"k8s.io/kops/util/pkg/vfs"
"kope.io/etcd-manager/pkg/apis/etcd"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
Expand Down
2 changes: 1 addition & 1 deletion pkg/contextutil/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ go_library(
srcs = ["poll.go"],
importpath = "kope.io/etcd-manager/pkg/contextutil",
visibility = ["//visibility:public"],
deps = ["//vendor/k8s.io/klog:go_default_library"],
deps = ["//vendor/k8s.io/klog/v2:go_default_library"],
)
2 changes: 1 addition & 1 deletion pkg/contextutil/poll.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
)

func Sleep(ctx context.Context, duration time.Duration) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ go_library(
"//pkg/privateapi:go_default_library",
"//pkg/urls:go_default_library",
"//vendor/github.com/golang/protobuf/proto:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],
)
2 changes: 1 addition & 1 deletion pkg/controller/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/commands"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"time"

"github.com/golang/protobuf/proto"
"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/backup"
"kope.io/etcd-manager/pkg/backupcontroller"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/etcdclusterstate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"crypto/tls"
"fmt"

"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/etcdclient"
"kope.io/etcd-manager/pkg/privateapi"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/newcluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strings"

"github.com/golang/protobuf/proto"
"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/urls"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/reconcile_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"reflect"
"sort"

"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/etcdclient"
"kope.io/etcd-manager/pkg/privateapi"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"

"github.com/golang/protobuf/proto"
"k8s.io/klog"
"k8s.io/klog/v2"

protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/commands"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/etcd/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ go_library(
"//vendor/github.com/golang/protobuf/proto:go_default_library",
"//vendor/golang.org/x/net/context:go_default_library",
"//vendor/k8s.io/client-go/util/cert:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],
)
2 changes: 1 addition & 1 deletion pkg/etcd/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"os/exec"
"path/filepath"

"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/backup"
"kope.io/etcd-manager/pkg/etcdclient"
Expand Down
2 changes: 1 addition & 1 deletion pkg/etcd/etcdprocess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"time"

certutil "k8s.io/client-go/util/cert"
"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/backup"
"kope.io/etcd-manager/pkg/etcdclient"
Expand Down
2 changes: 1 addition & 1 deletion pkg/etcd/etcdserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/backup"
"kope.io/etcd-manager/pkg/contextutil"
Expand Down
2 changes: 1 addition & 1 deletion pkg/etcd/pki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"path/filepath"

certutil "k8s.io/client-go/util/cert"
"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/pki"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/etcd/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"strings"
"time"

"k8s.io/klog"
"k8s.io/klog/v2"
protoetcd "kope.io/etcd-manager/pkg/apis/etcd"
"kope.io/etcd-manager/pkg/backup"
"kope.io/etcd-manager/pkg/etcdclient"
Expand Down
2 changes: 1 addition & 1 deletion pkg/etcd/tar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"path"
"path/filepath"

"k8s.io/klog"
"k8s.io/klog/v2"
)

func createTgz(tgzFile string, srcdir string) error {
Expand Down
2 changes: 1 addition & 1 deletion pkg/etcdclient/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ go_library(
"//vendor/go.etcd.io/etcd/clientv3:go_default_library",
"//vendor/go.etcd.io/etcd/pkg/pathutil:go_default_library",
"//vendor/go.etcd.io/etcd/version:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],
)
2 changes: 1 addition & 1 deletion pkg/etcdclient/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"time"

etcd_client_v2 "go.etcd.io/etcd/client"
"k8s.io/klog"
"k8s.io/klog/v2"
)

// EtcdClient is an abstract client for V2 and V3
Expand Down
2 changes: 1 addition & 1 deletion pkg/etcdclient/localnode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

etcd_client_v2 "go.etcd.io/etcd/client"
"go.etcd.io/etcd/pkg/pathutil"
"k8s.io/klog"
"k8s.io/klog/v2"
)

type v2SelfInfo struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/etcdclient/v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"time"

etcd_client_v2 "go.etcd.io/etcd/client"
"k8s.io/klog"
"k8s.io/klog/v2"
)

// V2Client is a client for the etcd v2 API, implementing EtcdClient
Expand Down
Loading