bump argocd-autopilot v0.3.0 (#332)

* bump argocd-autopilot v0.3.0

Author: roi-codefresh

.gitignore

@@ -5,6 +5,7 @@
 *.so
 *.dylib
 coverage.txt
+.dccache
 
 # Test binary, built with `go test -c`
 *.test

.golangci.yaml

@@ -3,6 +3,10 @@
 
 # options for analysis running
 run:
+  # https://github.com/golangci/golangci-lint/issues/2649
+  # enable go 1.17 linting, will not allow generics
+  go: "1.17"
+
   # default concurrency is a available CPU number
   concurrency: 4
 
@@ -30,4 +34,4 @@ linters-settings:
 
   gocyclo:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)
-    min-complexity: 18
+    min-complexity: 18

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.16.3-alpine3.13 as base
+FROM golang:1.18.0-alpine3.15 as base
 
 WORKDIR /go/src/github.com/codefresh-io/cli-v2
 
@@ -26,7 +26,7 @@ RUN go mod verify
 
 ############################### CLI ###############################
 ### Compile
-FROM golang:1.16.3-alpine3.13 as codefresh-build
+FROM golang:1.18.0-alpine3.15 as codefresh-build
 
 WORKDIR /go/src/github.com/codefresh-io/cli-v2
 
@@ -44,7 +44,7 @@ ARG SEGMENT_WRITE_KEY
 RUN make local DEV_MODE=false SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}
 
 ### Run
-FROM alpine:3.13 as codefresh
+FROM alpine:3.15 as codefresh
 
 WORKDIR /go/src/github.com/codefresh-io/cli-v2
 

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.296
+VERSION=v0.0.297
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
@@ -173,7 +173,7 @@ $(GOBIN)/mockery:
 $(GOBIN)/golangci-lint:
 	@mkdir dist || true
 	@echo installing: golangci-lint
-	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v1.36.0
+	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v1.45.2
 
 .PHONY: flatten-manifests-base-paths
 flatten-manifests-base-paths:

build/Dockerfile.helper

@@ -1,4 +1,4 @@
-FROM golang:1.17.8-alpine3.15
+FROM golang:1.18.0-alpine3.15
 
 RUN apk -U add --no-cache \
   bash \
@@ -19,7 +19,9 @@ RUN curl -L https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_
   && rm gh.tar.gz \
   && rm -rf gh_${GH_VERSION}_linux_amd64
 
-RUN curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash \
-  && mv /go/kustomize /usr/bin
+RUN curl -Ls https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.5.3/kustomize_v4.5.3_linux_amd64.tar.gz --output kustomize.tar.gz  \
+  && tar -xzf kustomize.tar.gz \
+  && mv ./kustomize /usr/bin \
+  && rm kustomize.tar.gz
 
 ENTRYPOINT [ "/bin/bash" ]

cmd/commands/cluster.go

@@ -138,7 +138,7 @@ func runClusterAdd(ctx context.Context, opts *ClusterAddOptions) error {
 		return nil
 	}
 
