chore(argocd) remove unused projects

Author: Jcing95

cli/cmd/argocd.go

@@ -96,7 +96,6 @@ func AddArgoCDCmd(parentCmd *cobra.Command, opts *GlobalOptions) {
 
 				When --deploy-dc-config is set, Codesphere-managed resources are applied after
 				the chart install/upgrade:
-				  - AppProjects (always)
 				  - Helm OCI registry secret (always, requires OMS_REGISTRY_PASSWORD)
 				  - Local cluster secret (only if --dc-id is provided)
 				  - Git repo credentials (only if OMS_GIT_PASSWORD env var is set)
@@ -118,7 +117,7 @@ func AddArgoCDCmd(parentCmd *cobra.Command, opts *GlobalOptions) {
 	argocd.cmd.Flags().StringVar(&argocd.Opts.DatacenterId, "dc-id", "", "Codesphere Datacenter ID (optional, registers local cluster in ArgoCD)")
 	argocd.cmd.Flags().StringVar(&argocd.Opts.RegistryURL, "registry-url", "ghcr.io/codesphere-cloud/charts", "OCI registry URL for the Helm chart repository")
 	argocd.cmd.Flags().StringVarP(&argocd.Opts.Version, "version", "v", "", "Version of the ArgoCD helm chart to install")
-	argocd.cmd.Flags().BoolVar(&argocd.Opts.FullInstall, "deploy-dc-config", false, "Apply Codesphere-managed resources (AppProjects, Repo Creds, ...) after installing the chart")
+	argocd.cmd.Flags().BoolVar(&argocd.Opts.FullInstall, "deploy-dc-config", false, "Apply Codesphere-managed resources (Repo Creds, ...) after installing the chart")
 	argocd.cmd.Flags().StringArrayVarP(&argocd.Opts.ValueFiles, "values", "f", nil, "Specify values in a YAML file (can be specified multiple times)")
 	argocd.cmd.Flags().BoolVar(&argocd.Opts.ForceConflicts, "force-conflicts", false, "Force field ownership conflicts during upgrade (sets server-side apply ForceConflicts)")
 	argocd.cmd.Flags().StringVar(&argocd.Opts.RepoURL, "repo", "", "Helm chart repository URL; supports HTTP (default: https://argoproj.github.io/argo-helm) and OCI (e.g. oci://ghcr.io/argoproj/argo-helm)")

internal/installer/argocd/argocd_resources.go

@@ -11,7 +11,6 @@ import (
 	"log"
 
 	k8s "github.com/codesphere-cloud/oms/internal/util"
-	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 )
 
@@ -22,28 +21,23 @@ type ArgoCDResources interface {
 
 type argoCDResources struct {
 	clientset kubernetes.Interface
-	dynClient dynamic.Interface
 
 	DatacenterId   string
 	OciPassword    string
 	OciRegistryURL string
 	GitPassword    string
 }
 
-func NewArgoCDResources(clientset kubernetes.Interface, dynClient dynamic.Interface, dataCenterId string, ociPassword string, ociRegistryURL string, gitPassword string) (ArgoCDResources, error) {
+func NewArgoCDResources(clientset kubernetes.Interface, dataCenterId string, ociPassword string, ociRegistryURL string, gitPassword string) (ArgoCDResources, error) {
 	return &argoCDResources{
 		clientset:      clientset,
-		dynClient:      dynClient,
 		DatacenterId:   dataCenterId,
 		OciPassword:    ociPassword,
 		OciRegistryURL: ociRegistryURL,
 		GitPassword:    gitPassword,
 	}, nil
 }
 
-//go:embed manifests/app-projects.yaml
-var appProjectsYAML []byte
-
 //go:embed manifests/cluster-local.yaml.tpl
 var localClusterTpl []byte
 
@@ -54,10 +48,6 @@ var helmRegistryTpl []byte
 var gitRepoTpl []byte
 
 func (a *argoCDResources) ApplyAll(ctx context.Context) error {
-	if err := a.applyAppProjects(ctx); err != nil {
-		return fmt.Errorf("applying app projects: %w", err)
-	}
-
 	if a.DatacenterId != "" {
 		if err := a.applyLocalCluster(ctx); err != nil {
 			return fmt.Errorf("applying local cluster secret: %w", err)
@@ -81,25 +71,6 @@ func (a *argoCDResources) ApplyAll(ctx context.Context) error {
 	return nil
 }
 
-func (a *argoCDResources) applyAppProjects(ctx context.Context) error {
-	log.Println("Applying AppProjects... ")
-	objects, err := k8s.DecodeMultiDocYAML(appProjectsYAML)
-	if err != nil {
-		return fmt.Errorf("decoding app projects yaml: %w", err)
-	}
-
-	for _, obj := range objects {
-		gvr, err := k8s.GvrForUnstructured(obj)
-		if err != nil {
-			return err
-		}
-		if err := k8s.ApplyUnstructured(ctx, a.dynClient, gvr, obj); err != nil {
-			return fmt.Errorf("applying app project %q: %w", obj.GetName(), err)
-		}
-	}
-	return nil
-}
-
 func (a *argoCDResources) applyLocalCluster(ctx context.Context) error {
 	log.Println("Applying local cluster secret... ")
 	rendered, err := k8s.RenderTemplate(localClusterTpl, map[string]string{

internal/installer/argocd/installer.go

@@ -52,11 +52,11 @@ func NewInstaller(cfg InstallerConfig) (*Installer, error) {
 			return nil, fmt.Errorf("init helm client failed: %w", err)
 		}
 
-		clientset, dynClient, err := k8s.NewClientsFromRESTConfig(cfg.RESTConfig)
+		clientset, _, err := k8s.NewClientsFromRESTConfig(cfg.RESTConfig)
 		if err != nil {
 			return nil, fmt.Errorf("creating kubernetes clients: %w", err)
 		}
-		resources, err := NewArgoCDResources(clientset, dynClient, cfg.DatacenterId, cfg.OciPassword, cfg.OciRegistryURL, cfg.GitPassword)
+		resources, err := NewArgoCDResources(clientset, cfg.DatacenterId, cfg.OciPassword, cfg.OciRegistryURL, cfg.GitPassword)
 		if err != nil {
 			return nil, fmt.Errorf("init argocd resources client failed: %w", err)
 		}
@@ -70,11 +70,11 @@ func NewInstaller(cfg InstallerConfig) (*Installer, error) {
 	if err != nil {
 		return nil, fmt.Errorf("init helm client failed: %w", err)
 	}
-	clientset, dynClient, err := k8s.NewClients()
+	clientset, _, err := k8s.NewClients()
 	if err != nil {
 		return nil, fmt.Errorf("creating kubernetes clients: %w", err)
 	}
-	resources, err := NewArgoCDResources(clientset, dynClient, cfg.DatacenterId, cfg.OciPassword, cfg.OciRegistryURL, cfg.GitPassword)
+	resources, err := NewArgoCDResources(clientset, cfg.DatacenterId, cfg.OciPassword, cfg.OciRegistryURL, cfg.GitPassword)
 	if err != nil {
 		return nil, fmt.Errorf("init argocd resources client failed: %w", err)
 	}

internal/installer/argocd/manifests/app-projects.yaml

@@ -66,7 +66,6 @@ func VaultGVR() schema.GroupVersionResource {
 // gvrMappings maps Kubernetes Kind names to their plural resource names.
 // New kinds used in embedded templates need a corresponding entry here.
 var gvrMappings = map[string]string{
-	"AppProject":     "appprojects",
 	"Vault":          "vaults",
 	"ServiceAccount": "serviceaccounts",
 	"Role":           "roles",

internal/util/k8s.go

@@ -133,18 +133,6 @@ var _ = Describe("DenderTemplate", func() {
 })
 
 var _ = Describe("GvrForUnstructured", func() {
-	It("returns the correct GVR for AppProject", func() {
-		obj := &unstructured.Unstructured{}
-		obj.SetAPIVersion("argoproj.io/v1alpha1")
-		obj.SetKind("AppProject")
-
-		gvr, err := util.GvrForUnstructured(obj)
-		Expect(err).ToNot(HaveOccurred())
-		Expect(gvr.Group).To(Equal("argoproj.io"))
-		Expect(gvr.Version).To(Equal("v1alpha1"))
-		Expect(gvr.Resource).To(Equal("appprojects"))
-	})
-
 	It("returns the correct GVR for Vault", func() {
 		obj := &unstructured.Unstructured{}
 		obj.SetAPIVersion("vault.banzaicloud.com/v1alpha1")