mykso · fritzduchardt · Mar 24, 2024 · Mar 24, 2024 · Mar 24, 2024 · Mar 24, 2024
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,6 @@ bin/*
 dist
 .idea
 .run
-/myks
-**/.myks/tmp
+.myks
+.vendor
 coverage.txt
-vendor/
diff --git a/examples/charts/render-test-chart/Chart.yaml → .../_lib/charts/render-test-chart/Chart.yaml b/examples/charts/render-test-chart/Chart.yaml → .../_lib/charts/render-test-chart/Chart.yaml
diff --git a/...s/render-test-chart/templates/output.yaml → ...s/render-test-chart/templates/output.yaml b/...s/render-test-chart/templates/output.yaml → ...s/render-test-chart/templates/output.yaml
@@ -1,5 +1,5 @@
 kind: rendering
 metadata:
-  name: render-test
+  name: helm-{{ .Release.Name }}
 outputYaml:
 {{ toYaml .Values.outputYaml | indent 2 }}
diff --git a/...ples/charts/render-test-chart/values.yaml → ..._lib/charts/render-test-chart/values.yaml b/...ples/charts/render-test-chart/values.yaml → ..._lib/charts/render-test-chart/values.yaml
diff --git a/examples/_lib/ytt/render-test-1/all.ytt.yaml b/examples/_lib/ytt/render-test-1/all.ytt.yaml
@@ -0,0 +1,4 @@
+---
+kind: rendering
+metadata:
+  name: ytt-render-test-1
diff --git a/examples/_lib/ytt/render-test-2/all.ytt.yaml b/examples/_lib/ytt/render-test-2/all.ytt.yaml
@@ -0,0 +1,4 @@
+---
+kind: rendering
+metadata:
+  name: ytt-render-test-2
diff --git a/examples/default/envs/mykso/dev/_apps/argocd/.myks/vendir.lock.yaml b/examples/default/envs/mykso/dev/_apps/argocd/.myks/vendir.lock.yaml
diff --git a/examples/default/envs/mykso/dev/_apps/argocd/.myks/vendir.yaml b/examples/default/envs/mykso/dev/_apps/argocd/.myks/vendir.yaml
diff --git a/examples/default/envs/mykso/dev/_apps/goldpinger/.myks/vendir.lock.yaml b/examples/default/envs/mykso/dev/_apps/goldpinger/.myks/vendir.lock.yaml
diff --git a/examples/default/envs/mykso/dev/_apps/goldpinger/.myks/vendir.yaml b/examples/default/envs/mykso/dev/_apps/goldpinger/.myks/vendir.yaml
diff --git a/examples/default/envs/mykso/dev/_apps/httpbingo/.myks/helm/httpbingo.yaml b/examples/default/envs/mykso/dev/_apps/httpbingo/.myks/helm/httpbingo.yaml
diff --git a/examples/default/envs/mykso/dev/_apps/httpbingo/.myks/vendir.lock.yaml b/examples/default/envs/mykso/dev/_apps/httpbingo/.myks/vendir.lock.yaml
diff --git a/examples/default/envs/mykso/dev/_apps/httpbingo/.myks/vendir.yaml b/examples/default/envs/mykso/dev/_apps/httpbingo/.myks/vendir.yaml
diff --git a/examples/integration-tests/envs/dev/_apps/helm-installation/.myks/helm/render-test.yaml b/examples/integration-tests/envs/dev/_apps/helm-installation/.myks/helm/render-test.yaml
diff --git a/examples/integration-tests/envs/dev/_apps/helm-installation/.myks/vendir.lock.yaml b/examples/integration-tests/envs/dev/_apps/helm-installation/.myks/vendir.lock.yaml
diff --git a/examples/integration-tests/envs/dev/_apps/helm-installation/.myks/vendir.yaml b/examples/integration-tests/envs/dev/_apps/helm-installation/.myks/vendir.yaml
diff --git a/examples/integration-tests/envs/dev/env-data.ytt.yaml b/examples/integration-tests/envs/dev/env-data.ytt.yaml
@@ -7,6 +7,7 @@ environment:
   applications:
     - proto: helm-render-test
       name: helm-installation
+    - proto: multiple-sources
     - proto: ytt-render-test
       name: ytt-installation
     - proto: static-test
