Added new AppDir at a couple of places

mykso · Oct 1, 2023 · 4bbc051 · 4bbc051
1 parent 1692ece
commit 4bbc051
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/myks/plugin_argocd.go b/internal/myks/plugin_argocd.go
@@ -85,7 +85,7 @@ func (a *Application) renderArgoCD() (err error) {
 	// 4. Collection of environment argocd-specific data values and schemas, and overlays
 	yttFiles = append(yttFiles, a.e.collectBySubpath(filepath.Join("_env", a.e.g.ArgoCDDataDirName))...)
 	// 5. Collection of application argocd-specific data values and schemas, and overlays
-	yttFiles = append(yttFiles, a.e.collectBySubpath(filepath.Join("_apps", a.Name, a.e.g.ArgoCDDataDirName))...)
+	yttFiles = append(yttFiles, a.e.collectBySubpath(filepath.Join(a.e.g.AppsDir, a.Name, a.e.g.ArgoCDDataDirName))...)
 
 	res, err := a.yttS(
 		"argocd",

diff --git a/internal/myks/smart_mode.go b/internal/myks/smart_mode.go
@@ -82,8 +82,8 @@ func (g *Globe) runSmartMode(changedFiles ChangedFiles) EnvAppMap {
 		},
 		// Env path and app name are the submatches
 		"app": {
-			e("(" + g.EnvironmentBaseDir + ".*)/_apps/([^/]+)/" + pluginsPattern + "/.*"),
-			e("(" + g.EnvironmentBaseDir + ".*)/_apps/([^/]+)/" + g.ApplicationDataFileName),
+			e("(" + g.EnvironmentBaseDir + ".*)/" + g.AppsDir + "/([^/]+)/" + pluginsPattern + "/.*"),
+			e("(" + g.EnvironmentBaseDir + ".*)/" + g.AppsDir + "/([^/]+)/" + g.ApplicationDataFileName),
 		},
 	}