Skip to content

Commit

Permalink
renamed argoproj/argocd-autopilot to argoproj-labs/argocd-autopilot
Browse files Browse the repository at this point in the history
  • Loading branch information
@ATGardner
ATGardner committed May 27, 2021
1 parent 6d24734 commit 0bacf4a
Show file tree
Hide file tree
Showing 30 changed files with 106 additions and 100 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM golang:1.16.3-alpine3.13 as base

WORKDIR /go/src/github.com/argoproj/argocd-autopilot
WORKDIR /go/src/github.com/argoproj-labs/argocd-autopilot

RUN apk -U add --no-cache git ca-certificates && update-ca-certificates

Expand All @@ -23,7 +23,7 @@ RUN go mod verify
### Compile
FROM golang:1.16.3-alpine3.13 as autopilot-build

WORKDIR /go/src/github.com/argoproj/argocd-autopilot
WORKDIR /go/src/github.com/argoproj-labs/argocd-autopilot

RUN apk -U add --no-cache git make

Expand All @@ -40,15 +40,15 @@ RUN make local DEV_MODE=false
### Run
FROM alpine:3.13 as autopilot

WORKDIR /go/src/github.com/argoproj/argocd-autopilot
WORKDIR /go/src/github.com/argoproj-labs/argocd-autopilot

RUN apk -U add --no-cache git