diff --git a/examples/integration-tests/prototypes/helm-render-test/vendir/base.ytt.yaml b/examples/integration-tests/prototypes/helm-render-test/vendir/base.ytt.yaml
@@ -9,4 +9,4 @@ directories:
     contents:
       - path: .
         directory:
-          path: ../charts/render-test-chart
+          path: ../_lib/charts/render-test-chart
diff --git a/examples/integration-tests/prototypes/multiple-sources/vendir/all.ytt.yaml b/examples/integration-tests/prototypes/multiple-sources/vendir/all.ytt.yaml
@@ -0,0 +1,23 @@
+apiVersion: vendir.k14s.io/v1alpha1
+kind: Config
+directories:
+  - path: charts/render-test-1
+    contents:
+      - path: .
+        directory:
+          path: ../_lib/charts/render-test-chart
+  - path: charts/render-test-2
+    contents:
+      - path: .
+        directory:
+          path: ../_lib/charts/render-test-chart
+  - path: ytt/render-test-1
+    contents:
+      - path: .
+        directory:
+          path: ../_lib/ytt/render-test-1
+  - path: ytt/render-test-2
+    contents:
+      - path: .
+        directory:
+          path: ../_lib/ytt/render-test-2
diff --git a/examples/integration-tests/rendered/argocd/mykso-dev/app-multiple-sources.yaml b/examples/integration-tests/rendered/argocd/mykso-dev/app-multiple-sources.yaml
@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: app-mykso-dev-multiple-sources
+  namespace: system-argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  project: env-mykso-dev
+  destination:
+    name: mykso-dev
+    namespace: multiple-sources
+  source:
+    path: examples/integration-tests/rendered/envs/mykso-dev/multiple-sources
+    plugin:
+      name: argocd-vault-plugin-v1.0.0
+    repoURL: [email protected]:mykso/myks.git
+    targetRevision: main
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+    - CreateNamespace=true
+    - ServerSideApply=true
diff --git a/...m-installation/rendering-render-test.yaml → ...tallation/rendering-helm-render-test.yaml b/...m-installation/rendering-render-test.yaml → ...tallation/rendering-helm-render-test.yaml
@@ -1,6 +1,6 @@
 kind: rendering
 metadata:
-  name: render-test
+  name: helm-render-test
 outputYaml:
   fromAppConfig: true
   fromAppConfigAppData: true

