chore: Update argocd, k8s & kustomize deps (#46)

svghadi · web-flow · commit ff716dd2ebf9 · 2025-07-28T09:40:42.000+05:30
* Update argocd dep

Signed-off-by: Siddhesh Ghadi &lt;sghadi1203@gmail.com&gt;

* go mod tidy

Signed-off-by: Siddhesh Ghadi &lt;sghadi1203@gmail.com&gt;

* Upgrade kustomize dep

Signed-off-by: Siddhesh Ghadi &lt;sghadi1203@gmail.com&gt;

* Fix gofmt

Signed-off-by: Siddhesh Ghadi &lt;sghadi1203@gmail.com&gt;

* Fix gomod

Signed-off-by: Siddhesh Ghadi &lt;sghadi1203@gmail.com&gt;

---------

Signed-off-by: Siddhesh Ghadi &lt;sghadi1203@gmail.com&gt;
diff --git a/Makefile b/Makefile
@@ -1,5 +1,9 @@
 default: test
 
+.PHONY: build
+build:
+	go build -v ./...
+
 .PHONY: test
 test:
 	go test `go list ./... | grep -v test`
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"net/http"
 
-	argoV1aplha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoV1aplha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
diff --git a/pkg/gitfs/gitfs.go b/pkg/gitfs/gitfs.go
@@ -3,13 +3,14 @@ package gitfs
 import (
 	"fmt"
 	"path"
+	"path/filepath"
 	"strings"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"github.com/go-git/go-git/v5/plumbing/storer"
 	"github.com/go-git/go-git/v5/storage/memory"
-	"sigs.k8s.io/kustomize/pkg/fs"
+	fs "sigs.k8s.io/kustomize/kyaml/filesys"
 )
 
 // gitFS is an internal implementation of the Kustomize
@@ -136,6 +137,16 @@ func (g gitFS) WriteFile(name string, data []byte) error {
 	return errNotSupported("WriteFile")
 }
 
+// Walk implementation for fs.FileSystem
+func (g gitFS) Walk(path string, walkFn filepath.WalkFunc) error {
+	return errNotSupported("Walk")
+}
+
+// ReadDir implementation for fs.FileSystem
+func (g gitFS) ReadDir(path string) ([]string, error) {
+	return []string{}, errNotSupported("ReadDir")
+}
+
 func errNotSupported(s string) error {
 	return notSupported(s)
 }
diff --git a/pkg/gitfs/gitfs_test.go b/pkg/gitfs/gitfs_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"sigs.k8s.io/kustomize/pkg/fs"
+	fs "sigs.k8s.io/kustomize/kyaml/filesys"
 
 	"github.com/redhat-developer/gitops-backend/test"
 )
