Skip to content

Commit

Permalink
Merge pull request #48 from arapulido/change_import_path
Browse files Browse the repository at this point in the history
Change the import path and related documentation to kubeapps repo
  • Loading branch information
prydonius authored Nov 20, 2017
2 parents 24abab1 + 41b71aa commit d267db6
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ os:
go:
- 1.8.3

go_import_path: github.com/kubeapps/installer
go_import_path: github.com/kubeapps/kubeapps

before_install:
- set -e
Expand Down Expand Up @@ -35,4 +35,4 @@ deploy:
on:
tags: true
branch: master
repo: kubeapps/installer
repo: kubeapps/kubeapps
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
IMPORT_PATH:= github.com/kubeapps/installer
IMPORT_PATH:= github.com/kubeapps/kubeapps
GOBIN = go
# Force builds to only use vendor/'ed dependencies
# i.e. ignore local $GOPATH/src installed sources
Expand All @@ -13,7 +13,7 @@ ARCH = amd64
BINARY = kubeapps
GO_PACKAGES = $(IMPORT_PATH)/cmd $(IMPORT_PATH)/pkg/...
GO_FILES := $(shell find $(shell $(GOBIN) list -f '{{.Dir}}' $(GO_PACKAGES)) -name \*.go)
GO_FLAGS = -ldflags="-w -X github.com/kubeapps/installer/cmd.VERSION=${VERSION}"
GO_FLAGS = -ldflags="-w -X github.com/kubeapps/kubeapps/cmd.VERSION=${VERSION}"
EMBEDDED_STATIC = generated/statik/statik.go

default: binary
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/kubeapps/installer.svg?branch=master)](https://travis-ci.org/kubeapps/installer)
[![Build Status](https://travis-ci.org/kubeapps/kubeapps.svg?branch=master)](https://travis-ci.org/kubeapps/kubeapps)

# Kubeapps Installer

Expand All @@ -11,7 +11,7 @@ Kubeapps Installer is a [Bitnami](https://bitnami.com) tool to super-charge your

Installation is made of two steps:

- Download latest Kubeapps Installer binary from the [release page](https://github.com/kubeapps/installer/releases). Currently Kubeapps Installer is distributed in two platforms: linux/amd64 and OSX/amd64
- Download latest Kubeapps Installer binary from the [release page](https://github.com/kubeapps/kubeapps/releases). Currently Kubeapps Installer is distributed in two platforms: linux/amd64 and OSX/amd64
- Make the binary executable

## Build from source
Expand All @@ -36,15 +36,15 @@ $ working_dir=$GOPATH/src/github.com/kubeapps/
$ mkdir -p $working_dir
```

### Clone kubeapps/installer repository
### Clone kubeapps/kubeapps repository
```
$ cd $working_dir
$ git clone https://github.com/kubeapps/installer
$ git clone https://github.com/kubeapps/kubeapps
```

### Building local binary
```
$ cd installer
$ cd kubeapps
$ make binary
```

Expand Down
2 changes: 1 addition & 1 deletion cmd/fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package cmd

import (
"bytes"
_ "github.com/kubeapps/installer/generated/statik"
_ "github.com/kubeapps/kubeapps/generated/statik"
"github.com/rakyll/statik/fs"
"io"
"log"
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var RootCmd = &cobra.Command{
Short: "kubeapps installs the Kubeapps components into your cluster",
Long: `kubeapps installs the Kubeapps components into your cluster.
Find more information at https://github.com/kubeapps/installer.`,
Find more information at https://github.com/kubeapps/kubeapps.`,
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
out := cmd.OutOrStderr()
logrus.SetOutput(out)
Expand Down
2 changes: 1 addition & 1 deletion cmd/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/ksonnet/kubecfg/metadata"
"github.com/ksonnet/kubecfg/pkg/kubecfg"
"github.com/kubeapps/installer/pkg/gke"
"github.com/kubeapps/kubeapps/pkg/gke"
"github.com/spf13/cobra"
"k8s.io/client-go/discovery"
)
Expand Down
2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package: github.com/kubeapps/installer
package: github.com/kubeapps/kubeapps
import:
- package: k8s.io/client-go
version: ^3.0.0
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package main
import (
"os"

"github.com/kubeapps/installer/cmd"
"github.com/kubeapps/kubeapps/cmd"
"github.com/sirupsen/logrus"
)

Expand Down

0 comments on commit d267db6

Please sign in to comment.