-	return opts.kubeFactory.Apply(ctx, "", manifests)
+	return opts.kubeFactory.Apply(ctx, manifests)
 }
 
 func createAddClusterKustomization(ingressUrl, contextName, server, csdpToken, version string) *kusttypes.Kustomization {

cmd/commands/git-source.go

@@ -414,11 +414,6 @@ func createCronExampleTrigger() (*sensorsv1alpha1.Trigger, error) {
 		Template: &sensorsv1alpha1.TriggerTemplate{
 			Name: store.Get().CronExampleTriggerTemplateName,
 			ArgoWorkflow: &sensorsv1alpha1.ArgoWorkflowTrigger{
-				GroupVersionResource: metav1.GroupVersionResource{
-					Group:    "argoproj.io",
-					Version:  "v1alpha1",
-					Resource: store.Get().WorkflowResourceName,
-				},
 				Operation: sensorsv1alpha1.Submit,
 				Source: &sensorsv1alpha1.ArtifactLocation{
 					Resource: &workflowResource,
@@ -661,9 +656,9 @@ func RunGitSourceEdit(ctx context.Context, opts *GitSourceEditOptions) error {
 		return fmt.Errorf("failed to read the %s of git-source: %s. Err: %w", fileName, opts.GsName, err)
 	}
 
-	c.SrcPath = opts.GsCloneOpts.Path()
-	c.SrcRepoURL = opts.GsCloneOpts.URL()
-	c.SrcTargetRevision = opts.GsCloneOpts.Revision()
+	c.Config.SrcPath = opts.GsCloneOpts.Path()
+	c.Config.SrcRepoURL = opts.GsCloneOpts.URL()
+	c.Config.SrcTargetRevision = opts.GsCloneOpts.Revision()
 
 	err = fs.WriteJson(fileName, c)
 	if err != nil {
@@ -687,28 +682,26 @@ func createDemoWorkflowTemplate(gsFs fs.FS) error {
 		ObjectMeta: metav1.ObjectMeta{
 			Name: store.Get().CronExampleTriggerTemplateName,
 		},
-		Spec: wfv1alpha1.WorkflowTemplateSpec{
-			WorkflowSpec: wfv1alpha1.WorkflowSpec{
-				Arguments: wfv1alpha1.Arguments{
-					Parameters: []wfv1alpha1.Parameter{{Name: "message"}},
-				},
-				Entrypoint:         "whalesay",
-				ServiceAccountName: store.Get().CodefreshSA,
-				PodGC: &wfv1alpha1.PodGC{
-					Strategy: wfv1alpha1.PodGCOnWorkflowCompletion,
-				},
-				Templates: []wfv1alpha1.Template{
-					{
-						Name: "whalesay",
-						Inputs: wfv1alpha1.Inputs{
-							Parameters: []wfv1alpha1.Parameter{{Name: "message", Value: wfv1alpha1.AnyStringPtr("hello world")}},
-							Artifacts:  wfv1alpha1.Artifacts{},
-						},
-						Container: &corev1.Container{
-							Image:   "docker/whalesay:latest",
-							Command: []string{"cowsay"},
-							Args:    []string{"{{inputs.parameters.message}}"},
-						},
+		Spec: wfv1alpha1.WorkflowSpec{
+			Arguments: wfv1alpha1.Arguments{
+				Parameters: []wfv1alpha1.Parameter{{Name: "message"}},
+			},
+			Entrypoint:         "whalesay",
+			ServiceAccountName: store.Get().CodefreshSA,
+			PodGC: &wfv1alpha1.PodGC{
+				Strategy: wfv1alpha1.PodGCOnWorkflowCompletion,
+			},
+			Templates: []wfv1alpha1.Template{
+				{
+					Name: "whalesay",
+					Inputs: wfv1alpha1.Inputs{
+						Parameters: []wfv1alpha1.Parameter{{Name: "message", Value: wfv1alpha1.AnyStringPtr("hello world")}},
+						Artifacts:  wfv1alpha1.Artifacts{},
+					},
+					Container: &corev1.Container{
+						Image:   "docker/whalesay:latest",
+						Command: []string{"cowsay"},
+						Args:    []string{"{{inputs.parameters.message}}"},
 					},
 				},
 			},
@@ -888,11 +881,6 @@ func createGithubExampleTrigger() sensorsv1alpha1.Trigger {
 		Template: &sensorsv1alpha1.TriggerTemplate{
 			Name: store.Get().GithubExampleTriggerTemplateName,
 			ArgoWorkflow: &sensorsv1alpha1.ArgoWorkflowTrigger{
-				GroupVersionResource: metav1.GroupVersionResource{
-					Group:    "argoproj.io",
-					Version:  "v1alpha1",
-					Resource: store.Get().WorkflowResourceName,
-				},
 				Operation: sensorsv1alpha1.Submit,
 				Source: &sensorsv1alpha1.ArtifactLocation{
 					Resource: &workflowResource,

cmd/commands/runtime.go

@@ -44,16 +44,18 @@ import (
 	"github.com/codefresh-io/go-sdk/pkg/codefresh"
 	"github.com/codefresh-io/go-sdk/pkg/codefresh/model"
 	apmodel "github.com/codefresh-io/go-sdk/pkg/codefresh/model/app-proxy"
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
 
 	"github.com/Masterminds/semver/v3"
-	appset "github.com/argoproj-labs/applicationset/api/v1alpha1"
 	apcmd "github.com/argoproj-labs/argocd-autopilot/cmd/commands"
 	"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/kube"
 	apstore "github.com/argoproj-labs/argocd-autopilot/pkg/store"
 	aputil "github.com/argoproj-labs/argocd-autopilot/pkg/util"
+	appset "github.com/argoproj/applicationset/api/v1alpha1"
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	argocdv1alpha1cs "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
 	aev1alpha1 "github.com/argoproj/argo-events/pkg/apis/eventsource/v1alpha1"
@@ -70,8 +72,8 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	kustid "sigs.k8s.io/kustomize/api/resid"
 	kusttypes "sigs.k8s.io/kustomize/api/types"
+	kustid "sigs.k8s.io/kustomize/kyaml/resid"
 )
 
 type (
@@ -1812,7 +1814,7 @@ func createWorkflowsIngress(ctx context.Context, opts *RuntimeInstallOptions, rt
 	kust.Resources = append(kust.Resources, "ingress.yaml")
 	kust.Patches = append(kust.Patches, kusttypes.Patch{
 		Target: &kusttypes.Selector{
-			KrmId: kusttypes.KrmId{
+			ResId: kustid.ResId{
 				Gvk: kustid.Gvk{
 					Group:   appsv1.SchemeGroupVersion.Group,
 					Version: appsv1.SchemeGroupVersion.Version,
@@ -1914,7 +1916,7 @@ func createEventsReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts
 		return fmt.Errorf("failed to create argocd token secret: %w", err)
 	}
 
-	if err = opts.KubeFactory.Apply(ctx, opts.RuntimeName, aputil.JoinManifests(runtimeTokenSecret, argoTokenSecret)); err != nil {
+	if err = opts.KubeFactory.Apply(ctx, aputil.JoinManifests(runtimeTokenSecret, argoTokenSecret)); err != nil {
 		return fmt.Errorf("failed to create codefresh token: %w", err)
 	}
 
@@ -2000,9 +2002,10 @@ func createReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts *Runt
 		return err
 	}
 
-	log.G(ctx).Info("Pushing Codefresh ", strings.Title(reporterCreateOpts.reporterName), " manifests")
+	titleCase := cases.Title(language.AmericanEnglish)
+	log.G(ctx).Info("Pushing Codefresh ", titleCase.String(reporterCreateOpts.reporterName), " manifests")
 
-	pushMessage := "Created Codefresh" + strings.Title(reporterCreateOpts.reporterName) + "Reporter"
+	pushMessage := "Created Codefresh" + titleCase.String(reporterCreateOpts.reporterName) + "Reporter"
 
 	return apu.PushWithMessage(ctx, r, pushMessage)
 }

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.296/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.297/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.296/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.297/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf