Remove-ap

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22.5-alpine3.20 as base
+FROM golang:1.23.4-alpine3.20 as base
 
 WORKDIR /go/src/github.com/codefresh-io/cli-v2
 
@@ -27,7 +27,7 @@ RUN go mod verify
 
 ############################### CLI ###############################
 ### Compile
-FROM golang:1.22.5-alpine3.20 as codefresh-build
+FROM golang:1.23.4-alpine3.20 as codefresh-build
 
 WORKDIR /go/src/github.com/codefresh-io/cli-v2
 

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.1.67
+VERSION=v0.2.0
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
@@ -176,4 +176,4 @@ $(GOBIN)/mockgen:
 $(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.55.2
+	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOBIN) v1.59.1

build/Dockerfile.helper

@@ -1,5 +1,6 @@
-# docker buildx build --platform linux/amd64,linux/arm64 -t quay.io/codefresh/golang-ci-helper:1.21.12 -f Dockerfile.helper .
-FROM golang:1.22.5-alpine3.20
+# export GO_VERSION=1.22.10 && docker buildx build --platform linux/amd64,linux/arm64 --build-arg GO_VERSION -t quay.io/codefresh/golang-ci-helper:${GO_VERSION} -f Dockerfile.helper .
+ARG GO_VERSION=1.23.4
+FROM golang:${GO_VERSION}-alpine3.20
 
 RUN apk -U add --no-cache \
   bash \
@@ -13,14 +14,14 @@ RUN apk -U add --no-cache \
   openssl \
   && update-ca-certificates
 
-ARG GH_VERSION=2.52.0
+ARG GH_VERSION=2.60.1
 RUN curl -L https://github.com/cli/cli/releases/download/v${GH_VERSION}/gh_${GH_VERSION}_linux_amd64.tar.gz --output gh.tar.gz \
   && tar -xzf gh.tar.gz \
   && mv gh_${GH_VERSION}_linux_amd64/bin/gh /usr/local/bin \
   && rm gh.tar.gz \
   && rm -rf gh_${GH_VERSION}_linux_amd64
 
-ARG KUSTOMIZE_VERSION=5.4.2
+ARG KUSTOMIZE_VERSION=5.5.0
 RUN curl -Ls https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz --output kustomize.tar.gz  \
   && tar -xzf kustomize.tar.gz \
   && mv ./kustomize /usr/bin \

cmd/commands/cluster.go

@@ -23,20 +23,20 @@ import (
 	"strings"
 	"time"
 
-	"github.com/codefresh-io/cli-v2/pkg/log"
-	"github.com/codefresh-io/cli-v2/pkg/store"
-	"github.com/codefresh-io/cli-v2/pkg/util"
-	kubeutil "github.com/codefresh-io/cli-v2/pkg/util/kube"
-	kustutil "github.com/codefresh-io/cli-v2/pkg/util/kust"
+	"github.com/codefresh-io/cli-v2/internal/kube"
+	"github.com/codefresh-io/cli-v2/internal/log"
+	"github.com/codefresh-io/cli-v2/internal/store"
+	"github.com/codefresh-io/cli-v2/internal/util"
+	kubeutil "github.com/codefresh-io/cli-v2/internal/util/kube"
+	kustutil "github.com/codefresh-io/cli-v2/internal/util/kust"
 
 	"github.com/Masterminds/semver/v3"
-	apkube "github.com/argoproj-labs/argocd-autopilot/pkg/kube"
 	platmodel "github.com/codefresh-io/go-sdk/pkg/model/platform"
-	"github.com/ghodss/yaml"
 	"github.com/juju/ansiterm"
 	"github.com/spf13/cobra"
 	kusttypes "sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/kustomize/kyaml/resid"
+	"sigs.k8s.io/yaml"
 )
 
 type (
@@ -51,7 +51,7 @@ type (
 		tag               string
 		dryRun            bool
 		skipTLSValidation bool
-		kubeFactory       apkube.Factory
+		kubeFactory       kube.Factory
 	}
 
 	ClusterRemoveOptions struct {
@@ -86,7 +86,7 @@ var (
 	}
 )
 
-func NewClusterCommand() *cobra.Command {
+func newClusterCommand() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:               "cluster",
 		Short:             "Manage clusters of Codefresh runtimes",
@@ -147,7 +147,7 @@ func newClusterAddCommand() *cobra.Command {
 	cmd.Flags().StringVar(&opts.tag, "tag", "", "[dev only] - use a specific tag of the csdp-add-cluster image")
 
 	util.Die(cmd.Flags().MarkHidden("tag"))
-	opts.kubeFactory = apkube.AddFlags(cmd.Flags())
+	opts.kubeFactory = kube.AddFlags(cmd.Flags())
 
 	return cmd
 }
@@ -422,9 +422,6 @@ func createAddClusterManifests(opts *ClusterAddOptions, ingressUrl, server, csdp
 		}
 	}
 
-	k.FixKustomizationPostUnmarshalling()
-	util.Die(k.FixKustomizationPreMarshalling())
-
 	manifests, err := kustutil.BuildKustomization(k)
 	if err != nil {
 		return nil, "", fmt.Errorf("failed to build kustomization: %w", err)