diff --git a/Makefile b/Makefile index a755c9245..f2a6658c0 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Copyright (c) 2018 Platform9 Systems, Inc. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -20,7 +20,7 @@ SHELL := /usr/bin/env bash CWD := $(shell pwd) BIN := etcdadm -PACKAGE_GOPATH := /go/src/github.com/platform9/$(BIN) +PACKAGE_GOPATH := /go/src/sigs.k8s.io/$(BIN) LDFLAGS := $(shell source ./version.sh ; KUBE_ROOT=. ; KUBE_GIT_VERSION=${VERSION_OVERRIDE} ; kube::version::ldflags) GIT_STORAGE_MOUNT := $(shell source ./git_utils.sh; container_git_storage_mount) diff --git a/README.md b/README.md index f0bdee51f..28b020a4e 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ etcdadm is a command-line tool for operating an etcd cluster. It makes it easy t ### Building ``` -go get -u github.com/platform9/etcdadm +go get -u sigs.k8s.io/etcdadm ``` ### Creating a new cluster diff --git a/apis/config.go b/apis/config.go index 44d65b6e0..c067137d2 100644 --- a/apis/config.go +++ b/apis/config.go @@ -26,7 +26,7 @@ import ( "strings" "time" - "github.com/platform9/etcdadm/constants" + "sigs.k8s.io/etcdadm/constants" uuid "github.com/satori/go.uuid" netutil "k8s.io/apimachinery/pkg/util/net" diff --git a/binary/etcd.go b/binary/etcd.go index 2d12fe4e3..373379580 100644 --- a/binary/etcd.go +++ b/binary/etcd.go @@ -25,10 +25,10 @@ import ( "strings" "time" - log "github.com/platform9/etcdadm/pkg/logrus" + log "sigs.k8s.io/etcdadm/pkg/logrus" - "github.com/platform9/etcdadm/constants" - "github.com/platform9/etcdadm/util" + "sigs.k8s.io/etcdadm/constants" + "sigs.k8s.io/etcdadm/util" ) // IsInstalled method check if required etcd binaries are installed diff --git a/certs/certs.go b/certs/certs.go index d29560647..104ada19d 100644 --- a/certs/certs.go +++ b/certs/certs.go @@ -26,11 +26,11 @@ import ( "crypto/x509" "fmt" - log "github.com/platform9/etcdadm/pkg/logrus" + log "sigs.k8s.io/etcdadm/pkg/logrus" - "github.com/platform9/etcdadm/apis" - "github.com/platform9/etcdadm/certs/pkiutil" - "github.com/platform9/etcdadm/constants" + "sigs.k8s.io/etcdadm/apis" + "sigs.k8s.io/etcdadm/certs/pkiutil" + "sigs.k8s.io/etcdadm/constants" certutil "k8s.io/client-go/util/cert" ) diff --git a/certs/pkiutil/pki_helpers.go b/certs/pkiutil/pki_helpers.go index 67b1bd2ff..9df663e05 100644 --- a/certs/pkiutil/pki_helpers.go +++ b/certs/pkiutil/pki_helpers.go @@ -30,8 +30,8 @@ import ( "path/filepath" "time" - "github.com/platform9/etcdadm/apis" - "github.com/platform9/etcdadm/constants" + "sigs.k8s.io/etcdadm/apis" + "sigs.k8s.io/etcdadm/constants" "k8s.io/apimachinery/pkg/util/validation" certutil "k8s.io/client-go/util/cert" ) diff --git a/certs/pkiutil/pki_helpers_test.go b/certs/pkiutil/pki_helpers_test.go index 4a07f941c..5dd1903f2 100644 --- a/certs/pkiutil/pki_helpers_test.go +++ b/certs/pkiutil/pki_helpers_test.go @@ -30,7 +30,7 @@ import ( "os" "testing" - "github.com/platform9/etcdadm/apis" + "sigs.k8s.io/etcdadm/apis" certutil "k8s.io/client-go/util/cert" ) diff --git a/cmd/download.go b/cmd/download.go index d52c9145f..3505af0d0 100644 --- a/cmd/download.go +++ b/cmd/download.go @@ -17,11 +17,11 @@ package cmd import ( - log "github.com/platform9/etcdadm/pkg/logrus" + log "sigs.k8s.io/etcdadm/pkg/logrus" - "github.com/platform9/etcdadm/apis" - "github.com/platform9/etcdadm/binary" - "github.com/platform9/etcdadm/constants" + "sigs.k8s.io/etcdadm/apis" + "sigs.k8s.io/etcdadm/binary" + "sigs.k8s.io/etcdadm/constants" "github.com/spf13/cobra" ) diff --git a/cmd/info.go b/cmd/info.go index ea74d8edb..70d180ca9 100644 --- a/cmd/info.go +++ b/cmd/info.go @@ -21,11 +21,11 @@ import ( "encoding/json" "fmt" - log "github.com/platform9/etcdadm/pkg/logrus" + log "sigs.k8s.io/etcdadm/pkg/logrus" - "github.com/platform9/etcdadm/apis" - "github.com/platform9/etcdadm/constants" - "github.com/platform9/etcdadm/etcd" + "sigs.k8s.io/etcdadm/apis" + "sigs.k8s.io/etcdadm/constants" + "sigs.k8s.io/etcdadm/etcd" "github.com/spf13/cobra" ) diff --git a/cmd/init.go b/cmd/init.go index b591b0276..c48dc23c6 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -20,18 +20,18 @@ import ( "context" "os" - log "github.com/platform9/etcdadm/pkg/logrus" + log "sigs.k8s.io/etcdadm/pkg/logrus" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/platform9/etcdadm/etcd" + "sigs.k8s.io/etcdadm/etcd" - "github.com/platform9/etcdadm/apis" - "github.com/platform9/etcdadm/binary" - "github.com/platform9/etcdadm/certs" - "github.com/platform9/etcdadm/constants" - "github.com/platform9/etcdadm/util" + "sigs.k8s.io/etcdadm/apis" + "sigs.k8s.io/etcdadm/binary" + "sigs.k8s.io/etcdadm/certs" + "sigs.k8s.io/etcdadm/constants" + "sigs.k8s.io/etcdadm/util" - "github.com/platform9/etcdadm/service" + "sigs.k8s.io/etcdadm/service" "github.com/spf13/cobra" ) diff --git a/cmd/join.go b/cmd/join.go index 9818136fc..0c478cb0e 100644 --- a/cmd/join.go +++ b/cmd/join.go @@ -21,17 +21,17 @@ import ( "net/url" "os" - log "github.com/platform9/etcdadm/pkg/logrus" + log "sigs.k8s.io/etcdadm/pkg/logrus" "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/platform9/etcdadm/apis" - "github.com/platform9/etcdadm/binary" - "github.com/platform9/etcdadm/certs" - "github.com/platform9/etcdadm/constants" - "github.com/platform9/etcdadm/etcd" - "github.com/platform9/etcdadm/service" + "sigs.k8s.io/etcdadm/apis" + "sigs.k8s.io/etcdadm/binary" + "sigs.k8s.io/etcdadm/certs" + "sigs.k8s.io/etcdadm/constants" + "sigs.k8s.io/etcdadm/etcd" + "sigs.k8s.io/etcdadm/service" "github.com/spf13/cobra" ) diff --git a/cmd/reset.go b/cmd/reset.go index f48c771f2..c2607eefb 100644 --- a/cmd/reset.go +++ b/cmd/reset.go @@ -20,14 +20,14 @@ import ( "context" "os" - log "github.com/platform9/etcdadm/pkg/logrus" + log "sigs.k8s.io/etcdadm/pkg/logrus" "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/platform9/etcdadm/apis" - "github.com/platform9/etcdadm/binary" - "github.com/platform9/etcdadm/constants" - "github.com/platform9/etcdadm/etcd" - "github.com/platform9/etcdadm/service" + "sigs.k8s.io/etcdadm/apis" + "sigs.k8s.io/etcdadm/binary" + "sigs.k8s.io/etcdadm/constants" + "sigs.k8s.io/etcdadm/etcd" + "sigs.k8s.io/etcdadm/service" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index bf250cc78..b2b59c782 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -20,8 +20,8 @@ import ( "fmt" "os" - "github.com/platform9/etcdadm/apis" - log "github.com/platform9/etcdadm/pkg/logrus" + "sigs.k8s.io/etcdadm/apis" + log "sigs.k8s.io/etcdadm/pkg/logrus" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/version.go b/cmd/version.go index 6645da942..dabab5573 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - log "github.com/platform9/etcdadm/pkg/logrus" + log "sigs.k8s.io/etcdadm/pkg/logrus" "github.com/ghodss/yaml" "github.com/spf13/cobra" diff --git a/etcd/etcd.go b/etcd/etcd.go index 331f1a25b..f958dbd59 100644 --- a/etcd/etcd.go +++ b/etcd/etcd.go @@ -26,7 +26,7 @@ import ( "github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/snapshot" - "github.com/platform9/etcdadm/apis" + "sigs.k8s.io/etcdadm/apis" ) // ClientForEndpoint returns an etcd client that will use the given etcd endpoint. diff --git a/main.go b/main.go index a420f1ced..155a0981f 100644 --- a/main.go +++ b/main.go @@ -16,7 +16,7 @@ package main -import "github.com/platform9/etcdadm/cmd" +import "sigs.k8s.io/etcdadm/cmd" func main() { cmd.Execute() diff --git a/preflight/mandatory.go b/preflight/mandatory.go index 83558b383..78ca65896 100644 --- a/preflight/mandatory.go +++ b/preflight/mandatory.go @@ -19,10 +19,10 @@ package preflight import ( "fmt" - log "github.com/platform9/etcdadm/pkg/logrus" + log "sigs.k8s.io/etcdadm/pkg/logrus" - "github.com/platform9/etcdadm/apis" - "github.com/platform9/etcdadm/service" + "sigs.k8s.io/etcdadm/apis" + "sigs.k8s.io/etcdadm/service" ) // Mandatory runs the mandatory pre-flight checks, returning an error if any diff --git a/service/diff.go b/service/diff.go index 2db57ed7f..5ac870210 100644 --- a/service/diff.go +++ b/service/diff.go @@ -27,10 +27,10 @@ import ( "regexp" "strings" - "github.com/platform9/etcdadm/util" + "sigs.k8s.io/etcdadm/util" - "github.com/platform9/etcdadm/apis" - "github.com/platform9/etcdadm/constants" + "sigs.k8s.io/etcdadm/apis" + "sigs.k8s.io/etcdadm/constants" ) var ( diff --git a/service/etcdctl.go b/service/etcdctl.go index a406dff82..651de407a 100644 --- a/service/etcdctl.go +++ b/service/etcdctl.go @@ -22,8 +22,8 @@ import ( "os" "path/filepath" - "github.com/platform9/etcdadm/apis" - "github.com/platform9/etcdadm/constants" + "sigs.k8s.io/etcdadm/apis" + "sigs.k8s.io/etcdadm/constants" ) // WriteEtcdctlEnvFile writes the environment file that can be used with the etcdctl client diff --git a/service/unit.go b/service/unit.go index b36ca8d81..cfece36de 100644 --- a/service/unit.go +++ b/service/unit.go @@ -22,8 +22,8 @@ import ( "os" "path/filepath" - "github.com/platform9/etcdadm/apis" - "github.com/platform9/etcdadm/constants" + "sigs.k8s.io/etcdadm/apis" + "sigs.k8s.io/etcdadm/constants" ) // WriteEnvironmentFile writes the environment file used by the etcd service unit diff --git a/version.sh b/version.sh index 2b180473e..75dcb46a4 100644 --- a/version.sh +++ b/version.sh @@ -15,7 +15,7 @@ # ----------------------------------------------------------------------------- # Source: https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.10/hack/lib/version.sh -# Changes: Updated location of version to github.com/platform9/etcdadm/vendor/k8s.io/kubernetes/pkg/version +# Changes: Updated location of version to sigs.k8s.io/etcdadm/vendor/k8s.io/kubernetes/pkg/version # Version management helpers. These functions help to set, save and load the # following variables: # @@ -135,7 +135,7 @@ kube::version::ldflag() { # If you update these, also update the list pkg/version/def.bzl. - echo "-X github.com/platform9/etcdadm/vendor/k8s.io/kubernetes/pkg/version.${key}=${val}" + echo "-X sigs.k8s.io/etcdadm/vendor/k8s.io/kubernetes/pkg/version.${key}=${val}" } # Prints the value that needs to be passed to the -ldflags parameter of go build