# copy ca-certs and user details
COPY --from=base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=base /etc/passwd /etc/passwd
COPY --from=base /etc/group /etc/group
COPY --chown=autopilot:autopilot --from=autopilot-build /go/src/github.com/argoproj/argocd-autopilot/dist/* /usr/local/bin/argocd-autopilot
COPY --chown=autopilot:autopilot --from=autopilot-build /go/src/github.com/argoproj-labs/argocd-autopilot/dist/* /usr/local/bin/argocd-autopilot

USER autopilot:autopilot

Expand Down
12 changes: 6 additions & 6 deletions cmd/commands/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"os"
"text/tabwriter"

"github.com/argoproj/argocd-autopilot/pkg/application"
"github.com/argoproj/argocd-autopilot/pkg/fs"
"github.com/argoproj/argocd-autopilot/pkg/git"
"github.com/argoproj/argocd-autopilot/pkg/log"
"github.com/argoproj/argocd-autopilot/pkg/store"
"github.com/argoproj/argocd-autopilot/pkg/util"
"github.com/argoproj-labs/argocd-autopilot/pkg/application"
"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
"github.com/argoproj-labs/argocd-autopilot/pkg/git"
"github.com/argoproj-labs/argocd-autopilot/pkg/log"
"github.com/argoproj-labs/argocd-autopilot/pkg/store"
"github.com/argoproj-labs/argocd-autopilot/pkg/util"

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/go-git/go-billy/v5/memfs"
Expand Down
13 changes: 7 additions & 6 deletions cmd/commands/app_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ import (
"strings"
"testing"

"github.com/argoproj-labs/argocd-autopilot/pkg/application"
"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
fsmocks "github.com/argoproj-labs/argocd-autopilot/pkg/fs/mocks"
"github.com/argoproj-labs/argocd-autopilot/pkg/git"
gitmocks "github.com/argoproj-labs/argocd-autopilot/pkg/git/mocks"
"github.com/argoproj-labs/argocd-autopilot/pkg/store"

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argocd-autopilot/pkg/application"
"github.com/argoproj/argocd-autopilot/pkg/fs"
fsmocks "github.com/argoproj/argocd-autopilot/pkg/fs/mocks"
"github.com/argoproj/argocd-autopilot/pkg/git"
gitmocks "github.com/argoproj/argocd-autopilot/pkg/git/mocks"
"github.com/argoproj/argocd-autopilot/pkg/store"
"github.com/go-git/go-billy/v5/memfs"
billyUtils "github.com/go-git/go-billy/v5/util"
"github.com/stretchr/testify/assert"
Expand Down
10 changes: 5 additions & 5 deletions cmd/commands/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"os"

"github.com/argoproj/argocd-autopilot/pkg/fs"
"github.com/argoproj/argocd-autopilot/pkg/git"
"github.com/argoproj/argocd-autopilot/pkg/log"
"github.com/argoproj/argocd-autopilot/pkg/store"
"github.com/argoproj/argocd-autopilot/pkg/util"
"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
"github.com/argoproj-labs/argocd-autopilot/pkg/git"
"github.com/argoproj-labs/argocd-autopilot/pkg/log"
"github.com/argoproj-labs/argocd-autopilot/pkg/store"
"github.com/argoproj-labs/argocd-autopilot/pkg/util"

"github.com/go-git/go-billy/v5/memfs"
"github.com/spf13/cobra"
Expand Down
8 changes: 4 additions & 4 deletions cmd/commands/common_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"reflect"
"testing"

"github.com/argoproj/argocd-autopilot/pkg/fs"
fsmocks "github.com/argoproj/argocd-autopilot/pkg/fs/mocks"
"github.com/argoproj/argocd-autopilot/pkg/git"
gitmocks "github.com/argoproj/argocd-autopilot/pkg/git/mocks"
"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
fsmocks "github.com/argoproj-labs/argocd-autopilot/pkg/fs/mocks"
"github.com/argoproj-labs/argocd-autopilot/pkg/git"
gitmocks "github.com/argoproj-labs/argocd-autopilot/pkg/git/mocks"

"github.com/stretchr/testify/assert"
)
Expand Down
14 changes: 7 additions & 7 deletions cmd/commands/project.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (
"path/filepath"
"text/tabwriter"

"github.com/argoproj/argocd-autopilot/pkg/application"
"github.com/argoproj/argocd-autopilot/pkg/argocd"
"github.com/argoproj/argocd-autopilot/pkg/fs"
"github.com/argoproj/argocd-autopilot/pkg/git"
"github.com/argoproj/argocd-autopilot/pkg/log"
"github.com/argoproj/argocd-autopilot/pkg/store"
"github.com/argoproj/argocd-autopilot/pkg/util"
"github.com/argoproj-labs/argocd-autopilot/pkg/application"
"github.com/argoproj-labs/argocd-autopilot/pkg/argocd"
"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
"github.com/argoproj-labs/argocd-autopilot/pkg/git"
"github.com/argoproj-labs/argocd-autopilot/pkg/log"
"github.com/argoproj-labs/argocd-autopilot/pkg/store"
"github.com/argoproj-labs/argocd-autopilot/pkg/util"

appset "github.com/argoproj-labs/applicationset/api/v1alpha1"
appsetv1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
Expand Down
14 changes: 7 additions & 7 deletions cmd/commands/project_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import (
"strings"
"testing"

"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
fsmocks "github.com/argoproj-labs/argocd-autopilot/pkg/fs/mocks"
"github.com/argoproj-labs/argocd-autopilot/pkg/git"
gitmocks "github.com/argoproj-labs/argocd-autopilot/pkg/git/mocks"
"github.com/argoproj-labs/argocd-autopilot/pkg/store"
"github.com/argoproj-labs/argocd-autopilot/pkg/util"

appset "github.com/argoproj-labs/applicationset/api/v1alpha1"
argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argocd-autopilot/pkg/fs"
fsmocks "github.com/argoproj/argocd-autopilot/pkg/fs/mocks"
"github.com/argoproj/argocd-autopilot/pkg/git"
gitmocks "github.com/argoproj/argocd-autopilot/pkg/git/mocks"
"github.com/argoproj/argocd-autopilot/pkg/store"
"github.com/argoproj/argocd-autopilot/pkg/util"

"github.com/go-git/go-billy/v5/memfs"
billyUtils "github.com/go-git/go-billy/v5/util"
"github.com/stretchr/testify/assert"
Expand Down
16 changes: 8 additions & 8 deletions cmd/commands/repo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
"strings"
"time"

"github.com/argoproj/argocd-autopilot/pkg/application"
"github.com/argoproj/argocd-autopilot/pkg/argocd"
"github.com/argoproj/argocd-autopilot/pkg/fs"
"github.com/argoproj/argocd-autopilot/pkg/git"
"github.com/argoproj/argocd-autopilot/pkg/kube"
"github.com/argoproj/argocd-autopilot/pkg/log"
"github.com/argoproj/argocd-autopilot/pkg/store"
"github.com/argoproj/argocd-autopilot/pkg/util"
"github.com/argoproj-labs/argocd-autopilot/pkg/application"
"github.com/argoproj-labs/argocd-autopilot/pkg/argocd"
"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
"github.com/argoproj-labs/argocd-autopilot/pkg/git"
"github.com/argoproj-labs/argocd-autopilot/pkg/kube"
"github.com/argoproj-labs/argocd-autopilot/pkg/log"
"github.com/argoproj-labs/argocd-autopilot/pkg/store"
"github.com/argoproj-labs/argocd-autopilot/pkg/util"

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argocdsettings "github.com/argoproj/argo-cd/v2/util/settings"
Expand Down
12 changes: 6 additions & 6 deletions cmd/commands/repo_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"path/filepath"
"testing"

"github.com/argoproj/argocd-autopilot/pkg/argocd"
"github.com/argoproj/argocd-autopilot/pkg/fs"
"github.com/argoproj/argocd-autopilot/pkg/git"
gitmocks "github.com/argoproj/argocd-autopilot/pkg/git/mocks"
kubemocks "github.com/argoproj/argocd-autopilot/pkg/kube/mocks"
"github.com/argoproj/argocd-autopilot/pkg/store"
"github.com/argoproj-labs/argocd-autopilot/pkg/argocd"
"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
"github.com/argoproj-labs/argocd-autopilot/pkg/git"
gitmocks "github.com/argoproj-labs/argocd-autopilot/pkg/git/mocks"
kubemocks "github.com/argoproj-labs/argocd-autopilot/pkg/kube/mocks"
"github.com/argoproj-labs/argocd-autopilot/pkg/store"

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/ghodss/yaml"
Expand Down
5 changes: 3 additions & 2 deletions cmd/commands/root.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package commands

import (
"github.com/argoproj/argocd-autopilot/pkg/store"
"github.com/argoproj/argocd-autopilot/pkg/util"
"github.com/argoproj-labs/argocd-autopilot/pkg/store"
"github.com/argoproj-labs/argocd-autopilot/pkg/util"

"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion cmd/commands/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/spf13/cobra"

"github.com/argoproj/argocd-autopilot/pkg/store"
"github.com/argoproj-labs/argocd-autopilot/pkg/store"
)

func NewVersionCommand() *cobra.Command {
Expand Down
7 changes: 4 additions & 3 deletions cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"context"
"syscall"

"github.com/argoproj/argocd-autopilot/cmd/commands"
"github.com/argoproj/argocd-autopilot/pkg/log"
"github.com/argoproj/argocd-autopilot/pkg/util"
"github.com/argoproj-labs/argocd-autopilot/cmd/commands"
"github.com/argoproj-labs/argocd-autopilot/pkg/log"
"github.com/argoproj-labs/argocd-autopilot/pkg/util"

"github.com/sirupsen/logrus"
_ "k8s.io/client-go/plugin/pkg/client/auth" // used for authentication with cloud providers
)
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/argoproj/argocd-autopilot
module github.com/argoproj-labs/argocd-autopilot

go 1.16

Expand Down
12 changes: 6 additions & 6 deletions hack/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ fi

${PACKR_CMD} build -ldflags=" \
-extldflags '-static' \
-X 'github.com/argoproj/argocd-autopilot/pkg/store.binaryName=${BINARY_NAME}' \
-X 'github.com/argoproj/argocd-autopilot/pkg/store.version=${VERSION}' \
-X 'github.com/argoproj/argocd-autopilot/pkg/store.buildDate=${BUILD_DATE}' \
-X 'github.com/argoproj/argocd-autopilot/pkg/store.gitCommit=${GIT_COMMIT}' \
-X 'github.com/argoproj/argocd-autopilot/pkg/store.installationManifestsURL=${INSTALLATION_MANIFESTS_URL}' \
-X 'github.com/argoproj/argocd-autopilot/pkg/store.installationManifestsNamespacedURL=${INSTALLATION_MANIFESTS_NAMESPACED_URL}'" \
-X 'github.com/argoproj-labs/argocd-autopilot/pkg/store.binaryName=${BINARY_NAME}' \
-X 'github.com/argoproj-labs/argocd-autopilot/pkg/store.version=${VERSION}' \
-X 'github.com/argoproj-labs/argocd-autopilot/pkg/store.buildDate=${BUILD_DATE}' \
-X 'github.com/argoproj-labs/argocd-autopilot/pkg/store.gitCommit=${GIT_COMMIT}' \
-X 'github.com/argoproj-labs/argocd-autopilot/pkg/store.installationManifestsURL=${INSTALLATION_MANIFESTS_URL}' \
-X 'github.com/argoproj-labs/argocd-autopilot/pkg/store.installationManifestsNamespacedURL=${INSTALLATION_MANIFESTS_NAMESPACED_URL}'" \
-v -o ${OUT_FILE} ${MAIN}
2 changes: 1 addition & 1 deletion hack/cmd-docs/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/spf13/cobra/doc"

"github.com/argoproj/argocd-autopilot/cmd/commands"
"github.com/argoproj-labs/argocd-autopilot/cmd/commands"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions pkg/application/application.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"path/filepath"
"reflect"

"github.com/argoproj/argocd-autopilot/pkg/fs"
"github.com/argoproj/argocd-autopilot/pkg/kube"
"github.com/argoproj/argocd-autopilot/pkg/log"
"github.com/argoproj/argocd-autopilot/pkg/store"
"github.com/argoproj/argocd-autopilot/pkg/util"
"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
"github.com/argoproj-labs/argocd-autopilot/pkg/kube"
"github.com/argoproj-labs/argocd-autopilot/pkg/log"
"github.com/argoproj-labs/argocd-autopilot/pkg/store"
"github.com/argoproj-labs/argocd-autopilot/pkg/util"

"github.com/ghodss/yaml"
billyUtils "github.com/go-git/go-billy/v5/util"
Expand Down
9 changes: 5 additions & 4 deletions pkg/application/application_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import (
"reflect"
"testing"

"github.com/argoproj/argocd-autopilot/pkg/fs"
fsmocks "github.com/argoproj/argocd-autopilot/pkg/fs/mocks"
"github.com/argoproj/argocd-autopilot/pkg/kube"
"github.com/argoproj/argocd-autopilot/pkg/store"
"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
fsmocks "github.com/argoproj-labs/argocd-autopilot/pkg/fs/mocks"
"github.com/argoproj-labs/argocd-autopilot/pkg/kube"
"github.com/argoproj-labs/argocd-autopilot/pkg/store"

"github.com/go-git/go-billy/v5/memfs"
billyUtils "github.com/go-git/go-billy/v5/util"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion pkg/application/mocks/application.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/argocd/argocd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package argocd
import (
"context"

"github.com/argoproj/argocd-autopilot/pkg/util"
"github.com/argoproj-labs/argocd-autopilot/pkg/util"

// used to solve this issue: https://github.com/argoproj/argo-cd/issues/2907
_ "github.com/argoproj/argocd-autopilot/util/assets"
_ "github.com/argoproj-labs/argocd-autopilot/util/assets"

"github.com/argoproj/argo-cd/v2/cmd/argocd/commands"
"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion pkg/fs/fs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io/ioutil"
"os"

"github.com/argoproj/argocd-autopilot/pkg/util"
"github.com/argoproj-labs/argocd-autopilot/pkg/util"

"github.com/ghodss/yaml"
"github.com/go-git/go-billy/v5"
Expand Down
4 changes: 2 additions & 2 deletions pkg/fs/fs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"reflect"
"testing"

"github.com/argoproj/argocd-autopilot/pkg/fs/mocks"
"github.com/argoproj/argocd-autopilot/pkg/util"
"github.com/argoproj-labs/argocd-autopilot/pkg/fs/mocks"
"github.com/argoproj-labs/argocd-autopilot/pkg/util"

"github.com/ghodss/yaml"
"github.com/go-git/go-billy/v5"
Expand Down
2 changes: 1 addition & 1 deletion pkg/git/mocks/provider.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/git/mocks/repository.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pkg/git/provider_github.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import (
"fmt"
"net/http"

g "github.com/argoproj/argocd-autopilot/pkg/git/github"
g "github.com/argoproj-labs/argocd-autopilot/pkg/git/github"

gh "github.com/google/go-github/v34/github"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/git/provider_github_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"testing"

"github.com/argoproj/argocd-autopilot/pkg/git/github/mocks"
"github.com/argoproj-labs/argocd-autopilot/pkg/git/github/mocks"
gh "github.com/google/go-github/v34/github"
"github.com/stretchr/testify/assert"
)
Expand Down
6 changes: 3 additions & 3 deletions pkg/git/repository.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"errors"
"os"

"github.com/argoproj/argocd-autopilot/pkg/fs"
"github.com/argoproj/argocd-autopilot/pkg/git/gogit"
"github.com/argoproj/argocd-autopilot/pkg/log"
"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
"github.com/argoproj-labs/argocd-autopilot/pkg/git/gogit"
"github.com/argoproj-labs/argocd-autopilot/pkg/log"

billy "github.com/go-git/go-billy/v5"
gg "github.com/go-git/go-git/v5"
Expand Down
6 changes: 3 additions & 3 deletions pkg/git/repository_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"reflect"
"testing"

"github.com/argoproj/argocd-autopilot/pkg/fs"
"github.com/argoproj/argocd-autopilot/pkg/git/gogit"
"github.com/argoproj/argocd-autopilot/pkg/git/gogit/mocks"
"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
"github.com/argoproj-labs/argocd-autopilot/pkg/git/gogit"
"github.com/argoproj-labs/argocd-autopilot/pkg/git/gogit/mocks"

billy "github.com/go-git/go-billy/v5"
"github.com/go-git/go-billy/v5/memfs"
Expand Down
Loading

0 comments on commit 0bacf4a

Please sign in to comment.