diff --git a/pkg/httpapi/api.go b/pkg/httpapi/api.go
@@ -12,7 +12,7 @@ import (
 	"net/url"
 	"strings"
 
-	argoV1aplha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoV1aplha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/julienschmidt/httprouter"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/pkg/httpapi/api_test.go b/pkg/httpapi/api_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	argoV1aplha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoV1aplha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	gogit "github.com/go-git/go-git/v5"
 	"github.com/google/go-cmp/cmp"
 	"github.com/redhat-developer/gitops-backend/pkg/git"
@@ -32,6 +32,18 @@ const (
 	testRef = "7638417db6d59f3c431d3e1f261cc637155684cd"
 )
 
+func makeTestClient() ctrlclient.Client {
+	_ = argoV1aplha1.AddToScheme(scheme.Scheme)
+	builder := fake.NewClientBuilder().WithIndex(
+		&argoV1aplha1.Application{},
+		"metadata.name",
+		func(o ctrlclient.Object) []string {
+			return []string{o.GetName()}
+		},
+	)
+	return builder.Build()
+}
+
 func TestGetPipelines(t *testing.T) {
 	ts, c := makeServer(t)
 	c.addContents("example/gitops", "pipelines.yaml", "HEAD", "testdata/pipelines.yaml")
@@ -403,13 +415,8 @@ func TestListApplications_badURL(t *testing.T) {
 }
 
 func TestGetApplicationDetails(t *testing.T) {
-	err := argoV1aplha1.AddToScheme(scheme.Scheme)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	builder := fake.NewClientBuilder()
-	kc := builder.Build()
+	var err error
+	kc := makeTestClient()
 
 	ts, _ := makeServer(t, func(router *APIRouter) {
 		router.k8sClient = kc
@@ -510,13 +517,8 @@ func TestGetApplicationDetails(t *testing.T) {
 }
 
 func TestGetApplicationHistory(t *testing.T) {
-	err := argoV1aplha1.AddToScheme(scheme.Scheme)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	builder := fake.NewClientBuilder()
-	kc := builder.Build()
+	var err error
+	kc := makeTestClient()
 
 	ts, _ := makeServer(t, func(router *APIRouter) {
 		router.k8sClient = kc
diff --git a/pkg/httpapi/conversion.go b/pkg/httpapi/conversion.go
@@ -1,12 +1,13 @@
 package httpapi
 
 import (
-	log "github.com/sirupsen/logrus"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sort"
 	"strings"
 
-	argoV1aplha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	log "github.com/sirupsen/logrus"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	argoV1aplha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 // TODO: this should really import the config from the upstream and use it to
diff --git a/pkg/httpapi/conversion_test.go b/pkg/httpapi/conversion_test.go
@@ -2,10 +2,11 @@ package httpapi
 
 import (
 	"fmt"
-	argoV1aplha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
 	"testing"
 	"time"
 
+	argoV1aplha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+
 	"github.com/google/go-cmp/cmp"
 )
 
diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go
@@ -4,11 +4,9 @@ import (
 	"github.com/go-git/go-git/v5"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"sigs.k8s.io/kustomize/k8sdeps"
-	"sigs.k8s.io/kustomize/pkg/fs"
-	"sigs.k8s.io/kustomize/pkg/loader"
-	"sigs.k8s.io/kustomize/pkg/resource"
-	"sigs.k8s.io/kustomize/pkg/target"
+	"sigs.k8s.io/kustomize/api/krusty"
+	"sigs.k8s.io/kustomize/api/resource"
+	fs "sigs.k8s.io/kustomize/kyaml/filesys"
 
 	"github.com/redhat-developer/gitops-backend/pkg/gitfs"
 )
@@ -24,26 +22,17 @@ func ParseFromGit(path string, opts *git.CloneOptions) ([]*Resource, error) {
 }
 
 func parseConfig(path string, files fs.FileSystem) ([]*Resource, error) {
-	k8sfactory := k8sdeps.NewFactory()
-	ldr, err := loader.NewLoader(path, files)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		err = ldr.Cleanup()
-		if err != nil {
-			panic(err)
-		}
-	}()
-	kt, err := target.NewKustTarget(ldr, k8sfactory.ResmapF, k8sfactory.TransformerF)
-	if err != nil {
-		return nil, err
-	}
-	r, err := kt.MakeCustomizedResMap()
+
+	// Run performs a kustomization.
+	// It reads given path from the given file system, interprets it as
+	// a kustomization.yaml file, perform the kustomization it represents,
+	// and return the resulting resources.
+	kt := krusty.MakeKustomizer(krusty.MakeDefaultOptions())
+	r, err := kt.Run(files, path)
 	if err != nil {
 		return nil, err
 	}
-	if len(r) == 0 {
+	if len(r.Resources()) == 0 {
 		return nil, nil
 	}
 
@@ -52,7 +41,7 @@ func parseConfig(path string, files fs.FileSystem) ([]*Resource, error) {
 		return nil, err
 	}
 	resources := []*Resource{}
-	for _, v := range r {
+	for _, v := range r.Resources() {
 		resources = append(resources, extractResource(conv, v))
 	}
 	return resources, nil
@@ -82,9 +71,10 @@ func extractResource(conv *unstructuredConverter, res *resource.Resource) *Resou
 }
 
 // convert converts a Kustomize resource into a generic Unstructured resource
-// which which the unstructured converter uses to create resources from.
+// which the unstructured converter uses to create resources from.
 func convert(r *resource.Resource) *unstructured.Unstructured {
+	res, _ := r.Map()
 	return &unstructured.Unstructured{
-		Object: r.Map(),
+		Object: res,
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`
`7`	`7`	`"github.com/google/go-cmp/cmp"`
`8`		`- "sigs.k8s.io/kustomize/pkg/fs"`
	`8`	`+ fs "sigs.k8s.io/kustomize/kyaml/filesys"`
`9`	`9`
`10`	`10`	`"github.com/redhat-developer/gitops-backend/test"`
`11`	`11`	`)`