Merge pull request #29 from wandera/dk-wandera

WanderaOrg renamed to wandera

.travis.yml

@@ -43,9 +43,9 @@ before_deploy:
       GOOS=${PLATFORM%/*}
       GOARCH=${PLATFORM#*/}
       if [ "$GOOS" = "windows" ]; then
-        build_cmd="GOOS=$GOOS GOARCH=$GOARCH go build -o git2kube -ldflags '-w -s -X 'github.com/WanderaOrg/git2kube/cmd.Version=${TRAVIS_TAG}"
+        build_cmd="GOOS=$GOOS GOARCH=$GOARCH go build -o git2kube -ldflags '-w -s -X 'github.com/wandera/git2kube/cmd.Version=${TRAVIS_TAG}"
       else
-        build_cmd="CGO_ENABLED=0 GOOS=$GOOS GOARCH=$GOARCH go build -o git2kube -ldflags '-w -s -X 'github.com/WanderaOrg/git2kube/cmd.Version=${TRAVIS_TAG}"
+        build_cmd="CGO_ENABLED=0 GOOS=$GOOS GOARCH=$GOARCH go build -o git2kube -ldflags '-w -s -X 'github.com/wandera/git2kube/cmd.Version=${TRAVIS_TAG}"
       fi
       if ! eval $build_cmd; then
         echo "Failed building sample for $PLATFORM" && return 1

Dockerfile

@@ -8,7 +8,7 @@ ARG CACHE_TAG
 ENV CACHE_TAG ${CACHE_TAG}
 
 COPY . .
-RUN CGO_ENABLED=0 GOOS=linux go build -v -ldflags '-w -s -X 'github.com/WanderaOrg/git2kube/cmd.Version=${CACHE_TAG}
+RUN CGO_ENABLED=0 GOOS=linux go build -v -ldflags '-w -s -X 'github.com/wandera/git2kube/cmd.Version=${CACHE_TAG}
 
 # Runtime image
 FROM alpine:3.8

README.md

@@ -1,10 +1,10 @@
 # git2kube - From Git to Kubernetes
            
