Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions cmd/cli/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,10 @@ to the cluster, and patch the CR to trigger a rolling deploy.
// Step 3 — Resolve motif + generate bundle from central Katalog
fmt.Println("\nGenerating bundle...")

bundleDir := filepath.Join(dir, orkDir, "bundle")
bundleDir, err := doctor.AppBundleDir(appName)
if err != nil {
return fmt.Errorf("resolving bundle dir: %w", err)
}

if len(info.Secrets) > 0 {
fmt.Printf(" %s %s-secrets (%d variables from .env)\n", utils.SuccessMark(), appName, len(info.Secrets))
Expand Down Expand Up @@ -453,7 +456,10 @@ func deployMultiApp(dc deployContext) error {
image := doctor.ImageTag(dc.registry, appName, tag)
crName := appName + orkSuffix
ns := crName + "-ns"
bundleDir := filepath.Join(dc.dir, orkDir, appName, "bundle")
bundleDir, err := doctor.AppBundleDir(appName)
if err != nil {
return fmt.Errorf("resolving bundle dir for %s: %w", appName, err)
}
katalogPath := filepath.Join(dc.dir, orkDir, appName, "katalog.yaml")

appInfo, _ := doctor.Detect(entry.Dir)
Expand Down Expand Up @@ -1070,7 +1076,7 @@ type devPathArgs struct {
}

// deployDeveloperPath implements the developer deploy flow:
// 1. Load the motif template from ~/.orkestra/apps/<appname>/motif.yaml
// 1. Load the motif template from ~/.orkestra/doctor/init/apps/<appname>/motif.yaml
// 2. Collect all deployed app namespaces (current + previously deployed) for allowedNamespaces
// 3. Write ~/.orkestra/deploy/katalog.yaml with ONE platform CRD — resources
// embedded directly in operatorBox.onReconcile (no file imports)
Expand Down
14 changes: 7 additions & 7 deletions cmd/cli/doctor.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,10 @@ var doctorInitCmd = &cobra.Command{
}
state.Projects[name].Dir = dir
state.Projects[name].UseCompose = useCompose != ""
state.Projects[name].ComposeFile = useCompose
if useCompose != "" {
absCompose, _ := filepath.Abs(useCompose)
state.Projects[name].ComposeFile = absCompose
}
_ = state.Save()

fmt.Println()
Expand Down Expand Up @@ -551,7 +554,7 @@ func doctorInitMultiApp(baseDir string, cmd *cobra.Command, opts doctor.Generate
}
state.Projects[a.Name].Dir = a.Dir
state.Projects[a.Name].UseCompose = useCompose != ""
state.Projects[a.Name].ComposeFile = useCompose
state.Projects[a.Name].ComposeFile = composePath // already absolute
}
state.DirApps[baseDir] = appNames
if err := state.Save(); err != nil {
Expand Down Expand Up @@ -586,11 +589,8 @@ func doctorInitMultiApp(baseDir string, cmd *cobra.Command, opts doctor.Generate
}
fmt.Printf(" .orkestra/%s/app.yaml\n", app.name)
for _, dep := range deps {
fmt.Printf(" ↳ %s (e.g. %sImage, %sVolumeSize)\n",
dep.Motif.MotifRef,
dep.Motif.MotifRef,
dep.Motif.MotifRef,
)
hint := strings.Join(dep.Motif.AppYAMLKeys, ", ")
fmt.Printf(" ↳ %s (e.g. %s)\n", dep.Motif.MotifRef, hint)
}
}
}
Expand Down
Loading
Loading