mirror of
https://github.com/helm/helm.git
synced 2026-05-28 04:35:48 -04:00
fix(*): rewrite import paths
This commit is contained in:
parent
af38d1b55a
commit
f098cb6fb6
34 changed files with 59 additions and 59 deletions
|
|
@ -2,7 +2,7 @@ space := $(empty) $(empty)
|
|||
comma := ,
|
||||
empty :=
|
||||
|
||||
import_path = github.com/deis/tiller/pkg/proto/hapi
|
||||
import_path = github.com/kubernetes/helm/pkg/proto/hapi
|
||||
|
||||
dst = ../pkg/proto
|
||||
target = go
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ machine:
|
|||
GO15VENDOREXPERIMENT: 1
|
||||
GOPATH: /usr/local/go_workspace
|
||||
HOME: /home/ubuntu
|
||||
IMPORT_PATH: "github.com/deis/tiller"
|
||||
IMPORT_PATH: "github.com/kubernetes/helm"
|
||||
PATH: $HOME/go/bin:$PATH
|
||||
GOROOT: $HOME/go
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"errors"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/deis/tiller/pkg/chart"
|
||||
"github.com/kubernetes/helm/pkg/chart"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/deis/tiller/pkg/helm"
|
||||
"github.com/kubernetes/helm/pkg/helm"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ import (
|
|||
"io/ioutil"
|
||||
"os"
|
||||
|
||||
"github.com/deis/tiller/pkg/client"
|
||||
"github.com/deis/tiller/pkg/kubectl"
|
||||
"github.com/kubernetes/helm/pkg/client"
|
||||
"github.com/kubernetes/helm/pkg/kubectl"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ import (
|
|||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"github.com/deis/tiller/pkg/chart"
|
||||
"github.com/deis/tiller/pkg/helm"
|
||||
"github.com/kubernetes/helm/pkg/chart"
|
||||
"github.com/kubernetes/helm/pkg/helm"
|
||||
)
|
||||
|
||||
const installDesc = `
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package main
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/deis/tiller/pkg/lint"
|
||||
"github.com/kubernetes/helm/pkg/lint"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ import (
|
|||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/deis/tiller/pkg/chart"
|
||||
"github.com/deis/tiller/pkg/repo"
|
||||
"github.com/kubernetes/helm/pkg/chart"
|
||||
"github.com/kubernetes/helm/pkg/repo"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/deis/tiller/pkg/helm"
|
||||
"github.com/kubernetes/helm/pkg/helm"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ import (
|
|||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/deis/tiller/pkg/repo"
|
||||
"github.com/gosuri/uitable"
|
||||
"github.com/kubernetes/helm/pkg/repo"
|
||||
"github.com/spf13/cobra"
|
||||
"gopkg.in/yaml.v2"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package main
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/deis/tiller/pkg/repo"
|
||||
"github.com/kubernetes/helm/pkg/repo"
|
||||
)
|
||||
|
||||
func TestRepoAdd(t *testing.T) {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/deis/tiller/pkg/repo"
|
||||
"github.com/kubernetes/helm/pkg/repo"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"github.com/deis/tiller/pkg/repo"
|
||||
"github.com/kubernetes/helm/pkg/repo"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ import (
|
|||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/deis/tiller/pkg/helm"
|
||||
"github.com/deis/tiller/pkg/timeconv"
|
||||
"github.com/kubernetes/helm/pkg/helm"
|
||||
"github.com/kubernetes/helm/pkg/timeconv"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
package environment
|
||||
|
||||
import (
|
||||
"github.com/deis/tiller/pkg/engine"
|
||||
"github.com/deis/tiller/pkg/proto/hapi/chart"
|
||||
"github.com/deis/tiller/pkg/proto/hapi/release"
|
||||
"github.com/deis/tiller/pkg/storage"
|
||||
"github.com/kubernetes/helm/pkg/engine"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/chart"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/release"
|
||||
"github.com/kubernetes/helm/pkg/storage"
|
||||
)
|
||||
|
||||
// GoTplEngine is the name of the Go template engine, as registered in the EngineYard.
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ package environment
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/deis/tiller/pkg/proto/hapi/chart"
|
||||
"github.com/deis/tiller/pkg/proto/hapi/release"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/chart"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/release"
|
||||
)
|
||||
|
||||
type mockEngine struct {
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@ import (
|
|||
"errors"
|
||||
"log"
|
||||
|
||||
"github.com/deis/tiller/cmd/tiller/environment"
|
||||
"github.com/deis/tiller/pkg/proto/hapi/release"
|
||||
"github.com/deis/tiller/pkg/proto/hapi/services"
|
||||
"github.com/deis/tiller/pkg/timeconv"
|
||||
"github.com/kubernetes/helm/cmd/tiller/environment"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/release"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/services"
|
||||
"github.com/kubernetes/helm/pkg/timeconv"
|
||||
"github.com/technosophos/moniker"
|
||||
ctx "golang.org/x/net/context"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ import (
|
|||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/deis/tiller/cmd/tiller/environment"
|
||||
"github.com/deis/tiller/pkg/proto/hapi/chart"
|
||||
"github.com/deis/tiller/pkg/proto/hapi/release"
|
||||
"github.com/deis/tiller/pkg/proto/hapi/services"
|
||||
"github.com/deis/tiller/pkg/storage"
|
||||
"github.com/deis/tiller/pkg/timeconv"
|
||||
"github.com/golang/protobuf/ptypes/timestamp"
|
||||
"github.com/kubernetes/helm/cmd/tiller/environment"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/chart"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/release"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/services"
|
||||
"github.com/kubernetes/helm/pkg/storage"
|
||||
"github.com/kubernetes/helm/pkg/timeconv"
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import (
|
|||
"net"
|
||||
"os"
|
||||
|
||||
"github.com/deis/tiller/cmd/tiller/environment"
|
||||
"github.com/kubernetes/helm/cmd/tiller/environment"
|
||||
"github.com/spf13/cobra"
|
||||
"google.golang.org/grpc"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@ package main
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/deis/tiller/cmd/tiller/environment"
|
||||
"github.com/deis/tiller/pkg/engine"
|
||||
"github.com/deis/tiller/pkg/storage"
|
||||
"github.com/kubernetes/helm/cmd/tiller/environment"
|
||||
"github.com/kubernetes/helm/pkg/engine"
|
||||
"github.com/kubernetes/helm/pkg/storage"
|
||||
)
|
||||
|
||||
// These are canary tests to make sure that the default server actually
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
name: alpine
|
||||
description: Deploy a basic Alpine Linux pod
|
||||
version: 0.1.0
|
||||
home: "https://github.com/deis/tiller"
|
||||
home: "https://github.com/kubernetes/helm"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package: github.com/deis/tiller
|
||||
package: github.com/kubernetes/helm
|
||||
import:
|
||||
- package: golang.org/x/net
|
||||
version: fb93926129b8ec0056f2f458b1f519654814edf0
|
||||
|
|
|
|||
BIN
pkg/chart/testdata/frobnitz-0.0.1.tgz
vendored
BIN
pkg/chart/testdata/frobnitz-0.0.1.tgz
vendored
Binary file not shown.
|
|
@ -5,7 +5,7 @@ import (
|
|||
"text/template"
|
||||
|
||||
"github.com/Masterminds/sprig"
|
||||
"github.com/deis/tiller/pkg/kubectl"
|
||||
"github.com/kubernetes/helm/pkg/kubectl"
|
||||
)
|
||||
|
||||
// Installer installs tiller into Kubernetes
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ import (
|
|||
"text/template"
|
||||
|
||||
"github.com/Masterminds/sprig"
|
||||
chartutil "github.com/deis/tiller/pkg/chart"
|
||||
"github.com/deis/tiller/pkg/proto/hapi/chart"
|
||||
chartutil "github.com/kubernetes/helm/pkg/chart"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/chart"
|
||||
)
|
||||
|
||||
// Engine is an implementation of 'cmd/tiller/environment'.Engine that uses Go templates.
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ import (
|
|||
"sync"
|
||||
"testing"
|
||||
|
||||
chartutil "github.com/deis/tiller/pkg/chart"
|
||||
"github.com/deis/tiller/pkg/proto/hapi/chart"
|
||||
chartutil "github.com/kubernetes/helm/pkg/chart"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/chart"
|
||||
)
|
||||
|
||||
func TestEngine(t *testing.T) {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"golang.org/x/net/context"
|
||||
"google.golang.org/grpc"
|
||||
|
||||
"github.com/deis/tiller/pkg/proto/hapi/services"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/services"
|
||||
)
|
||||
|
||||
type client struct {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
package helm
|
||||
|
||||
import (
|
||||
"github.com/deis/tiller/pkg/chart"
|
||||
chartpb "github.com/deis/tiller/pkg/proto/hapi/chart"
|
||||
"github.com/deis/tiller/pkg/proto/hapi/services"
|
||||
"github.com/kubernetes/helm/pkg/chart"
|
||||
chartpb "github.com/kubernetes/helm/pkg/proto/hapi/chart"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/services"
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"os"
|
||||
"path/filepath"
|
||||
|
||||
chartutil "github.com/deis/tiller/pkg/chart"
|
||||
chartutil "github.com/kubernetes/helm/pkg/chart"
|
||||
)
|
||||
|
||||
func Chartfile(basepath string) (m []Message) {
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ package release
|
|||
import proto "github.com/golang/protobuf/proto"
|
||||
import fmt "fmt"
|
||||
import math "math"
|
||||
import hapi_chart "github.com/deis/tiller/pkg/proto/hapi/chart"
|
||||
import hapi_chart3 "github.com/deis/tiller/pkg/proto/hapi/chart"
|
||||
import hapi_chart "github.com/kubernetes/helm/pkg/proto/hapi/chart"
|
||||
import hapi_chart3 "github.com/kubernetes/helm/pkg/proto/hapi/chart"
|
||||
|
||||
// Reference imports to suppress errors if they are not otherwise used.
|
||||
var _ = proto.Marshal
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ package services
|
|||
import proto "github.com/golang/protobuf/proto"
|
||||
import fmt "fmt"
|
||||
import math "math"
|
||||
import hapi_chart3 "github.com/deis/tiller/pkg/proto/hapi/chart"
|
||||
import hapi_chart "github.com/deis/tiller/pkg/proto/hapi/chart"
|
||||
import hapi_release2 "github.com/deis/tiller/pkg/proto/hapi/release"
|
||||
import hapi_release1 "github.com/deis/tiller/pkg/proto/hapi/release"
|
||||
import hapi_chart3 "github.com/kubernetes/helm/pkg/proto/hapi/chart"
|
||||
import hapi_chart "github.com/kubernetes/helm/pkg/proto/hapi/chart"
|
||||
import hapi_release2 "github.com/kubernetes/helm/pkg/proto/hapi/release"
|
||||
import hapi_release1 "github.com/kubernetes/helm/pkg/proto/hapi/release"
|
||||
|
||||
import (
|
||||
context "golang.org/x/net/context"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/deis/tiller/pkg/chart"
|
||||
"github.com/kubernetes/helm/pkg/chart"
|
||||
"gopkg.in/yaml.v2"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"errors"
|
||||
"sync"
|
||||
|
||||
"github.com/deis/tiller/pkg/proto/hapi/release"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/release"
|
||||
)
|
||||
|
||||
// Memory is an in-memory ReleaseStorage implementation.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package storage
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/deis/tiller/pkg/proto/hapi/release"
|
||||
"github.com/kubernetes/helm/pkg/proto/hapi/release"
|
||||
)
|
||||
|
||||
func TestCreate(t *testing.T) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue