Skip to content

Commit

Permalink
Change import paths to sigs.k8s.io/etcdadm
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Lipovetsky committed Mar 7, 2019
1 parent e66ac18 commit 62aee7d
Show file tree
Hide file tree
Showing 21 changed files with 60 additions and 60 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion apis/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions binary/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions certs/certs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions certs/pkiutil/pki_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion certs/pkiutil/pki_helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"os"
"testing"

"github.com/platform9/etcdadm/apis"
"sigs.k8s.io/etcdadm/apis"
certutil "k8s.io/client-go/util/cert"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/download.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
16 changes: 8 additions & 8 deletions cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
14 changes: 7 additions & 7 deletions cmd/join.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
12 changes: 6 additions & 6 deletions cmd/reset.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion etcd/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package main

import "github.com/platform9/etcdadm/cmd"
import "sigs.k8s.io/etcdadm/cmd"

func main() {
cmd.Execute()
Expand Down
6 changes: 3 additions & 3 deletions preflight/mandatory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions service/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions service/etcdctl.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions service/unit.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:
#
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 62aee7d

Please sign in to comment.