From 735fa414b596e85fde48bbc919cfa4125f7db099 Mon Sep 17 00:00:00 2001 From: Tamar-Dinavetsky Date: Fri, 24 Jul 2026 10:42:18 +0300 Subject: [PATCH 1/2] :seedling: Remove defunct --export-dir flag from apply command --- cmd/apply/apply.go | 4 ---- e2e-tests/framework/crane.go | 4 ---- e2e-tests/framework/pipeline.go | 4 ++-- e2e-tests/tests/tier0/mta_801_stateful_migration_test.go | 2 +- e2e-tests/tests/tier0/mta_802_ignored_resources_test.go | 2 +- e2e-tests/tests/tier0/mta_804_empty_pvc_migration_test.go | 2 +- e2e-tests/tests/tier0/mta_805_sets_test.go | 2 +- e2e-tests/tests/tier0/mta_806_pvc_data_integrity_test.go | 2 +- e2e-tests/tests/tier0/mta_807_data_validation_test.go | 2 +- e2e-tests/tests/tier0/mta_808_cronjob_quiesced_test.go | 2 +- e2e-tests/tests/tier0/mta_809_initcontainer_test.go | 2 +- e2e-tests/tests/tier0/mta_810_configmap_test.go | 2 +- e2e-tests/tests/tier0/mta_811_mongodb_non_admin_test.go | 2 +- e2e-tests/tests/tier0/mta_812_role_migration_test.go | 2 +- e2e-tests/tests/tier0/mta_813_cronJob_PVC_test.go | 2 +- e2e-tests/tests/tier0/mta_817_stateless_migration_test.go | 2 +- .../tests/tier0/mta_827_custom_transformation_stage_test.go | 2 +- .../tests/tier0/mta_828_instructions_file_migration_test.go | 2 +- .../mta_831_validate_compatible_resources_offline_test.go | 2 +- .../tests/tier0/mta_833_compatible_resources_live_test.go | 2 +- e2e-tests/tests/tier0/mta_837_hpa_migration_test.go | 2 +- .../mta_838_multi_container_stateless_migration_test.go | 2 +- .../tests/tier0/mta_839_networkpolicy_migration_test.go | 2 +- .../tests/tier0/mta_840_same_cluster_migration_test.go | 2 +- e2e-tests/tests/tier0/mta_843_pipeline_determinism_test.go | 4 ++-- .../tier0/mta_844_validate_mixed_resources_live_test.go | 2 +- .../tier0/mta_845_validate_mixed_resources_offline_test.go | 2 +- e2e-tests/tests/tier0/mta_851_no_cluster_resources_test.go | 2 +- e2e-tests/tests/tier0/mta_852_minimal_rbac_test.go | 2 +- e2e-tests/tests/tier0/mta_853_split_apply_test.go | 2 +- e2e-tests/tests/tier0/mta_862_ordered_apply_test.go | 1 - e2e-tests/tests/tier0/olm_whiteout_base_test.go | 2 +- .../mta_829_validate_alternative_gv_suggestion_test.go | 2 +- .../tier1/mta_830_instructions_file_force_reconcile_test.go | 2 +- ...a_832_validate_alternative_gv_suggestion_offline_test.go | 2 +- .../mta_836_validate_core_group_omitted_offline_test.go | 2 +- e2e-tests/tests/tier1/mta_841_missing_configmap_ref_test.go | 2 +- e2e-tests/tests/tier1/mta_842_secrets_migration_test.go | 2 +- e2e-tests/tests/tier1/mta_854_two_clusterroles_test.go | 2 +- e2e-tests/tests/tier1/mta_855_crd_custom_resource_test.go | 2 +- .../tests/tier1/mta_857_service_account_subject_test.go | 2 +- e2e-tests/tests/tier1/mta_858_user_subject_test.go | 2 +- e2e-tests/tests/tier1/mta_859_group_subject_test.go | 2 +- .../tier1/mta_860_validate_malformed_api_surface_test.go | 1 - e2e-tests/tests/tier1/olm_whiteout_auditability_test.go | 6 +++--- 45 files changed, 45 insertions(+), 55 deletions(-) diff --git a/cmd/apply/apply.go b/cmd/apply/apply.go index 88448706..fd3cffb5 100644 --- a/cmd/apply/apply.go +++ b/cmd/apply/apply.go @@ -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 @@ -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") diff --git a/e2e-tests/framework/crane.go b/e2e-tests/framework/crane.go index 5f8c0297..515440e6 100644 --- a/e2e-tests/framework/crane.go +++ b/e2e-tests/framework/crane.go @@ -57,7 +57,6 @@ type TransformOptions struct { } type ApplyOptions struct { - ExportDir string TransformDir string OutputDir string KustomizeArgs string @@ -153,9 +152,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) } diff --git a/e2e-tests/framework/pipeline.go b/e2e-tests/framework/pipeline.go index b1704a65..9389ea3e 100644 --- a/e2e-tests/framework/pipeline.go +++ b/e2e-tests/framework/pipeline.go @@ -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 diff --git a/e2e-tests/tests/tier0/mta_801_stateful_migration_test.go b/e2e-tests/tests/tier0/mta_801_stateful_migration_test.go index bf7ee337..5ff822b7 100644 --- a/e2e-tests/tests/tier0/mta_801_stateful_migration_test.go +++ b/e2e-tests/tests/tier0/mta_801_stateful_migration_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_802_ignored_resources_test.go b/e2e-tests/tests/tier0/mta_802_ignored_resources_test.go index 55a2e26c..66851057 100644 --- a/e2e-tests/tests/tier0/mta_802_ignored_resources_test.go +++ b/e2e-tests/tests/tier0/mta_802_ignored_resources_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_804_empty_pvc_migration_test.go b/e2e-tests/tests/tier0/mta_804_empty_pvc_migration_test.go index 17b1886a..10b1438e 100644 --- a/e2e-tests/tests/tier0/mta_804_empty_pvc_migration_test.go +++ b/e2e-tests/tests/tier0/mta_804_empty_pvc_migration_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_805_sets_test.go b/e2e-tests/tests/tier0/mta_805_sets_test.go index 5c1241c9..1a94f164 100644 --- a/e2e-tests/tests/tier0/mta_805_sets_test.go +++ b/e2e-tests/tests/tier0/mta_805_sets_test.go @@ -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() { diff --git a/e2e-tests/tests/tier0/mta_806_pvc_data_integrity_test.go b/e2e-tests/tests/tier0/mta_806_pvc_data_integrity_test.go index cb207fc8..fc807cfe 100644 --- a/e2e-tests/tests/tier0/mta_806_pvc_data_integrity_test.go +++ b/e2e-tests/tests/tier0/mta_806_pvc_data_integrity_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_807_data_validation_test.go b/e2e-tests/tests/tier0/mta_807_data_validation_test.go index 8556e248..95acc709 100644 --- a/e2e-tests/tests/tier0/mta_807_data_validation_test.go +++ b/e2e-tests/tests/tier0/mta_807_data_validation_test.go @@ -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() { diff --git a/e2e-tests/tests/tier0/mta_808_cronjob_quiesced_test.go b/e2e-tests/tests/tier0/mta_808_cronjob_quiesced_test.go index 70b6d0c0..4a3a79e2 100644 --- a/e2e-tests/tests/tier0/mta_808_cronjob_quiesced_test.go +++ b/e2e-tests/tests/tier0/mta_808_cronjob_quiesced_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_809_initcontainer_test.go b/e2e-tests/tests/tier0/mta_809_initcontainer_test.go index 495d8a31..856facc3 100644 --- a/e2e-tests/tests/tier0/mta_809_initcontainer_test.go +++ b/e2e-tests/tests/tier0/mta_809_initcontainer_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_810_configmap_test.go b/e2e-tests/tests/tier0/mta_810_configmap_test.go index 28a218f2..7b2e9dfb 100644 --- a/e2e-tests/tests/tier0/mta_810_configmap_test.go +++ b/e2e-tests/tests/tier0/mta_810_configmap_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_811_mongodb_non_admin_test.go b/e2e-tests/tests/tier0/mta_811_mongodb_non_admin_test.go index 429c3590..3a488ccc 100644 --- a/e2e-tests/tests/tier0/mta_811_mongodb_non_admin_test.go +++ b/e2e-tests/tests/tier0/mta_811_mongodb_non_admin_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_812_role_migration_test.go b/e2e-tests/tests/tier0/mta_812_role_migration_test.go index 90f9e1b6..d08fdb56 100644 --- a/e2e-tests/tests/tier0/mta_812_role_migration_test.go +++ b/e2e-tests/tests/tier0/mta_812_role_migration_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_813_cronJob_PVC_test.go b/e2e-tests/tests/tier0/mta_813_cronJob_PVC_test.go index 158e9c03..4b48acc1 100644 --- a/e2e-tests/tests/tier0/mta_813_cronJob_PVC_test.go +++ b/e2e-tests/tests/tier0/mta_813_cronJob_PVC_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_817_stateless_migration_test.go b/e2e-tests/tests/tier0/mta_817_stateless_migration_test.go index e1e82023..83f4dea8 100644 --- a/e2e-tests/tests/tier0/mta_817_stateless_migration_test.go +++ b/e2e-tests/tests/tier0/mta_817_stateless_migration_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_827_custom_transformation_stage_test.go b/e2e-tests/tests/tier0/mta_827_custom_transformation_stage_test.go index a98038b4..0c5406a1 100644 --- a/e2e-tests/tests/tier0/mta_827_custom_transformation_stage_test.go +++ b/e2e-tests/tests/tier0/mta_827_custom_transformation_stage_test.go @@ -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) diff --git a/e2e-tests/tests/tier0/mta_828_instructions_file_migration_test.go b/e2e-tests/tests/tier0/mta_828_instructions_file_migration_test.go index 36099789..0328b6cb 100644 --- a/e2e-tests/tests/tier0/mta_828_instructions_file_migration_test.go +++ b/e2e-tests/tests/tier0/mta_828_instructions_file_migration_test.go @@ -144,7 +144,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) diff --git a/e2e-tests/tests/tier0/mta_831_validate_compatible_resources_offline_test.go b/e2e-tests/tests/tier0/mta_831_validate_compatible_resources_offline_test.go index bb5d6b26..51c5babe 100644 --- a/e2e-tests/tests/tier0/mta_831_validate_compatible_resources_offline_test.go +++ b/e2e-tests/tests/tier0/mta_831_validate_compatible_resources_offline_test.go @@ -59,7 +59,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") diff --git a/e2e-tests/tests/tier0/mta_833_compatible_resources_live_test.go b/e2e-tests/tests/tier0/mta_833_compatible_resources_live_test.go index bc26905b..a393ba62 100644 --- a/e2e-tests/tests/tier0/mta_833_compatible_resources_live_test.go +++ b/e2e-tests/tests/tier0/mta_833_compatible_resources_live_test.go @@ -55,7 +55,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") diff --git a/e2e-tests/tests/tier0/mta_837_hpa_migration_test.go b/e2e-tests/tests/tier0/mta_837_hpa_migration_test.go index 747fafce..add67b92 100644 --- a/e2e-tests/tests/tier0/mta_837_hpa_migration_test.go +++ b/e2e-tests/tests/tier0/mta_837_hpa_migration_test.go @@ -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() { diff --git a/e2e-tests/tests/tier0/mta_838_multi_container_stateless_migration_test.go b/e2e-tests/tests/tier0/mta_838_multi_container_stateless_migration_test.go index 131f57b0..446ad279 100644 --- a/e2e-tests/tests/tier0/mta_838_multi_container_stateless_migration_test.go +++ b/e2e-tests/tests/tier0/mta_838_multi_container_stateless_migration_test.go @@ -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 { diff --git a/e2e-tests/tests/tier0/mta_839_networkpolicy_migration_test.go b/e2e-tests/tests/tier0/mta_839_networkpolicy_migration_test.go index a44906b5..f7594639 100644 --- a/e2e-tests/tests/tier0/mta_839_networkpolicy_migration_test.go +++ b/e2e-tests/tests/tier0/mta_839_networkpolicy_migration_test.go @@ -98,7 +98,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") diff --git a/e2e-tests/tests/tier0/mta_840_same_cluster_migration_test.go b/e2e-tests/tests/tier0/mta_840_same_cluster_migration_test.go index b0d73bea..84a32bc4 100644 --- a/e2e-tests/tests/tier0/mta_840_same_cluster_migration_test.go +++ b/e2e-tests/tests/tier0/mta_840_same_cluster_migration_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_843_pipeline_determinism_test.go b/e2e-tests/tests/tier0/mta_843_pipeline_determinism_test.go index 70728cb2..be92c8c2 100644 --- a/e2e-tests/tests/tier0/mta_843_pipeline_determinism_test.go +++ b/e2e-tests/tests/tier0/mta_843_pipeline_determinism_test.go @@ -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"} diff --git a/e2e-tests/tests/tier0/mta_844_validate_mixed_resources_live_test.go b/e2e-tests/tests/tier0/mta_844_validate_mixed_resources_live_test.go index 8a1c27df..2d8fef09 100644 --- a/e2e-tests/tests/tier0/mta_844_validate_mixed_resources_live_test.go +++ b/e2e-tests/tests/tier0/mta_844_validate_mixed_resources_live_test.go @@ -57,7 +57,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() { diff --git a/e2e-tests/tests/tier0/mta_845_validate_mixed_resources_offline_test.go b/e2e-tests/tests/tier0/mta_845_validate_mixed_resources_offline_test.go index 230847ff..b6ed82dc 100644 --- a/e2e-tests/tests/tier0/mta_845_validate_mixed_resources_offline_test.go +++ b/e2e-tests/tests/tier0/mta_845_validate_mixed_resources_offline_test.go @@ -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") diff --git a/e2e-tests/tests/tier0/mta_851_no_cluster_resources_test.go b/e2e-tests/tests/tier0/mta_851_no_cluster_resources_test.go index 07fb945a..18b343e4 100644 --- a/e2e-tests/tests/tier0/mta_851_no_cluster_resources_test.go +++ b/e2e-tests/tests/tier0/mta_851_no_cluster_resources_test.go @@ -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() { diff --git a/e2e-tests/tests/tier0/mta_852_minimal_rbac_test.go b/e2e-tests/tests/tier0/mta_852_minimal_rbac_test.go index 001dcb0a..a410faa0 100644 --- a/e2e-tests/tests/tier0/mta_852_minimal_rbac_test.go +++ b/e2e-tests/tests/tier0/mta_852_minimal_rbac_test.go @@ -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} diff --git a/e2e-tests/tests/tier0/mta_853_split_apply_test.go b/e2e-tests/tests/tier0/mta_853_split_apply_test.go index d2020545..cadfabf7 100644 --- a/e2e-tests/tests/tier0/mta_853_split_apply_test.go +++ b/e2e-tests/tests/tier0/mta_853_split_apply_test.go @@ -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} diff --git a/e2e-tests/tests/tier0/mta_862_ordered_apply_test.go b/e2e-tests/tests/tier0/mta_862_ordered_apply_test.go index 5659eeb4..1f1e54c1 100644 --- a/e2e-tests/tests/tier0/mta_862_ordered_apply_test.go +++ b/e2e-tests/tests/tier0/mta_862_ordered_apply_test.go @@ -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, diff --git a/e2e-tests/tests/tier0/olm_whiteout_base_test.go b/e2e-tests/tests/tier0/olm_whiteout_base_test.go index 80c7b238..6844735d 100644 --- a/e2e-tests/tests/tier0/olm_whiteout_base_test.go +++ b/e2e-tests/tests/tier0/olm_whiteout_base_test.go @@ -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") diff --git a/e2e-tests/tests/tier1/mta_829_validate_alternative_gv_suggestion_test.go b/e2e-tests/tests/tier1/mta_829_validate_alternative_gv_suggestion_test.go index 3618f747..22986bf4 100644 --- a/e2e-tests/tests/tier1/mta_829_validate_alternative_gv_suggestion_test.go +++ b/e2e-tests/tests/tier1/mta_829_validate_alternative_gv_suggestion_test.go @@ -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} diff --git a/e2e-tests/tests/tier1/mta_830_instructions_file_force_reconcile_test.go b/e2e-tests/tests/tier1/mta_830_instructions_file_force_reconcile_test.go index d0f1738d..61d1409f 100644 --- a/e2e-tests/tests/tier1/mta_830_instructions_file_force_reconcile_test.go +++ b/e2e-tests/tests/tier1/mta_830_instructions_file_force_reconcile_test.go @@ -136,7 +136,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) diff --git a/e2e-tests/tests/tier1/mta_832_validate_alternative_gv_suggestion_offline_test.go b/e2e-tests/tests/tier1/mta_832_validate_alternative_gv_suggestion_offline_test.go index 6d591852..26e28500 100644 --- a/e2e-tests/tests/tier1/mta_832_validate_alternative_gv_suggestion_offline_test.go +++ b/e2e-tests/tests/tier1/mta_832_validate_alternative_gv_suggestion_offline_test.go @@ -56,7 +56,7 @@ var _ = Describe("Validate alternative GV suggestion [Offline Mode]", 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() { diff --git a/e2e-tests/tests/tier1/mta_836_validate_core_group_omitted_offline_test.go b/e2e-tests/tests/tier1/mta_836_validate_core_group_omitted_offline_test.go index 5e688b4e..e1995098 100644 --- a/e2e-tests/tests/tier1/mta_836_validate_core_group_omitted_offline_test.go +++ b/e2e-tests/tests/tier1/mta_836_validate_core_group_omitted_offline_test.go @@ -60,7 +60,7 @@ var _ = Describe("Validate core group omission [Offline Mode]", 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() { diff --git a/e2e-tests/tests/tier1/mta_841_missing_configmap_ref_test.go b/e2e-tests/tests/tier1/mta_841_missing_configmap_ref_test.go index faeb0f81..e1d33500 100644 --- a/e2e-tests/tests/tier1/mta_841_missing_configmap_ref_test.go +++ b/e2e-tests/tests/tier1/mta_841_missing_configmap_ref_test.go @@ -33,7 +33,7 @@ var _ = Describe("Missing ConfigMap reference 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, OutputDir: paths.OutputDir} + applyOpts := ApplyOptions{TransformDir: paths.TransformDir, OutputDir: paths.OutputDir} DeferCleanup(func() { By("Delete source and target namespaces") if _, err := kubectlSrc.Run("delete", "namespace", namespace, "--ignore-not-found=true", "--wait=true", "--timeout=60s"); err != nil { diff --git a/e2e-tests/tests/tier1/mta_842_secrets_migration_test.go b/e2e-tests/tests/tier1/mta_842_secrets_migration_test.go index 0bd62109..b7528127 100644 --- a/e2e-tests/tests/tier1/mta_842_secrets_migration_test.go +++ b/e2e-tests/tests/tier1/mta_842_secrets_migration_test.go @@ -31,7 +31,7 @@ var _ = Describe("Migrate namespace with multiple secret types", 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 temp directory") diff --git a/e2e-tests/tests/tier1/mta_854_two_clusterroles_test.go b/e2e-tests/tests/tier1/mta_854_two_clusterroles_test.go index 3aae4835..7059b4fe 100644 --- a/e2e-tests/tests/tier1/mta_854_two_clusterroles_test.go +++ b/e2e-tests/tests/tier1/mta_854_two_clusterroles_test.go @@ -43,7 +43,7 @@ var _ = Describe("Cluster-level RBAC export", func() { 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() { diff --git a/e2e-tests/tests/tier1/mta_855_crd_custom_resource_test.go b/e2e-tests/tests/tier1/mta_855_crd_custom_resource_test.go index 7a73f915..c96395c3 100644 --- a/e2e-tests/tests/tier1/mta_855_crd_custom_resource_test.go +++ b/e2e-tests/tests/tier1/mta_855_crd_custom_resource_test.go @@ -51,7 +51,7 @@ var _ = Describe("Cluster-level RBAC export", func() { } 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() { diff --git a/e2e-tests/tests/tier1/mta_857_service_account_subject_test.go b/e2e-tests/tests/tier1/mta_857_service_account_subject_test.go index 8dda49a6..86883741 100644 --- a/e2e-tests/tests/tier1/mta_857_service_account_subject_test.go +++ b/e2e-tests/tests/tier1/mta_857_service_account_subject_test.go @@ -42,7 +42,7 @@ var _ = Describe("Cluster-level RBAC export", func() { 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() { diff --git a/e2e-tests/tests/tier1/mta_858_user_subject_test.go b/e2e-tests/tests/tier1/mta_858_user_subject_test.go index ec4df3c9..9bafe156 100644 --- a/e2e-tests/tests/tier1/mta_858_user_subject_test.go +++ b/e2e-tests/tests/tier1/mta_858_user_subject_test.go @@ -42,7 +42,7 @@ var _ = Describe("Cluster-level RBAC export", func() { 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() { diff --git a/e2e-tests/tests/tier1/mta_859_group_subject_test.go b/e2e-tests/tests/tier1/mta_859_group_subject_test.go index 0045b4c9..8941d254 100644 --- a/e2e-tests/tests/tier1/mta_859_group_subject_test.go +++ b/e2e-tests/tests/tier1/mta_859_group_subject_test.go @@ -43,7 +43,7 @@ var _ = Describe("Cluster-level RBAC export", func() { 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() { diff --git a/e2e-tests/tests/tier1/mta_860_validate_malformed_api_surface_test.go b/e2e-tests/tests/tier1/mta_860_validate_malformed_api_surface_test.go index 353f5c39..8406464d 100644 --- a/e2e-tests/tests/tier1/mta_860_validate_malformed_api_surface_test.go +++ b/e2e-tests/tests/tier1/mta_860_validate_malformed_api_surface_test.go @@ -80,7 +80,6 @@ var _ = Describe("Crane validate offline mode: malformed API surface file handli TransformDir: paths.TransformDir, } applyOpts := ApplyOptions{ - ExportDir: paths.ExportDir, TransformDir: paths.TransformDir, OutputDir: paths.OutputDir, } diff --git a/e2e-tests/tests/tier1/olm_whiteout_auditability_test.go b/e2e-tests/tests/tier1/olm_whiteout_auditability_test.go index b8b16c30..e4ec29d6 100644 --- a/e2e-tests/tests/tier1/olm_whiteout_auditability_test.go +++ b/e2e-tests/tests/tier1/olm_whiteout_auditability_test.go @@ -106,7 +106,7 @@ var _ = Describe("OLM whiteout", func() { Expect(utils.AssertKindsNotInActiveKustomizeResources(paths.TransformDir, olmWhiteoutKinds)).NotTo(HaveOccurred()) By("Run crane apply") - Expect(runner.Apply(ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir, + Expect(runner.Apply(ApplyOptions{TransformDir: paths.TransformDir, OutputDir: paths.OutputDir})).NotTo(HaveOccurred()) By("Verify output does not contain OLM whiteout kinds") @@ -139,7 +139,7 @@ var _ = Describe("OLM whiteout", func() { paths, err := NewScenarioPaths("crane-multi-op-*") Expect(err).NotTo(HaveOccurred()) - applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir, + applyOpts := ApplyOptions{TransformDir: paths.TransformDir, OutputDir: paths.OutputDir} exportOpts := ExportOptions{Namespace: namespace, ExportDir: paths.ExportDir} transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir} @@ -249,7 +249,7 @@ var _ = Describe("OLM whiteout", func() { paths, err := NewScenarioPaths("crane-export-*") Expect(err).NotTo(HaveOccurred()) - applyOpts := ApplyOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir, + applyOpts := ApplyOptions{TransformDir: paths.TransformDir, OutputDir: paths.OutputDir} exportOpts := ExportOptions{Namespace: namespace, ExportDir: paths.ExportDir} transformOpts := TransformOptions{ExportDir: paths.ExportDir, TransformDir: paths.TransformDir} From 2a0304d2ee191c74a7f4327617ab30bae8e867e7 Mon Sep 17 00:00:00 2001 From: Tamar-Dinavetsky Date: Mon, 27 Jul 2026 13:55:56 +0300 Subject: [PATCH 2/2] update apply docs and clean flags --- docs/commands/apply.md | 1 - .../tier0/mta_831_validate_compatible_resources_offline_test.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/commands/apply.md b/docs/commands/apply.md index e3f42a0d..9003ab6b 100644 --- a/docs/commands/apply.md +++ b/docs/commands/apply.md @@ -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`) | diff --git a/e2e-tests/tests/tier0/mta_831_validate_compatible_resources_offline_test.go b/e2e-tests/tests/tier0/mta_831_validate_compatible_resources_offline_test.go index 437d74d7..6a8fafd0 100644 --- a/e2e-tests/tests/tier0/mta_831_validate_compatible_resources_offline_test.go +++ b/e2e-tests/tests/tier0/mta_831_validate_compatible_resources_offline_test.go @@ -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")