Update references to openfaas-incubator

Waterdrips · alexellis · commit f07a5f74d15b · 2020-11-05T07:45:51.000Z
Move the project into openfaas from openfaas-incubator

Signed-off-by: Alistair Hey &lt;alistair@heyal.co.uk&gt;
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ ENV CGO_ENABLED=0
 
 COPY --from=license-check /license-check /usr/bin/
 
-WORKDIR /go/src/github.com/openfaas-incubator/ofc-bootstrap
+WORKDIR /go/src/github.com/openfaas/ofc-bootstrap
 COPY . .
 
 RUN go mod download
@@ -21,8 +21,8 @@ RUN go test $(go list ./... | grep -v /vendor/ | grep -v /template/|grep -v /bui
 RUN VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
     && GIT_COMMIT=$(git rev-list -1 HEAD) \
     && CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \
-    -X github.com/openfaas-incubator/ofc-bootstrap/version.GitCommit=${GIT_COMMIT} \
-    -X github.com/openfaas-incubator/ofc-bootstrap/version.Version=${VERSION}" \
+    -X github.com/openfaas/ofc-bootstrap/version.GitCommit=${GIT_COMMIT} \
+    -X github.com/openfaas/ofc-bootstrap/version.Version=${VERSION}" \
     -a -installsuffix cgo -o ofc-bootstrap
 
 # Release stage
@@ -36,7 +36,7 @@ RUN addgroup -S app \
 
 WORKDIR /home/app
 
-COPY --from=builder /go/src/github.com/openfaas-incubator/ofc-bootstrap/ofc-bootstrap               /usr/bin/
+COPY --from=builder /go/src/github.com/openfaas/ofc-bootstrap/ofc-bootstrap               /usr/bin/
 RUN chown -R app:app ./
 
 USER app
diff --git a/Dockerfile.redist b/Dockerfile.redist
@@ -8,7 +8,7 @@ ENV CGO_ENABLED=0
 
 COPY --from=license-check /license-check /usr/bin/
 
-WORKDIR /go/src/github.com/openfaas-incubator/ofc-bootstrap
+WORKDIR /go/src/github.com/openfaas/ofc-bootstrap
 COPY . .
 
 RUN go mod download
@@ -21,16 +21,16 @@ RUN go test $(go list ./... | grep -v /vendor/ | grep -v /template/|grep -v /bui
 RUN VERSION=$(git describe --all --exact-match `git rev-parse HEAD` | grep tags | sed 's/tags\///') \
   && GIT_COMMIT=$(git rev-list -1 HEAD) \
   && CGO_ENABLED=0 GOOS=linux go build --ldflags "-s -w \
-    -X github.com/openfaas-incubator/ofc-bootstrap/version.GitCommit=${GIT_COMMIT} \
-    -X github.com/openfaas-incubator/ofc-bootstrap/version.Version=${VERSION}" \
+    -X github.com/openfaas/ofc-bootstrap/version.GitCommit=${GIT_COMMIT} \
+    -X github.com/openfaas/ofc-bootstrap/version.Version=${VERSION}" \
     -a -installsuffix cgo -o ofc-bootstrap \
   && CGO_ENABLED=0 GOOS=darwin go build --ldflags "-s -w \
-       -X github.com/openfaas-incubator/ofc-bootstrap/version.GitCommit=${GIT_COMMIT} \
-       -X github.com/openfaas-incubator/ofc-bootstrap/version.Version=${VERSION}" \
+       -X github.com/openfaas/ofc-bootstrap/version.GitCommit=${GIT_COMMIT} \
+       -X github.com/openfaas/ofc-bootstrap/version.Version=${VERSION}" \
        -a -installsuffix cgo -o ofc-bootstrap-darwin \
   && CGO_ENABLED=0 GOOS=windows go build --ldflags "-s -w \
-       -X github.com/openfaas-incubator/ofc-bootstrap/version.GitCommit=${GIT_COMMIT} \
-       -X github.com/openfaas-incubator/ofc-bootstrap/version.Version=${VERSION}" \
+       -X github.com/openfaas/ofc-bootstrap/version.GitCommit=${GIT_COMMIT} \
+       -X github.com/openfaas/ofc-bootstrap/version.Version=${VERSION}" \
        -a -installsuffix cgo -o ofc-bootstrap.exe
 
 # Release stage
@@ -47,9 +47,9 @@ WORKDIR /home/app
 
 USER app
 
-COPY --from=builder /go/src/github.com/openfaas-incubator/ofc-bootstrap/ofc-bootstrap                /usr/bin/
-COPY --from=builder /go/src/github.com/openfaas-incubator/ofc-bootstrap/ofc-bootstrap-darwin         /usr/bin/
-COPY --from=builder /go/src/github.com/openfaas-incubator/ofc-bootstrap/ofc-bootstrap.exe            /usr/bin/
+COPY --from=builder /go/src/github.com/openfaas/ofc-bootstrap/ofc-bootstrap                /usr/bin/
+COPY --from=builder /go/src/github.com/openfaas/ofc-bootstrap/ofc-bootstrap-darwin         /usr/bin/
+COPY --from=builder /go/src/github.com/openfaas/ofc-bootstrap/ofc-bootstrap.exe            /usr/bin/
 
 ENV PATH=$PATH:/usr/bin/
 
diff --git a/Makefile b/Makefile
@@ -17,8 +17,8 @@ ci:
 static:
 	go test $(shell go list ./... | grep -v /vendor/ | grep -v /template/|grep -v /build/) -cover \
     && CGO_ENABLED=0 go build --ldflags "-s -w \
-    -X github.com/openfaas-incubator/ofc-bootstrap/version.GitCommit=${GIT_COMMIT} \
-    -X github.com/openfaas-incubator/ofc-bootstrap/version.Version=${VERSION}" \
+    -X github.com/openfaas/ofc-bootstrap/version.GitCommit=${GIT_COMMIT} \
+    -X github.com/openfaas/ofc-bootstrap/version.Version=${VERSION}" \
     -a -installsuffix cgo -o ofc-bootstrap
 
 dist:
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 How? By automating the whole installation of OpenFaaS Cloud on Kubernetes into a single command and CLI.
 
-[![Build Status](https://travis-ci.com/openfaas-incubator/ofc-bootstrap.svg?branch=master)](https://travis-ci.com/openfaas-incubator/ofc-bootstrap)
+[![Build Status](https://travis-ci.com/openfaas/ofc-bootstrap.svg?branch=master)](https://travis-ci.com/openfaas/ofc-bootstrap)
 
 ### What is this and who is it for?
 
diff --git a/USER_GUIDE.md b/USER_GUIDE.md
@@ -124,7 +124,7 @@ Now clone the GitHub repository, download the binary release and start customisi
 ```bash
 mkdir -p $GOPATH/src/github.com/openfaas-incubator
 cd $GOPATH/src/github.com/openfaas-incubator/
-git clone https://github.com/openfaas-incubator/ofc-bootstrap
+git clone https://github.com/openfaas/ofc-bootstrap
 ```
 
 * Download the latest `ofc-bootstrap` binary release from GitHub
@@ -133,17 +133,17 @@ Either run the following script, or follow the manual steps below.
 
 ```sh
 # Download and move to /usr/local/bin
-curl -sLSf https://raw.githubusercontent.com/openfaas-incubator/ofc-bootstrap/master/get.sh | \
+curl -sLSf https://raw.githubusercontent.com/openfaas/ofc-bootstrap/master/get.sh | \
  sudo sh
 
 # Or, download and move manually
-curl -sLSf https://raw.githubusercontent.com/openfaas-incubator/ofc-bootstrap/master/get.sh | \
+curl -sLSf https://raw.githubusercontent.com/openfaas/ofc-bootstrap/master/get.sh | \
  sh
 ```
 
 Manual steps:
 
-Download [ofc-boostrap](https://github.com/openfaas-incubator/ofc-bootstrap/releases) from the GitHub releases page and move it to `/usr/local/bin/`.
+Download [ofc-boostrap](https://github.com/openfaas/ofc-bootstrap/releases) from the GitHub releases page and move it to `/usr/local/bin/`.
 
 You may also need to run `chmod +x /usr/local/bin/ofc-bootstrap`.
 
@@ -405,7 +405,7 @@ The default behaviour is to enable policies. If you would like to remove the res
 If you are now ready, you can run the `ofc-bootstrap` tool:
 
 ```bash
-cd $GOPATH/src/github.com/openfaas-incubator/ofc-bootstrap
+cd $GOPATH/src/github.com/openfaas/ofc-bootstrap
 
 ofc-bootstrap apply --file init.yaml
 ```
diff --git a/cmd/apply.go b/cmd/apply.go
@@ -18,12 +18,12 @@ import (
 	execute "github.com/alexellis/go-execute/pkg/v1"
 	"github.com/alexellis/k3sup/pkg/config"
 	"github.com/alexellis/k3sup/pkg/env"
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/ingress"
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/stack"
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/tls"
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/validators"
+	"github.com/openfaas/ofc-bootstrap/pkg/ingress"
+	"github.com/openfaas/ofc-bootstrap/pkg/stack"
+	"github.com/openfaas/ofc-bootstrap/pkg/tls"
+	"github.com/openfaas/ofc-bootstrap/pkg/validators"
 
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/types"
+	"github.com/openfaas/ofc-bootstrap/pkg/types"
 	yaml "gopkg.in/yaml.v2"
 )
 
diff --git a/cmd/apply_test.go b/cmd/apply_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/types"
+	"github.com/openfaas/ofc-bootstrap/pkg/types"
 )
 
 func Test_filterDNSFeature(t *testing.T) {
diff --git a/cmd/create_github.go b/cmd/create_github.go
@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"github.com/inlets/inletsctl/pkg/names"
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/github"
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/types"
+	"github.com/openfaas/ofc-bootstrap/pkg/github"
+	"github.com/openfaas/ofc-bootstrap/pkg/types"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	yaml "gopkg.in/yaml.v2"
diff --git a/cmd/root.go b/cmd/root.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/morikuni/aec"
-	"github.com/openfaas-incubator/ofc-bootstrap/version"
+	"github.com/openfaas/ofc-bootstrap/version"
 	"github.com/spf13/cobra"
 )
 
@@ -20,7 +20,7 @@ var (
 )
 
 // WelcomeMessage to introduce ofc-bootstrap
-const WelcomeMessage = "Welcome to ofc-bootstrap! Find out more at https://github.com/openfaas-incubator/ofc-bootstrap"
+const WelcomeMessage = "Welcome to ofc-bootstrap! Find out more at https://github.com/openfaas/ofc-bootstrap"
 
 func init() {
 	rootCommand.AddCommand(versionCmd)
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/openfaas-incubator/ofc-bootstrap
+module github.com/openfaas/ofc-bootstrap
 
 go 1.13
 
diff --git a/hack/integration-test.sh b/hack/integration-test.sh
@@ -4,7 +4,7 @@ set -e
 
 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
 
-cd $GOPATH/src/github.com/openfaas-incubator/ofc-bootstrap
+cd $GOPATH/src/github.com/openfaas/ofc-bootstrap
 
 # Fake the secrets from init.yaml
 mkdir -p ~/Downloads
diff --git a/main.go b/main.go
@@ -3,9 +3,9 @@ package main
 import (
 	"os"
 
-	"github.com/openfaas-incubator/ofc-bootstrap/cmd"
+	"github.com/openfaas/ofc-bootstrap/cmd"
 
-	"github.com/openfaas-incubator/ofc-bootstrap/version"
+	"github.com/openfaas/ofc-bootstrap/version"
 )
 
 func main() {
diff --git a/pkg/ingress/ingress.go b/pkg/ingress/ingress.go
@@ -9,7 +9,7 @@ import (
 	"os"
 
 	execute "github.com/alexellis/go-execute/pkg/v1"
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/types"
+	"github.com/openfaas/ofc-bootstrap/pkg/types"
 )
 
 type IngressTemplate struct {
diff --git a/pkg/stack/stack.go b/pkg/stack/stack.go
@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/types"
+	"github.com/openfaas/ofc-bootstrap/pkg/types"
 )
 
 type gitlabConfig struct {
diff --git a/pkg/tls/tls.go b/pkg/tls/tls.go
@@ -7,7 +7,7 @@ import (
 	"os"
 
 	execute "github.com/alexellis/go-execute/pkg/v1"
-	"github.com/openfaas-incubator/ofc-bootstrap/pkg/types"
+	"github.com/openfaas/ofc-bootstrap/pkg/types"
 )
 
 // TLSTemplate TLS configuration

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"strings"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- "github.com/openfaas-incubator/ofc-bootstrap/pkg/types"`
	`8`	`+ "github.com/openfaas/ofc-bootstrap/pkg/types"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func Test_filterDNSFeature(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"fmt"`
`8`	`8`
`9`	`9`	`"github.com/morikuni/aec"`
`10`		`- "github.com/openfaas-incubator/ofc-bootstrap/version"`
	`10`	`+ "github.com/openfaas/ofc-bootstrap/version"`
`11`	`11`	`"github.com/spf13/cobra"`
`12`	`12`	`)`
`13`	`13`
`@@ -20,7 +20,7 @@ var (`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`// WelcomeMessage to introduce ofc-bootstrap`
`23`		`-const WelcomeMessage = "Welcome to ofc-bootstrap! Find out more at https://github.com/openfaas-incubator/ofc-bootstrap"`
	`23`	`+const WelcomeMessage = "Welcome to ofc-bootstrap! Find out more at https://github.com/openfaas/ofc-bootstrap"`
`24`	`24`
`25`	`25`	`func init() {`
`26`	`26`	`rootCommand.AddCommand(versionCmd)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/openfaas-incubator/ofc-bootstrap`
	`1`	`+module github.com/openfaas/ofc-bootstrap`
`2`	`2`
`3`	`3`	`go 1.13`
`4`	`4`