From aba2510f48a79e9527d1da547bad650433cbf3c3 Mon Sep 17 00:00:00 2001 From: Manabu McCloskey Date: Wed, 25 Oct 2023 16:58:48 -0700 Subject: [PATCH] use argocd default project (#64) Signed-off-by: Manabu Mccloskey --- pkg/apps/srv/crossplane/crossplane.yaml | 2 +- pkg/cmd/create/root.go | 2 +- pkg/controllers/localbuild/controller.go | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/apps/srv/crossplane/crossplane.yaml b/pkg/apps/srv/crossplane/crossplane.yaml index a0176a6d..825c6b0c 100644 --- a/pkg/apps/srv/crossplane/crossplane.yaml +++ b/pkg/apps/srv/crossplane/crossplane.yaml @@ -13,7 +13,7 @@ spec: targetRevision: 1.11.1 helm: releaseName: crossplane - project: idpbuilder-local-gitserver + project: default syncPolicy: automated: prune: true diff --git a/pkg/cmd/create/root.go b/pkg/cmd/create/root.go index 535526b9..d7f3fe1a 100644 --- a/pkg/cmd/create/root.go +++ b/pkg/cmd/create/root.go @@ -35,7 +35,7 @@ var CreateCmd = &cobra.Command{ func init() { CreateCmd.PersistentFlags().BoolVar(&recreateCluster, "recreate", false, "Delete cluster first if it already exists.") CreateCmd.PersistentFlags().StringVar(&buildName, "buildName", "localdev", "Name for build (Prefix for kind cluster name, pod names, etc).") - CreateCmd.PersistentFlags().StringVar(&kubeVersion, "kubeVersion", "v1.26.333", "Version of the kind kubernetes cluster to create.") + CreateCmd.PersistentFlags().StringVar(&kubeVersion, "kubeVersion", "v1.26.3", "Version of the kind kubernetes cluster to create.") CreateCmd.PersistentFlags().StringVar(&extraPortsMapping, "extraPorts", "", "List of extra ports to expose on the docker container and kubernetes cluster as nodePort (e.g. \"22:32222,9090:39090,etc\").") CreateCmd.PersistentFlags().StringVar(&kindConfigPath, "kindConfig", "", "Path of the kind config file to be used instead of the default.") diff --git a/pkg/controllers/localbuild/controller.go b/pkg/controllers/localbuild/controller.go index 74fc89de..089d332f 100644 --- a/pkg/controllers/localbuild/controller.go +++ b/pkg/controllers/localbuild/controller.go @@ -21,6 +21,7 @@ import ( ) const ( + defaultArgoCDProjectName string = "default" EmbeddedGitServerName string = "embedded" gitServerResourceName string = "gitserver" gitServerDeploymentContainerName string = "httpd" @@ -236,7 +237,7 @@ func (r *LocalbuildReconciler) ReconcileArgoApps(ctx context.Context, req ctrl.R app, repoUrl, embedApp.Path, - resource.GetArgoProjectName(), + defaultArgoCDProjectName, nil, )