-[![Build Status](https://travis-ci.org/WanderaOrg/git2kube.svg?branch=master)](https://travis-ci.org/WanderaOrg/git2kube)
+[![Build Status](https://travis-ci.org/wandera/git2kube.svg?branch=master)](https://travis-ci.org/wandera/git2kube)
 [![Docker Build Status](https://img.shields.io/docker/build/wanderadock/git2kube.svg)](https://hub.docker.com/r/wanderadock/git2kube/)
-[![Go Report Card](https://goreportcard.com/badge/github.com/WanderaOrg/git2kube)](https://goreportcard.com/report/github.com/WanderaOrg/git2kube)
-[![GitHub release](https://img.shields.io/github/release/WanderaOrg/git2kube.svg)](https://github.com/WanderaOrg/git2kube/releases/latest)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/WanderaOrg/scccmd/blob/master/LICENSE)
+[![Go Report Card](https://goreportcard.com/badge/github.com/wandera/git2kube)](https://goreportcard.com/report/github.com/wandera/git2kube)
+[![GitHub release](https://img.shields.io/github/release/wandera/git2kube.svg)](https://github.com/wandera/git2kube/releases/latest)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/wandera/scccmd/blob/master/LICENSE)
 
 Tool for syncing git with Kubernetes.
 
@@ -28,7 +28,7 @@ The tool is released as docker image as well, check the [repository](https://hub
 * [example](example) - Kubernetes deployment examples
 
 ### How to develop
-* Checkout into your GOROOT directory (e.g. /go/src/github.com/WanderaOrg/git2kube)
+* Checkout into your GOROOT directory (e.g. /go/src/github.com/wandera/git2kube)
 * `cd` into the folder and run `dep ensure --vendor-only`
 * Tests are started by `go test -v ./...`
 * Or if you dont want to setup your local go env just use the provided Dockerfile

cmd/load.go

@@ -1,10 +1,10 @@
 package cmd
 
 import (
-	"github.com/WanderaOrg/git2kube/pkg/cmd"
-	"github.com/WanderaOrg/git2kube/pkg/fetch"
-	"github.com/WanderaOrg/git2kube/pkg/upload"
 	"github.com/spf13/cobra"
+	"github.com/wandera/git2kube/pkg/cmd"
+	"github.com/wandera/git2kube/pkg/fetch"
+	"github.com/wandera/git2kube/pkg/upload"
 	"os"
 )
 
@@ -108,7 +108,7 @@ func init() {
 	loadCmd.PersistentFlags().StringVarP(&lp.folder, "cache-folder", "c", "/tmp/git2kube/data/", "destination on filesystem where cache of repository will be stored")
 	loadCmd.PersistentFlags().StringSliceVar(&lp.includes, "include", []string{".*"}, "regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder")
 	loadCmd.PersistentFlags().StringSliceVar(&lp.excludes, "exclude", []string{"^\\..*"}, "regex that if is a match excludes the file from the upload, example: '*.yaml' or 'folder/*' if you want to match a folder")
-	loadCmd.PersistentFlags().StringVarP(&lp.sshkey, "ssh-key", "p", "", "path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:WanderaOrg/git2kube.git)")
+	loadCmd.PersistentFlags().StringVarP(&lp.sshkey, "ssh-key", "p", "", "path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)")
 
 	loadCmd.MarkPersistentFlagRequired("git")
 	loadCmd.MarkPersistentFlagFilename("cache-folder")

cmd/watch.go

@@ -1,11 +1,11 @@
 package cmd
 
 import (
-	"github.com/WanderaOrg/git2kube/pkg/cmd"
-	"github.com/WanderaOrg/git2kube/pkg/fetch"
-	"github.com/WanderaOrg/git2kube/pkg/upload"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"github.com/wandera/git2kube/pkg/cmd"
+	"github.com/wandera/git2kube/pkg/fetch"
+	"github.com/wandera/git2kube/pkg/upload"
 	"io/ioutil"
 	"os"
 	"os/signal"
@@ -183,7 +183,7 @@ func init() {
 	watchCmd.PersistentFlags().StringVarP(&wp.folder, "cache-folder", "c", "/tmp/git2kube/data/", "destination on filesystem where cache of repository will be stored")
 	watchCmd.PersistentFlags().StringSliceVar(&wp.includes, "include", []string{".*"}, "regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder")
 	watchCmd.PersistentFlags().StringSliceVar(&wp.excludes, "exclude", []string{"^\\..*"}, "regex that if is a match excludes the file from the upload, example: '*.yaml' or 'folder/*' if you want to match a folder")
-	watchCmd.PersistentFlags().StringVarP(&wp.sshkey, "ssh-key", "p", "", "path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:WanderaOrg/git2kube.git)")
+	watchCmd.PersistentFlags().StringVarP(&wp.sshkey, "ssh-key", "p", "", "path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)")
 	watchCmd.MarkPersistentFlagRequired("git")
 	watchCmd.MarkPersistentFlagFilename("cache-folder")
 	watchCmd.MarkPersistentFlagFilename("healthcheck-file")

docs/git2kube_load.md

@@ -15,7 +15,7 @@ Loads files from git repository into target
   -g, --git string            git repository address, either http(s) or ssh protocol has to be specified
   -h, --help                  help for load
       --include strings       regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
-  -p, --ssh-key string        path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:WanderaOrg/git2kube.git)
+  -p, --ssh-key string        path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
 ```
 
 ### Options inherited from parent commands

docs/git2kube_load_configmap.md

@@ -31,7 +31,7 @@ git2kube load configmap [flags]
   -g, --git string            git repository address, either http(s) or ssh protocol has to be specified
       --include strings       regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
   -l, --log-level string      command log level (options: [panic fatal error warning info debug]) (default "info")
-  -p, --ssh-key string        path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:WanderaOrg/git2kube.git)
+  -p, --ssh-key string        path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
 ```
 
 ### SEE ALSO

docs/git2kube_load_folder.md

@@ -26,7 +26,7 @@ git2kube load folder [flags]
   -g, --git string            git repository address, either http(s) or ssh protocol has to be specified
       --include strings       regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
   -l, --log-level string      command log level (options: [panic fatal error warning info debug]) (default "info")
-  -p, --ssh-key string        path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:WanderaOrg/git2kube.git)
+  -p, --ssh-key string        path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
 ```
 
 ### SEE ALSO

docs/git2kube_load_secret.md

@@ -31,7 +31,7 @@ git2kube load secret [flags]
   -g, --git string            git repository address, either http(s) or ssh protocol has to be specified
       --include strings       regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
   -l, --log-level string      command log level (options: [panic fatal error warning info debug]) (default "info")
-  -p, --ssh-key string        path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:WanderaOrg/git2kube.git)
+  -p, --ssh-key string        path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
 ```
 
 ### SEE ALSO

docs/git2kube_watch.md

@@ -17,7 +17,7 @@ Runs watcher that periodically check the provided repository
   -h, --help                      help for watch
       --include strings           regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
   -i, --interval int              interval in seconds in which to try refreshing ConfigMap from git (default 10)
-  -p, --ssh-key string            path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:WanderaOrg/git2kube.git)
+  -p, --ssh-key string            path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
 ```
 
 ### Options inherited from parent commands

docs/git2kube_watch_configmap.md

@@ -33,7 +33,7 @@ git2kube watch configmap [flags]
       --include strings           regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
   -i, --interval int              interval in seconds in which to try refreshing ConfigMap from git (default 10)
   -l, --log-level string          command log level (options: [panic fatal error warning info debug]) (default "info")
-  -p, --ssh-key string            path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:WanderaOrg/git2kube.git)
+  -p, --ssh-key string            path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
 ```
 
 ### SEE ALSO

docs/git2kube_watch_folder.md

@@ -28,7 +28,7 @@ git2kube watch folder [flags]
       --include strings           regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
   -i, --interval int              interval in seconds in which to try refreshing ConfigMap from git (default 10)
   -l, --log-level string          command log level (options: [panic fatal error warning info debug]) (default "info")
-  -p, --ssh-key string            path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:WanderaOrg/git2kube.git)
+  -p, --ssh-key string            path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
 ```
 
 ### SEE ALSO

docs/git2kube_watch_secret.md

@@ -33,7 +33,7 @@ git2kube watch secret [flags]
       --include strings           regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
   -i, --interval int              interval in seconds in which to try refreshing ConfigMap from git (default 10)
   -l, --log-level string          command log level (options: [panic fatal error warning info debug]) (default "info")
-  -p, --ssh-key string            path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:WanderaOrg/git2kube.git)
+  -p, --ssh-key string            path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
 ```
 
 ### SEE ALSO

go.mod

@@ -1,4 +1,4 @@
-module github.com/WanderaOrg/git2kube
+module github.com/wandera/git2kube
 
 require (
 	github.com/cpuguy83/go-md2man v1.0.8 // indirect

main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/WanderaOrg/git2kube/cmd"
 	log "github.com/sirupsen/logrus"
+	"github.com/wandera/git2kube/cmd"
 	"os"
 )
 

pkg/fetch/fetch_test.go

@@ -16,20 +16,20 @@ func TestNewAuth(t *testing.T) {
 	}{
 		{
 			name:   "No Auth",
-			git:    "https://github.com/WanderaOrg/git2kube.git",
+			git:    "https://github.com/wandera/git2kube.git",
 			result: nil,
 		},
 		{
 			name: "Basic Auth",
-			git:  "https://test:testpass@github.com/WanderaOrg/git2kube.git",
+			git:  "https://test:testpass@github.com/wandera/git2kube.git",
 			result: &http.BasicAuth{
 				Username: "test",
 				Password: "testpass",
 			},
 		},
 		{
 			name: "SSH wit private key",
-			git:  "git@github.com:WanderaOrg/git2kube.git",
+			git:  "git@github.com:wandera/git2kube.git",
 			key:  "testdata/dummy.key",
 			result: &gitssh.PublicKeys{
 				User:   "git",
@@ -38,13 +38,13 @@ func TestNewAuth(t *testing.T) {
 		},
 		{
 			name:   "HTTP url with private key",
-			git:    "https://github.com/WanderaOrg/git2kube.git",
+			git:    "https://github.com/wandera/git2kube.git",
 			key:    "/tmp/i_am_not_here.key",
 			result: nil,
 		},
 		{
 			name:   "SSH url without private key",
-			git:    "git@github.com:WanderaOrg/git2kube.git",
+			git:    "git@github.com:wandera/git2kube.git",
 			result: nil,
 		},
 	}