diff --git a/...egration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-helm-render-test-1.yaml b/...egration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-helm-render-test-1.yaml
@@ -0,0 +1,5 @@
+kind: rendering
+metadata:
+  name: helm-render-test-1
+outputYaml:
+  fromChartDefaultValues: true
diff --git a/...egration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-helm-render-test-2.yaml b/...egration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-helm-render-test-2.yaml
@@ -0,0 +1,5 @@
+kind: rendering
+metadata:
+  name: helm-render-test-2
+outputYaml:
+  fromChartDefaultValues: true
diff --git a/...tegration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-ytt-render-test-1.yaml b/...tegration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-ytt-render-test-1.yaml
@@ -0,0 +1,3 @@
+kind: rendering
+metadata:
+  name: ytt-render-test-1
diff --git a/...tegration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-ytt-render-test-2.yaml b/...tegration-tests/rendered/envs/mykso-dev/multiple-sources/rendering-ytt-render-test-2.yaml
@@ -0,0 +1,3 @@
+kind: rendering
+metadata:
+  name: ytt-render-test-2
diff --git a/examples/simple/envs/dev/_apps/httpbingo/.myks/helm/httpbingo.yaml b/examples/simple/envs/dev/_apps/httpbingo/.myks/helm/httpbingo.yaml
diff --git a/examples/simple/envs/dev/_apps/httpbingo/.myks/vendir.lock.yaml b/examples/simple/envs/dev/_apps/httpbingo/.myks/vendir.lock.yaml
diff --git a/examples/simple/envs/dev/_apps/httpbingo/.myks/vendir.yaml b/examples/simple/envs/dev/_apps/httpbingo/.myks/vendir.yaml
diff --git a/examples/simple/envs/prod/_apps/httpbingo/.myks/helm/httpbingo.yaml b/examples/simple/envs/prod/_apps/httpbingo/.myks/helm/httpbingo.yaml
diff --git a/examples/simple/envs/prod/_apps/httpbingo/.myks/vendir.lock.yaml b/examples/simple/envs/prod/_apps/httpbingo/.myks/vendir.lock.yaml
diff --git a/examples/simple/envs/prod/_apps/httpbingo/.myks/vendir.yaml b/examples/simple/envs/prod/_apps/httpbingo/.myks/vendir.yaml
diff --git a/internal/integration/render_test.go b/internal/integration/render_test.go
@@ -33,7 +33,7 @@ func findRepos(t *testing.T, basefolder string) []testRepo {
 		if !d.IsDir() {
 			continue
 		}
-		if d.Name() == "charts" {
+		if d.Name() == "_lib" {
 			continue
 		}
 		repos = append(repos, testRepo{

diff --git a/internal/myks/application.go b/internal/myks/application.go
@@ -105,26 +105,18 @@ func (a *Application) Init() error {
 	return nil
 }
 
-func (a *Application) expandPath(path string) string {
-	return filepath.Join(a.e.Dir, a.e.g.AppsDir, a.Name, path)
-}
-
 func (a *Application) expandServicePath(path string) string {
-	return filepath.Join(a.e.Dir, a.e.g.AppsDir, a.Name, a.e.g.ServiceDirName, path)
+	return filepath.Join(a.e.g.ServiceDirName, a.e.Dir, a.e.g.AppsDir, a.Name, path)
 }
 
-func (a *Application) expandTempPath(path string) string {
-	return a.expandServicePath(filepath.Join(a.e.g.TempDirName, path))
+func (a *Application) expandVendirCache(path string) string {
+	return filepath.Join(a.e.g.ServiceDirName, a.e.g.VendirCache, path)
 }
 
 func (a *Application) writeServiceFile(name string, content string) error {
 	return writeFile(a.expandServicePath(name), []byte(content))
 }
 
-func (a *Application) writeTempFile(name string, content string) error {
-	return writeFile(a.expandTempPath(name), []byte(content))
-}
-
 func (a *Application) collectDataFiles() {
 	environmentDataFiles := a.e.collectBySubpath(a.e.g.EnvironmentDataFileName)
 	a.yttDataFiles = append(a.yttDataFiles, environmentDataFiles...)

diff --git a/internal/myks/assets/data-schema.ytt.yaml b/internal/myks/assets/data-schema.ytt.yaml
@@ -112,6 +112,11 @@ yttPkg:
 render:
   #! If true, the render output file names will include the namespace
   includeNamespace: false
+#! Configuration options for caching during vendir sync step.
+cache:
+  #! If true, the cache is enabled for all apps per default and can be selectively disabled with the vendir lazy flag.
+  #! If false, the cache is disabled for all apps per default and can be selectively enabled with the vendir lazy flag.
+  enabled: true
-#! Configuration options for caching during vendir sync step.
-cache:
-  #! If true, the cache is enabled for all apps per default and can be selectively disabled with the vendir lazy flag.
-  #! If false, the cache is disabled for all apps per default and can be selectively enabled with the vendir lazy flag.
-  enabled: true
+#! Configuration options for the sync step.
+sync:
+  cache:
+    #! If true, the cache is enabled for all apps per default and can be selectively disabled with the vendir lazy flag.
+    #! If false, the cache is disabled for all apps per default and can be selectively enabled with the vendir lazy flag.
+    enabled: true
-#! Configuration options for caching during vendir sync step.
-cache:
-  #! If true, the cache is enabled for all apps per default and can be selectively disabled with the vendir lazy flag.
-  #! If false, the cache is disabled for all apps per default and can be selectively enabled with the vendir lazy flag.
-  enabled: true
+#! Configuration options for the sync step.
+sync:
+  cache:
+    #! If true, the cache is enabled for all apps per default and can be selectively disabled with the vendir lazy flag.
+    #! If false, the cache is disabled for all apps per default and can be selectively enabled with the vendir lazy flag.
+    enabled: true
 #! Myks configuration and runtime data.
 #! Default values for these options are set by myks.
 myks:
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ bin/* @@
     dist
     .idea
     .run
-    /myks
-    **/.myks/tmp
+    .myks
+    .vendor
     coverage.txt
-    vendor/