Skip to content

Commit

Permalink
Replace sigs.k8s.io/etcdadm/etcd-manager with sigs.k8s.io/etcd-manager
Browse files Browse the repository at this point in the history
  • Loading branch information
hakman committed Jun 17, 2024
1 parent e04eb14 commit 722a92a
Show file tree
Hide file tree
Showing 516 changed files with 622 additions and 622 deletions.
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
gazelle(
name = "gazelle",
external = "vendored",
prefix = "sigs.k8s.io/etcdadm/etcd-manager",
prefix = "sigs.k8s.io/etcd-manager",
)

load("//images:etcd.bzl", "supported_etcd_arch_and_version")
Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-backup-ctl/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
name = "etcd-backup-ctl_lib",
srcs = ["main.go"],
importpath = "sigs.k8s.io/etcdadm/etcd-manager/cmd/etcd-backup-ctl",
importpath = "sigs.k8s.io/etcd-manager/cmd/etcd-backup-ctl",
visibility = ["//visibility:private"],
deps = [
"//pkg/backup",
Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-backup-ctl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"os"

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

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-backup/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
name = "etcd-backup_lib",
srcs = ["main.go"],
importpath = "sigs.k8s.io/etcdadm/etcd-manager/cmd/etcd-backup",
importpath = "sigs.k8s.io/etcd-manager/cmd/etcd-backup",
visibility = ["//visibility:private"],
deps = [
"//pkg/backup",
Expand Down
4 changes: 2 additions & 2 deletions cmd/etcd-backup/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"time"

"k8s.io/klog/v2"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/backup"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/backupcontroller"
"sigs.k8s.io/etcd-manager/pkg/backup"
"sigs.k8s.io/etcd-manager/pkg/backupcontroller"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-dump/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
name = "etcd-dump_lib",
srcs = ["main.go"],
importpath = "sigs.k8s.io/etcdadm/etcd-manager/cmd/etcd-dump",
importpath = "sigs.k8s.io/etcd-manager/cmd/etcd-dump",
visibility = ["//visibility:private"],
deps = [
"//pkg/backup",
Expand Down
8 changes: 4 additions & 4 deletions cmd/etcd-dump/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
"time"

"k8s.io/klog/v2"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/backup"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/etcd/dump"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/etcdclient"
"sigs.k8s.io/etcd-manager/pkg/backup"
"sigs.k8s.io/etcd-manager/pkg/etcd"
"sigs.k8s.io/etcd-manager/pkg/etcd/dump"
"sigs.k8s.io/etcd-manager/pkg/etcdclient"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-manager-ctl/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
name = "etcd-manager-ctl_lib",
srcs = ["main.go"],
importpath = "sigs.k8s.io/etcdadm/etcd-manager/cmd/etcd-manager-ctl",
importpath = "sigs.k8s.io/etcd-manager/cmd/etcd-manager-ctl",
visibility = ["//visibility:private"],
deps = [
"//pkg/apis/etcd",
Expand Down
6 changes: 3 additions & 3 deletions cmd/etcd-manager-ctl/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (

"github.com/golang/protobuf/proto"
"k8s.io/klog/v2"
protoetcd "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/backup"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/commands"
protoetcd "sigs.k8s.io/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcd-manager/pkg/backup"
"sigs.k8s.io/etcd-manager/pkg/commands"
)

const DefaultEtcdVersion = "3.2.24"
Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd-manager/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
go_library(
name = "etcd-manager_lib",
srcs = ["main.go"],
importpath = "sigs.k8s.io/etcdadm/etcd-manager/cmd/etcd-manager",
importpath = "sigs.k8s.io/etcd-manager/cmd/etcd-manager",
visibility = ["//visibility:private"],
deps = [
"//pkg/apis/etcd",
Expand Down
48 changes: 24 additions & 24 deletions cmd/etcd-manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,30 @@ import (

"k8s.io/klog/v2"
"k8s.io/kops/util/pkg/vfs"
apis_etcd "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/backup"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/commands"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/controller"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/hosts"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/legacy"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/locking"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/metrics"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/pki"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/privateapi"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/privateapi/discovery"
vfsdiscovery "sigs.k8s.io/etcdadm/etcd-manager/pkg/privateapi/discovery/vfs"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/tlsconfig"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/urls"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/volumes"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/volumes/aws"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/volumes/azure"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/volumes/do"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/volumes/external"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/volumes/gce"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/volumes/hetzner"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/volumes/openstack"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/volumes/scaleway"
apis_etcd "sigs.k8s.io/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcd-manager/pkg/backup"
"sigs.k8s.io/etcd-manager/pkg/commands"
"sigs.k8s.io/etcd-manager/pkg/controller"
"sigs.k8s.io/etcd-manager/pkg/etcd"
"sigs.k8s.io/etcd-manager/pkg/hosts"
"sigs.k8s.io/etcd-manager/pkg/legacy"
"sigs.k8s.io/etcd-manager/pkg/locking"
"sigs.k8s.io/etcd-manager/pkg/metrics"
"sigs.k8s.io/etcd-manager/pkg/pki"
"sigs.k8s.io/etcd-manager/pkg/privateapi"
"sigs.k8s.io/etcd-manager/pkg/privateapi/discovery"
vfsdiscovery "sigs.k8s.io/etcd-manager/pkg/privateapi/discovery/vfs"
"sigs.k8s.io/etcd-manager/pkg/tlsconfig"
"sigs.k8s.io/etcd-manager/pkg/urls"
"sigs.k8s.io/etcd-manager/pkg/volumes"
"sigs.k8s.io/etcd-manager/pkg/volumes/aws"
"sigs.k8s.io/etcd-manager/pkg/volumes/azure"
"sigs.k8s.io/etcd-manager/pkg/volumes/do"
"sigs.k8s.io/etcd-manager/pkg/volumes/external"
"sigs.k8s.io/etcd-manager/pkg/volumes/gce"
"sigs.k8s.io/etcd-manager/pkg/volumes/hetzner"
"sigs.k8s.io/etcd-manager/pkg/volumes/openstack"
"sigs.k8s.io/etcd-manager/pkg/volumes/scaleway"
)

type stringSliceFlag []string
Expand Down
4 changes: 2 additions & 2 deletions dev/add-symlink.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
# limitations under the License.

pushd pkg/privateapi/
ln -sf ../../bazel-bin/pkg/privateapi/linux_amd64_stripped/privateapi_go_proto~/sigs.k8s.io/etcdadm/etcd-manager/pkg/privateapi/cluster.pb.go
ln -sf ../../bazel-bin/pkg/privateapi/linux_amd64_stripped/privateapi_go_proto~/sigs.k8s.io/etcd-manager/pkg/privateapi/cluster.pb.go
popd

pushd pkg/apis/etcd/
ln -sf ../../../bazel-bin/pkg/apis/etcd/linux_amd64_stripped/etcd_go_proto~/sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd/etcdapi.pb.go
ln -sf ../../../bazel-bin/pkg/apis/etcd/linux_amd64_stripped/etcd_go_proto~/sigs.k8s.io/etcd-manager/pkg/apis/etcd/etcdapi.pb.go
popd
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module sigs.k8s.io/etcdadm/etcd-manager
module sigs.k8s.io/etcd-manager

go 1.22

Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/etcd/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go_library(
"etcdapi.pb.go",
"json.go",
],
importpath = "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd",
importpath = "sigs.k8s.io/etcd-manager/pkg/apis/etcd",
visibility = ["//visibility:public"],
deps = [
"//vendor/github.com/golang/protobuf/jsonpb",
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/etcd/etcdapi.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
package etcd;

option go_package = "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd";
option go_package = "sigs.k8s.io/etcd-manager/pkg/apis/etcd";

message ClusterSpec {
int32 member_count = 1;
Expand Down
2 changes: 1 addition & 1 deletion pkg/backup/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go_library(
"store.go",
"vfs.go",
],
importpath = "sigs.k8s.io/etcdadm/etcd-manager/pkg/backup",
importpath = "sigs.k8s.io/etcd-manager/pkg/backup",
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/etcd",
Expand Down
2 changes: 1 addition & 1 deletion pkg/backup/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package backup

import (
"k8s.io/kops/util/pkg/vfs"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcd-manager/pkg/apis/etcd"
)

const MetaFilename = "_etcd_backup.meta"
Expand Down
2 changes: 1 addition & 1 deletion pkg/backup/vfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

"k8s.io/klog/v2"
"k8s.io/kops/util/pkg/vfs"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcd-manager/pkg/apis/etcd"
)

func NewVFSStore(p vfs.Path) (Store, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/backupcontroller/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ go_library(
"controller.go",
"parse.go",
],
importpath = "sigs.k8s.io/etcdadm/etcd-manager/pkg/backupcontroller",
importpath = "sigs.k8s.io/etcd-manager/pkg/backupcontroller",
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/etcd",
Expand Down
2 changes: 1 addition & 1 deletion pkg/backupcontroller/cleanup.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"k8s.io/klog/v2"

"sigs.k8s.io/etcdadm/etcd-manager/pkg/backup"
"sigs.k8s.io/etcd-manager/pkg/backup"
)

// HourlyBackupsRetention controls how long hourly backups are kept.
Expand Down
10 changes: 5 additions & 5 deletions pkg/backupcontroller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"time"

"k8s.io/klog/v2"
protoetcd "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/backup"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/contextutil"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/etcdclient"
protoetcd "sigs.k8s.io/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcd-manager/pkg/backup"
"sigs.k8s.io/etcd-manager/pkg/contextutil"
"sigs.k8s.io/etcd-manager/pkg/etcd"
"sigs.k8s.io/etcd-manager/pkg/etcdclient"
)

const loopInterval = time.Minute
Expand Down
2 changes: 1 addition & 1 deletion pkg/commands/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go_library(
"store.go",
"vfs.go",
],
importpath = "sigs.k8s.io/etcdadm/etcd-manager/pkg/commands",
importpath = "sigs.k8s.io/etcd-manager/pkg/commands",
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/etcd",
Expand Down
2 changes: 1 addition & 1 deletion pkg/commands/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package commands

import (
"k8s.io/kops/util/pkg/vfs"
protoetcd "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
protoetcd "sigs.k8s.io/etcd-manager/pkg/apis/etcd"
)

const CommandFilename = "_command.json"
Expand Down
2 changes: 1 addition & 1 deletion pkg/commands/vfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

"k8s.io/klog/v2"
"k8s.io/kops/util/pkg/vfs"
protoetcd "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
protoetcd "sigs.k8s.io/etcd-manager/pkg/apis/etcd"
)

const EtcdClusterCreated = "etcd-cluster-created"
Expand Down
2 changes: 1 addition & 1 deletion pkg/contextutil/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "contextutil",
srcs = ["poll.go"],
importpath = "sigs.k8s.io/etcdadm/etcd-manager/pkg/contextutil",
importpath = "sigs.k8s.io/etcd-manager/pkg/contextutil",
visibility = ["//visibility:public"],
deps = ["//vendor/k8s.io/klog/v2:klog"],
)
2 changes: 1 addition & 1 deletion pkg/controller/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ go_library(
"upgrade.go",
"utils.go",
],
importpath = "sigs.k8s.io/etcdadm/etcd-manager/pkg/controller",
importpath = "sigs.k8s.io/etcd-manager/pkg/controller",
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/etcd",
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"time"

"k8s.io/klog/v2"
protoetcd "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/commands"
protoetcd "sigs.k8s.io/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcd-manager/pkg/commands"
)

func (m *EtcdController) InvalidateControlStore() error {
Expand Down
24 changes: 12 additions & 12 deletions pkg/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ import (

"github.com/golang/protobuf/proto"
"k8s.io/klog/v2"
protoetcd "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/backup"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/backupcontroller"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/commands"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/contextutil"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/etcdclient"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/etcdversions"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/locking"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/pki"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/privateapi"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/urls"
protoetcd "sigs.k8s.io/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcd-manager/pkg/backup"
"sigs.k8s.io/etcd-manager/pkg/backupcontroller"
"sigs.k8s.io/etcd-manager/pkg/commands"
"sigs.k8s.io/etcd-manager/pkg/contextutil"
"sigs.k8s.io/etcd-manager/pkg/etcd"
"sigs.k8s.io/etcd-manager/pkg/etcdclient"
"sigs.k8s.io/etcd-manager/pkg/etcdversions"
"sigs.k8s.io/etcd-manager/pkg/locking"
"sigs.k8s.io/etcd-manager/pkg/pki"
"sigs.k8s.io/etcd-manager/pkg/privateapi"
"sigs.k8s.io/etcd-manager/pkg/urls"
)

const removeUnhealthyDeadline = time.Minute // TODO: increase
Expand Down
6 changes: 3 additions & 3 deletions pkg/controller/etcdclusterstate.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"fmt"

"k8s.io/klog/v2"
protoetcd "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/etcdclient"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/privateapi"
protoetcd "sigs.k8s.io/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcd-manager/pkg/etcdclient"
"sigs.k8s.io/etcd-manager/pkg/privateapi"
)

type EtcdMemberId string
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/newcluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (

"github.com/golang/protobuf/proto"
"k8s.io/klog/v2"
protoetcd "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/urls"
protoetcd "sigs.k8s.io/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcd-manager/pkg/urls"
)

// createNewCluster starts a new etcd cluster.
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/peer.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"context"
"fmt"

protoetcd "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/privateapi"
protoetcd "sigs.k8s.io/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcd-manager/pkg/privateapi"
)

type peer struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/reconcile_configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"sort"

"k8s.io/klog/v2"
protoetcd "sigs.k8s.io/etcdadm/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/etcdclient"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/privateapi"
"sigs.k8s.io/etcdadm/etcd-manager/pkg/urls"
protoetcd "sigs.k8s.io/etcd-manager/pkg/apis/etcd"
"sigs.k8s.io/etcd-manager/pkg/etcdclient"
"sigs.k8s.io/etcd-manager/pkg/privateapi"
"sigs.k8s.io/etcd-manager/pkg/urls"
)

func (m *EtcdController) updatePeerURLs(ctx context.Context, peerID privateapi.PeerId, p *etcdClusterPeerInfo, setPeerURLs []string) (bool, error) {
Expand Down
Loading

0 comments on commit 722a92a

Please sign in to comment.