Argocd v2.3.1 (#247)

* * updated argocd dependencies to v2.3.1
* upgraded to golang v1.17
* removed packr dependency
* moved to use applicationset argocd addon as dependency

* codegen

* fix apply with namespace

* fix tests

* wip

* fix codegen

.codecov.yml

@@ -1,7 +1,6 @@
 coverage:
   status:
-    patch: off
     project:
       default:
         # allow test coverage to drop by 2%
-        threshold: 2
+        threshold: "2%"

.gitignore

@@ -24,6 +24,7 @@ dist/
 .DS_Store
 .AppleDouble
 .LSOverride
+.dccache
 
 # Icon must end with two \r
 Icon

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.16.3-alpine3.13 as base
+FROM golang:1.17.8-alpine3.15 as base
 
 WORKDIR /go/src/github.com/argoproj-labs/argocd-autopilot
 
@@ -21,7 +21,7 @@ RUN go mod verify
 
 ############################### CLI ###############################
 ### Compile
-FROM golang:1.16.3-alpine3.13 as autopilot-build
+FROM golang:1.17.8-alpine3.15 as autopilot-build
 
 WORKDIR /go/src/github.com/argoproj-labs/argocd-autopilot
 
@@ -38,7 +38,7 @@ ENV GOBIN /go/bin
 RUN make local DEV_MODE=false
 
 ### Run
-FROM alpine:3.13 as autopilot
+FROM alpine:3.15 as autopilot
 
 WORKDIR /go/src/github.com/argoproj-labs/argocd-autopilot
 

cmd/commands/common.go

@@ -15,7 +15,7 @@ import (
 	"github.com/argoproj-labs/argocd-autopilot/pkg/store"
 	"github.com/argoproj-labs/argocd-autopilot/pkg/util"
 
-	appset "github.com/argoproj-labs/applicationset/api/v1alpha1"
+	appset "github.com/argoproj/applicationset/api/v1alpha1"
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/ghodss/yaml"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

cmd/commands/project.go

@@ -19,7 +19,7 @@ import (
 	"github.com/argoproj-labs/argocd-autopilot/pkg/store"
 	"github.com/argoproj-labs/argocd-autopilot/pkg/util"
 
-	appset "github.com/argoproj-labs/applicationset/api/v1alpha1"
+	appset "github.com/argoproj/applicationset/api/v1alpha1"
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/ghodss/yaml"
 	"github.com/go-git/go-billy/v5/memfs"

cmd/commands/project_test.go

@@ -19,7 +19,7 @@ import (
 	"github.com/argoproj-labs/argocd-autopilot/pkg/store"
 	"github.com/argoproj-labs/argocd-autopilot/pkg/util"
 
-	appset "github.com/argoproj-labs/applicationset/api/v1alpha1"
+	appset "github.com/argoproj/applicationset/api/v1alpha1"
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/ghodss/yaml"
 	"github.com/go-git/go-billy/v5/memfs"

cmd/commands/repo.go

@@ -19,7 +19,7 @@ import (
 	"github.com/argoproj-labs/argocd-autopilot/pkg/store"
 	"github.com/argoproj-labs/argocd-autopilot/pkg/util"
 
-	appset "github.com/argoproj-labs/applicationset/api/v1alpha1"
+	appset "github.com/argoproj/applicationset/api/v1alpha1"
 	argocdcommon "github.com/argoproj/argo-cd/v2/common"
 	argocdsettings "github.com/argoproj/argo-cd/v2/util/settings"
 	"github.com/ghodss/yaml"
@@ -234,7 +234,7 @@ func RunRepoBootstrap(ctx context.Context, opts *RepoBootstrapOptions) error {
 	// apply built manifest to k8s cluster
 	log.G(ctx).Infof("using context: \"%s\", namespace: \"%s\"", opts.KubeContextName, opts.Namespace)
 	log.G(ctx).Infof("applying bootstrap manifests to cluster...")
-	if err = opts.KubeFactory.Apply(ctx, opts.Namespace, util.JoinManifests(manifests.namespace, manifests.applyManifests, manifests.repoCreds)); err != nil {
+	if err = opts.KubeFactory.Apply(ctx, util.JoinManifests(manifests.namespace, manifests.applyManifests, manifests.repoCreds)); err != nil {
 		return fmt.Errorf("failed to apply bootstrap manifests to cluster: %w", err)
 	}
 
@@ -266,7 +266,7 @@ func RunRepoBootstrap(ctx context.Context, opts *RepoBootstrapOptions) error {
 
 	// apply "Argo-CD" Application that references "bootstrap/argo-cd"
 	log.G(ctx).Infof("applying argo-cd bootstrap application")
-	if err = opts.KubeFactory.Apply(ctx, opts.Namespace, manifests.bootstrapApp); err != nil {
+	if err = opts.KubeFactory.Apply(ctx, manifests.bootstrapApp); err != nil {
 		return err
 	}
 

cmd/main.go

@@ -12,7 +12,7 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth" // used for authentication with cloud providers
 )
 
-//go:generate sh -c "echo  generating command docs... && cd .. && go run ./hack/cmd-docs/main.go"
+//go:generate sh -c "echo  generating command docs... && cd .. && ARGOCD_CONFIG_DIR=/home/user/.config/argocd go run ./hack/cmd-docs/main.go"
 
 func main() {
 	ctx := context.Background()

docs/commands/argocd-autopilot_project_create.md

@@ -29,13 +29,14 @@ argocd-autopilot project create [PROJECT] [flags]
 ### Options
 
 ```
+      --annotation stringArray             Set metadata annotations (e.g. --annotation key=value)
       --auth-token string                  Authentication token
       --aws-cluster-name string            AWS Cluster name if set then aws cli eks token command will be used to access cluster
       --aws-role-arn string                Optional AWS role arn. If set then AWS IAM Authenticator assumes a role to perform cluster operations instead of the default AWS credential provider chain.
       --client-crt string                  Client certificate file
       --client-crt-key string              Client certificate key file
       --cluster-resources                  Indicates if cluster level resources should be managed. The setting is used only if list of managed namespaces is not empty.
-      --config string                      Path to Argo CD config (default "/home/user/.argocd/config")
+      --config string                      Path to Argo CD config (default "/home/user/.config/argocd/config")
       --core                               If set to true then CLI talks directly to Kubernetes instead of talking to Argo CD API server
       --dest-kube-context string           The default destination kubernetes context for applications in this project
       --dry-run                            If true, print manifests instead of applying them to the cluster (nothing will be commited to git)
@@ -53,10 +54,12 @@ argocd-autopilot project create [PROJECT] [flags]
       --http-retry-max int                 Maximum number of retries to establish http connection to Argo CD server
       --in-cluster                         Indicates Argo CD resides inside this cluster and should connect using the internal k8s hostname (kubernetes.default.svc)
       --insecure                           Skip server certificate and domain verification
+      --label stringArray                  Set metadata labels (e.g. --label key=value)
       --name string                        Overwrite the cluster name
       --plaintext                          Disable TLS
       --port-forward                       Connect to a random argocd-server port using port forwarding
       --port-forward-namespace string      Namespace name which should be used for port forwarding
+      --project string                     project of the cluster
       --repo string                        Repository URL [GIT_REPO]
       --server string                      Argo CD server address
       --server-crt string                  Server certificate file