Skip to content

🌱 Remove defunct --export-dir flag from apply command #692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tamar-Dinavetsky merged 3 commits into from
Jul 27, 2026
Merged

🌱 Remove defunct --export-dir flag from apply command #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
735fa41
:seedling: Remove defunct --export-dir flag from apply command
Tamar-Dinavetsky Jul 24, 2026
9c42ef6
Merge branch 'main' into refactor/remove-export-dir-flag-from-apply
Tamar-Dinavetsky Jul 27, 2026
2a0304d
update apply docs and clean flags
Tamar-Dinavetsky Jul 27, 2026
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
4 changes: 0 additions & 4 deletions cmd/apply/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ type Options struct {
}

type Flags struct {
ExportDir string `mapstructure:"export-dir"`
TransformDir string `mapstructure:"transform-dir"`
OutputDir string `mapstructure:"output-dir"`
// Kustomize arguments
Expand Down Expand Up @@ -116,9 +115,6 @@ func getStageNames(stages []internalTransform.Stage) []string {
}

func addFlagsForOptions(o *Flags, cmd *cobra.Command) {
// Note: export-dir is kept for compatibility and consistency with other commands,
// but is not used by apply (apply only reads from transform-dir)
cmd.Flags().StringVarP(&o.ExportDir, "export-dir", "e", "export", "The path where the kubernetes resources are saved")
cmd.Flags().StringVarP(&o.TransformDir, "transform-dir", "t", "transform", "The path where files that contain the transformations are saved")
cmd.Flags().StringVarP(&o.OutputDir, "output-dir", "o", "output", "The path where files are to be saved after transformation are applied")

Expand Down
1 change: 0 additions & 1 deletion docs/commands/apply.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ Kustomize is embedded directly in the Crane binary (via the krusty API), so no e

| Flag | Short | Default | Description |
|------|-------|---------|-------------|
| `--export-dir` | `-e` | `export` | The path where exported resources are saved (kept for consistency; not used by apply) |
| `--transform-dir` | `-t` | `transform` | The path where transform stage directories are located |
| `--output-dir` | `-o` | `output` | The path where final manifests are written |
| `--kustomize-args` | | | Additional arguments for kustomize (e.g., `--enable-helm --helm-command=helm3`) |
Expand Down
4 changes: 0 additions & 4 deletions e2e-tests/framework/crane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ type TransformOptions struct {
}

type ApplyOptions struct {
ExportDir string
TransformDir string
OutputDir string
KustomizeArgs string
Expand Down Expand Up @@ -149,9 +148,6 @@ func (c CraneRunner) Transform(opts TransformOptions) error {
func (c CraneRunner) Apply(opts ApplyOptions) error {
args := []string{"apply"}

if opts.ExportDir != "" {
args = append(args, "--export-dir", opts.ExportDir)
}
if opts.TransformDir != "" {
args = append(args, "--transform-dir", opts.TransformDir)
}
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/framework/pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ const (

// RunCranePipeline executes export, transform, and apply in sequence.
func RunCranePipeline(runner CraneRunner, e ExportOptions, t TransformOptions, a ApplyOptions) error {
if (e.ExportDir != t.ExportDir) || (e.ExportDir != a.ExportDir) || (t.TransformDir != a.TransformDir) {
return fmt.Errorf("pipeline directory mismatch: export/transform/apply options must agree on shared directories (exportDir, transformDir)")
if (e.ExportDir != t.ExportDir) || (t.TransformDir != a.TransformDir) {
return fmt.Errorf("pipeline directory mismatch: export/transform options must agree on exportDir; transform/apply options must agree on transformDir")
}
if err := runner.Export(e); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_801_stateful_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var _ = Describe("Stateful app migration", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_802_ignored_resources_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var _ = Describe("Default Ignored resources", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup manual Endpoints resource on source")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_804_empty_pvc_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var _ = Describe("Empty PVC migration", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup temp directory")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_805_sets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ var _ = Describe("Sets resources migration", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}

DeferCleanup(func() {
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_806_pvc_data_integrity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ var _ = Describe("PVC data integrity migration", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup temp directory")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_807_data_validation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ var _ = Describe("Data validation with indirect migration of MySQL DB", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}

DeferCleanup(func() {
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_808_cronjob_quiesced_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ var _ = Describe("Cronjob Quiesced", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}

By("Verify source cronjob runs and emits expected log")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_809_initcontainer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ var _ = Describe("InitContainer Migration", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_810_configmap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var _ = Describe("ConfigMap Migration", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_811_mongodb_non_admin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ var _ = Describe("MongoDB Migration", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_812_role_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ var _ = Describe("Role and RoleBinding migration", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_813_cronJob_PVC_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ var _ = Describe("CronJob with attached PVC migration as non-admin user", func()
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_817_stateless_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var _ = Describe("Stateless migration", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_827_custom_transformation_stage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ var _ = Describe("Custom transformation stage", func() {
Expect(err).NotTo(HaveOccurred())

log.Printf("Running crane apply for namespace %s\n", srcApp.Namespace)
Expect(runner.Apply(ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
Expect(runner.Apply(ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir})).NotTo(HaveOccurred())
log.Printf("Crane pipeline completed for namespace %s\n", srcApp.Namespace)

Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_828_instructions_file_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ var _ = Describe("Instructions-file migration", func() {
}

log.Printf("Running crane apply for namespace %s\n", srcApp.Namespace)
Expect(runner.Apply(ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
Expect(runner.Apply(ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir})).NotTo(HaveOccurred())
log.Printf("Crane pipeline completed for namespace %s\n", srcApp.Namespace)

Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_831_validate_compatible_resources_offline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ var _ = Describe("Crane validate: all compatible standard resources in offline m
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{ TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_833_compatible_resources_live_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ var _ = Describe("Crane validate: all compatible standard resources in live mode
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_837_hpa_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ var _ = Describe("HPA migration", func() {
paths, err := NewScenarioPaths("crane-export-*")
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
Expect(err).NotTo(HaveOccurred())
DeferCleanup(func() {
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_838_multi_container_stateless_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ var _ = Describe("Multi-container pod migration", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir, OutputDir: paths.OutputDir}
applyOpts := ApplyOptions{TransformDir: paths.TransformDir, OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
if err := CleanupScenario(paths.TempDir, srcApp, tgtApp); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_839_networkpolicy_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ spec:
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_840_same_cluster_migration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var _ = Describe("Same-cluster namespace migration", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/tests/tier0/mta_843_pipeline_determinism_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ var _ = Describe("Pipeline determinism", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts1 := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths1.ExportDir}
transformOpts1 := TransformOptions{ExportDir: paths1.ExportDir, TransformDir: paths1.TransformDir}
applyOpts1 := ApplyOptions{ExportDir: paths1.ExportDir, TransformDir: paths1.TransformDir, OutputDir: paths1.OutputDir}
applyOpts1 := ApplyOptions{TransformDir: paths1.TransformDir, OutputDir: paths1.OutputDir}

paths2, err := NewScenarioPaths("crane-export-*")
Expect(err).NotTo(HaveOccurred())
exportOpts2 := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths2.ExportDir}
transformOpts2 := TransformOptions{ExportDir: paths2.ExportDir, TransformDir: paths2.TransformDir}
applyOpts2 := ApplyOptions{ExportDir: paths2.ExportDir, TransformDir: paths2.TransformDir, OutputDir: paths2.OutputDir}
applyOpts2 := ApplyOptions{TransformDir: paths2.TransformDir, OutputDir: paths2.OutputDir}

srcApp.ExtraVars = map[string]any{"non_admin_user": "true"}

Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_844_validate_mixed_resources_live_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ var _ = Describe("Crane validate: mixed compatible and incompatible resources in
paths, err := NewScenarioPaths("crane-validate-mixed-*")
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
Expect(err).NotTo(HaveOccurred())
DeferCleanup(func() {
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_845_validate_mixed_resources_offline_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ var _ = Describe("Crane validate: mixed compatible and incompatible resources in
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_851_no_cluster_resources_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var _ = Describe("Cluster-level export control", func() {
runner := scenario.Crane
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}

DeferCleanup(func() {
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_852_minimal_rbac_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var _ = Describe("Cluster-level RBAC export", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}

crb := ClusterRoleBinding{Name: clusterRoleBindingName, ClusterRoleName: clusterRoleName}
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/mta_853_split_apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var _ = Describe("Namespace-admin cluster-level migration", func() {

exportOpts := ExportOptions{Namespace: srcAppNonAdmin.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}

crb := ClusterRoleBinding{Name: clusterRoleBindingName, ClusterRoleName: clusterRoleName}
Expand Down
1 change: 0 additions & 1 deletion e2e-tests/tests/tier0/mta_862_ordered_apply_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ var _ = Describe("Ordered apply for Role and RoleBinding migration", func() {
exportOpts := ExportOptions{Namespace: namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{
ExportDir: paths.ExportDir,
TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir,
Ordered: true,
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier0/olm_whiteout_base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var _ = Describe("OLM whiteout", func() {
Expect(err).NotTo(HaveOccurred())
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
DeferCleanup(func() {
By("Cleanup source and target resources")
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier1/mta_829_validate_alternative_gv_suggestion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var _ = Describe("Validate alternative GV suggestion [Live Mode]", func() {
log.Printf("Source app %s prepared successfully\n", srcApp.Name)
paths, err := NewScenarioPaths("crane-pipeline-*")
Expect(err).NotTo(HaveOccurred())
applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
applyOpts := ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir}
exportOpts := ExportOptions{Namespace: srcApp.Namespace, ExportDir: paths.ExportDir}
transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir}
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/tier1/mta_830_instructions_file_force_reconcile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ var _ = Describe("Instructions-file overwrite reconcile migration", func() {
}

log.Printf("Running crane apply for namespace %s\n", srcApp.Namespace)
Expect(runner.Apply(ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir,
Expect(runner.Apply(ApplyOptions{TransformDir: paths.TransformDir,
OutputDir: paths.OutputDir})).NotTo(HaveOccurred())
log.Printf("Crane pipeline completed for namespace %s\n", srcApp.Namespace)

Expand Down
Loading
Loading