Skip to content

Commit

Permalink
feat: move engine code to argoproj/gitops-engine repo (argoproj#3599)
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Matyushentsev authored May 15, 2020
1 parent 192ee93 commit fe8d47e
Show file tree
Hide file tree
Showing 238 changed files with 645 additions and 12,671 deletions.
83 changes: 46 additions & 37 deletions Gopkg.lock
View file

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

4 changes: 4 additions & 0 deletions Gopkg.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,7 @@ required = [
[[constraint]]
name = "github.com/bsm/redislock"
version = "0.4.3"

[[constraint]]
name = "github.com/argoproj/gitops-engine"
version = "0.1.0"
4 changes: 2 additions & 2 deletions cmd/argocd-application-controller/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"os"
"time"

"github.com/argoproj/gitops-engine/pkg/utils/errors"
"github.com/argoproj/gitops-engine/pkg/utils/kube"
"github.com/argoproj/pkg/stats"
"github.com/go-redis/redis"
log "github.com/sirupsen/logrus"
Expand All @@ -20,8 +22,6 @@ import (

"github.com/argoproj/argo-cd/common"
"github.com/argoproj/argo-cd/controller"
"github.com/argoproj/argo-cd/engine/pkg/utils/errors"
"github.com/argoproj/argo-cd/engine/pkg/utils/kube"
"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned"
"github.com/argoproj/argo-cd/reposerver/apiclient"
Expand Down
2 changes: 1 addition & 1 deletion cmd/argocd-repo-server/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"os"
"time"

"github.com/argoproj/gitops-engine/pkg/utils/errors"
"github.com/argoproj/pkg/stats"
"github.com/go-redis/redis"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/argoproj/argo-cd/common"
"github.com/argoproj/argo-cd/engine/pkg/utils/errors"
"github.com/argoproj/argo-cd/reposerver"
reposervercache "github.com/argoproj/argo-cd/reposerver/cache"
"github.com/argoproj/argo-cd/reposerver/metrics"
Expand Down
5 changes: 3 additions & 2 deletions cmd/argocd-server/commands/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,23 @@ import (
"context"
"time"

"github.com/argoproj/gitops-engine/pkg/utils/errors"
"github.com/argoproj/pkg/stats"
"github.com/go-redis/redis"
"github.com/spf13/cobra"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"

log "github.com/sirupsen/logrus"

"github.com/argoproj/argo-cd/common"
"github.com/argoproj/argo-cd/engine/pkg/utils/errors"
"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned"
"github.com/argoproj/argo-cd/reposerver/apiclient"
"github.com/argoproj/argo-cd/server"
servercache "github.com/argoproj/argo-cd/server/cache"
"github.com/argoproj/argo-cd/util/cli"
"github.com/argoproj/argo-cd/util/tls"
log "github.com/sirupsen/logrus"
)

// NewCommand returns a new instance of an argocd command
Expand Down
3 changes: 2 additions & 1 deletion cmd/argocd-server/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package main

import (
"github.com/argoproj/gitops-engine/pkg/utils/errors"

commands "github.com/argoproj/argo-cd/cmd/argocd-server/commands"
"github.com/argoproj/argo-cd/engine/pkg/utils/errors"

// load the gcp plugin (required to authenticate against GKE clusters).
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
Expand Down
6 changes: 3 additions & 3 deletions cmd/argocd-util/commands/projects.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import (
"path/filepath"
"strings"

"github.com/argoproj/argo-cd/engine/pkg/utils/diff"
"github.com/argoproj/argo-cd/engine/pkg/utils/errors"
"github.com/argoproj/argo-cd/engine/pkg/utils/kube"
"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned"
appclient "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/typed/application/v1alpha1"
"github.com/argoproj/argo-cd/util/cli"

"github.com/argoproj/gitops-engine/pkg/utils/diff"
"github.com/argoproj/gitops-engine/pkg/utils/errors"
"github.com/argoproj/gitops-engine/pkg/utils/kube"
"github.com/spf13/cobra"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/clientcmd"
Expand Down
9 changes: 4 additions & 5 deletions cmd/argocd-util/commands/settings.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,20 @@ import (
"sort"
"strings"

"k8s.io/client-go/kubernetes/fake"

"github.com/argoproj/gitops-engine/pkg/utils/diff"
"github.com/argoproj/gitops-engine/pkg/utils/errors"
healthutil "github.com/argoproj/gitops-engine/pkg/utils/health"
"github.com/ghodss/yaml"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/tools/clientcmd"

"github.com/argoproj/argo-cd/common"
"github.com/argoproj/argo-cd/engine/pkg/utils/diff"
"github.com/argoproj/argo-cd/engine/pkg/utils/errors"
healthutil "github.com/argoproj/argo-cd/engine/pkg/utils/health"
"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/util/argo/normalizers"
"github.com/argoproj/argo-cd/util/cli"
Expand Down
2 changes: 1 addition & 1 deletion cmd/argocd-util/commands/settings_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"testing"

"github.com/argoproj/argo-cd/common"
utils "github.com/argoproj/argo-cd/engine/pkg/utils/io"
"github.com/argoproj/argo-cd/util/settings"

utils "github.com/argoproj/gitops-engine/pkg/utils/io"
"github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
6 changes: 3 additions & 3 deletions cmd/argocd-util/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
"reflect"
"syscall"

"github.com/argoproj/gitops-engine/pkg/utils/errors"
"github.com/argoproj/gitops-engine/pkg/utils/kube"
"github.com/ghodss/yaml"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand All @@ -26,8 +28,6 @@ import (

"github.com/argoproj/argo-cd/cmd/argocd-util/commands"
"github.com/argoproj/argo-cd/common"
"github.com/argoproj/argo-cd/engine/pkg/utils/errors"
"github.com/argoproj/argo-cd/engine/pkg/utils/kube"
"github.com/argoproj/argo-cd/util/cli"
"github.com/argoproj/argo-cd/util/db"
"github.com/argoproj/argo-cd/util/dex"
Expand Down Expand Up @@ -57,7 +57,7 @@ var (
func NewCommand() *cobra.Command {
var (
logFormat string
logLevel string
logLevel string
)

var command = &cobra.Command{
Expand Down
4 changes: 2 additions & 2 deletions cmd/argocd/commands/account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import (
"text/tabwriter"
"time"

"github.com/argoproj/gitops-engine/pkg/utils/errors"
"github.com/argoproj/gitops-engine/pkg/utils/io"
timeutil "github.com/argoproj/pkg/time"
"github.com/ghodss/yaml"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"golang.org/x/crypto/ssh/terminal"

"github.com/argoproj/argo-cd/engine/pkg/utils/errors"
"github.com/argoproj/argo-cd/engine/pkg/utils/io"
argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
accountpkg "github.com/argoproj/argo-cd/pkg/apiclient/account"
"github.com/argoproj/argo-cd/pkg/apiclient/session"
Expand Down
14 changes: 7 additions & 7 deletions cmd/argocd/commands/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ import (
"text/tabwriter"
"time"

"github.com/argoproj/gitops-engine/pkg/utils/diff"
"github.com/argoproj/gitops-engine/pkg/utils/errors"
"github.com/argoproj/gitops-engine/pkg/utils/health"
argoio "github.com/argoproj/gitops-engine/pkg/utils/io"
"github.com/argoproj/gitops-engine/pkg/utils/kube"
"github.com/argoproj/gitops-engine/pkg/utils/kube/sync/hook"
"github.com/argoproj/gitops-engine/pkg/utils/kube/sync/ignore"
"github.com/ghodss/yaml"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand All @@ -26,13 +33,6 @@ import (

"github.com/argoproj/argo-cd/common"
"github.com/argoproj/argo-cd/controller"
"github.com/argoproj/argo-cd/engine/pkg/utils/diff"
"github.com/argoproj/argo-cd/engine/pkg/utils/errors"
"github.com/argoproj/argo-cd/engine/pkg/utils/health"
argoio "github.com/argoproj/argo-cd/engine/pkg/utils/io"
"github.com/argoproj/argo-cd/engine/pkg/utils/kube"
"github.com/argoproj/argo-cd/engine/pkg/utils/kube/sync/hook"
"github.com/argoproj/argo-cd/engine/pkg/utils/kube/sync/ignore"
"github.com/argoproj/argo-cd/pkg/apiclient"
argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
applicationpkg "github.com/argoproj/argo-cd/pkg/apiclient/application"
Expand Down
4 changes: 2 additions & 2 deletions cmd/argocd/commands/app_actions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"strconv"
"text/tabwriter"

"github.com/argoproj/gitops-engine/pkg/utils/errors"
"github.com/argoproj/gitops-engine/pkg/utils/io"
"github.com/ghodss/yaml"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"

"github.com/argoproj/argo-cd/engine/pkg/utils/errors"
"github.com/argoproj/argo-cd/engine/pkg/utils/io"
argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
applicationpkg "github.com/argoproj/argo-cd/pkg/apiclient/application"
)
Expand Down
Loading

0 comments on commit fe8d47e

Please sign in to comment.