Skip to content
This repository has been archived by the owner on Feb 2, 2021. It is now read-only.

Commit

Permalink
Update references to openfaas-incubator
Browse files Browse the repository at this point in the history 
Move the project into openfaas from openfaas-incubator

Signed-off-by: Alistair Hey <[email protected]>
  • Loading branch information
@Waterdrips @alexellis
Waterdrips authored and alexellis committed Nov 5, 2020
1 parent eca48db commit f07a5f7
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 39 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
20 changes: 10 additions & 10 deletions Dockerfile.redist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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/

Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
10 changes: 5 additions & 5 deletions USER_GUIDE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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`.

Expand Down Expand Up @@ -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
```
Expand Down
10 changes: 5 additions & 5 deletions cmd/apply.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/apply_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/create_github.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/openfaas-incubator/ofc-bootstrap
module github.com/openfaas/ofc-bootstrap

go 1.13

Expand Down
2 changes: 1 addition & 1 deletion hack/integration-test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ingress/ingress.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/stack/stack.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/tls/tls.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f07a5f7

Please sign in to comment.