Merge branch 'main' into test/e2e-set-namespace-latest

SurbhiAgarwal1 · web-flow · commit d573d2f5d700 · 2026-03-07T23:35:53.000+05:30
diff --git a/documentation/content/en/book/02-concepts/_index.md b/documentation/content/en/book/02-concepts/_index.md
@@ -191,7 +191,7 @@ Instead of consuming an existing package, you can also create a package from scr
 
 ![img](/images/lifecycle/flow5.svg)
 
-- **Create**: Initialize a directory using `kpt pkg init`.
+- **Create**: Initialize a package using `kpt pkg init`. The command creates the directory if it doesn't exist.
 
 Now, let's say you have rendered the package, and want to deploy it to a cluster. The workflow
 may look like this:
diff --git a/documentation/content/en/book/03-packages/_index.md b/documentation/content/en/book/03-packages/_index.md
@@ -314,13 +314,13 @@ git add .; git commit -m "Updated wordpress to main"
 ```
 ## Creating a package
 
-Creating a new package is simple. Use the `pkg init` command to create a package directory with a minimal `Kptfile` and `README` files:
+Creating a new package is simple. Use the `pkg init` command to initialize a directory as a kpt package with a minimal `Kptfile` and `README` files:
 
 ```shell
 kpt pkg init awesomeapp
 ```
 
-This will create the `awesomeapp` directory if it doesn't exist, and initialize it with the necessary files.
+The command will automatically create the `awesomeapp` directory if it doesn't exist, eliminating the need to manually create the directory beforehand.
 
 Refer to the [init command reference](../../reference/cli/pkg/init/) for usage.
 
diff --git a/documentation/content/en/book/08-ci-user-guide/_index.md b/documentation/content/en/book/08-ci-user-guide/_index.md
@@ -281,8 +281,8 @@ availableSecrets:
 This section highlights practices that commonly lead to CI failures, drift, or unintended cluster changes. Avoid the
 following:
 
-- Running `kpt pkg init` in CI. Packages and `Kptfile` metadata should be authored by developers, not created during
-  CI runs.
+- Running `kpt pkg init` in CI to create package metadata. The `Kptfile` and package structure should be authored by developers
+  and committed to Git, not generated during CI runs.
 - Mutating packages in CI. CI should validate and render the declared intent, not change the source of truth.
 - Storing secrets in configuration. Secrets must not appear in YAML files, the `Kptfile`, or `functionConfig`.
 - Applying on pull requests. PRs should validate only; deployment belongs in gated, mainline workflows.
diff --git a/documentation/content/en/guides/namespace-provisioning-cli.md b/documentation/content/en/guides/namespace-provisioning-cli.md
@@ -117,11 +117,9 @@ Create a resource from a file or from stdin.
 # You should be under the `./blueprint` git directory. If not, check the above
 # section  "Prerequisites | Repositories"
 
-# create a directory
-$ mkdir basens
-
-# let's initialize the package
+# initialize the package (directory will be created automatically if it doesn't exist)
 $ kpt pkg init basens --description "kpt package for provisioning namespace"
+creating package directory basens
 writing basens/Kptfile
 writing basens/README.md
 writing basens/package-context.yaml
diff --git a/documentation/content/en/installation/migration.md b/documentation/content/en/installation/migration.md
@@ -68,7 +68,7 @@ directory by default.
 | [v0.39 Commands]                                                                                  | [v1.0 Commands]                                                                                                                                                                                                                                      |
 | ------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `kpt pkg get REPO_URI[.git]/PKG_PATH[@VERSION] LOCAL_DEST_DIRECTORY [flags]`                      | `kpt pkg get REPO_URI[.git]/PKG_PATH[@VERSION] [flags] [LOCAL_DEST_DIRECTORY]` <br> Fetch a remote package from a git subdirectory and writes it to a new local directory.                                                                           |
-| `kpt pkg init DIR [flags]`                                                                        | `kpt pkg init [DIR] [flags]` <br> Initializes a directory as a kpt package by adding a Kptfile. Creates the directory if it does not exist.                                                                                                          |
+| `kpt pkg init DIR [flags]`                                                                        | `kpt pkg init [DIR] [flags]` <br> Initializes a directory as a kpt package by adding a Kptfile. Creates the directory if it does not exist.                                                                                                                                      |
 | `kpt pkg update LOCAL_PKG_DIR[@VERSION] [flags]`                                                  | `kpt pkg update [PKG_PATH][@version] [flags]` <br> Pulls in upstream changes and merges them into a local package.                                                                                                                                   |
 | `kpt pkg fix DIR [flags]`                                                                         | `kpt fn eval --image ghcr.io/kptdev/krm-functions-catalog/fix:latest --include-meta-resources` <br> Fix a local package which is using deprecated features.                                                                                                                                            |
 | `kpt pkg desc DIR [flags]`                                                                        | Deprecated in favor of reading Kptfile directly                                                                                                                                                                                                      |
diff --git a/documentation/content/en/reference/annotations/apply-time-mutation/_index.md b/documentation/content/en/reference/annotations/apply-time-mutation/_index.md
@@ -110,9 +110,8 @@ from pod-a.
 Create a new kpt package:
 
 ```shell
-mkdir my-pkg
+kpt pkg init my-pkg
 cd my-pkg
-kpt pkg init
 ```
 
 Configure two pods, with one that depends on the other:
diff --git a/documentation/content/en/reference/annotations/depends-on/_index.md b/documentation/content/en/reference/annotations/depends-on/_index.md
@@ -35,9 +35,8 @@ In this example, pod-b depends on pod-a.
 Create a new kpt package:
 
 ```shell
-mkdir my-pkg
+kpt pkg init my-pkg
 cd my-pkg
-kpt pkg init
 ```
 
 Configure two pods, with one that depends on the other:
diff --git a/documentation/content/en/reference/annotations/local-config/_index.md b/documentation/content/en/reference/annotations/local-config/_index.md
@@ -34,9 +34,8 @@ In this example, the `ConfigMap` `cm-a` is local and not applied.
 Create a new kpt package:
 
 ```shell
-mkdir my-pkg
+kpt pkg init my-pkg
 cd my-pkg
-kpt pkg init
 ```
 
 Configure a local `ConfigMap`:
diff --git a/go.mod b/go.mod
@@ -51,7 +51,7 @@ require (
 	github.com/chai2010/gettext-go v1.0.3 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.18.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/cli v28.5.1+incompatible // indirect
+	github.com/docker/cli v29.2.0+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.9.4 // indirect
 	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
diff --git a/go.sum b/go.sum
@@ -29,8 +29,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docker/cli v28.5.1+incompatible h1:ESutzBALAD6qyCLqbQSEf1a/U8Ybms5agw59yGVc+yY=
-github.com/docker/cli v28.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v29.2.0+incompatible h1:9oBd9+YM7rxjZLfyMGxjraKBKE4/nVyvVfN4qNl9XRM=
+github.com/docker/cli v29.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker-credential-helpers v0.9.4 h1:76ItO69/AP/V4yT9V4uuuItG0B1N8hvt0T0c0NN/DzI=
diff --git a/pkg/test/runner/runner.go b/pkg/test/runner/runner.go
@@ -137,44 +137,41 @@ func (r *Runner) runTearDownScript(pkgPath string) error {
 }
 
 func (r *Runner) runFnEval() error {
-	r.t.Logf("Running test against package %s\n", r.pkgName)
-	tmpDir, err := os.MkdirTemp("", "krm-fn-e2e-*")
-	if err != nil {
-		return fmt.Errorf("failed to create temporary dir: %w", err)
-	}
-	pkgPath := filepath.Join(tmpDir, r.pkgName)
+	// run function
+	for i := 0; i < r.testCase.Config.RunCount(); i++ {
+		r.t.Logf("Running test against package %s, iteration %d \n", r.pkgName, i+1)
+		tmpDir, err := os.MkdirTemp("", "krm-fn-e2e-*")
+		if err != nil {
+			return fmt.Errorf("failed to create temporary dir: %w", err)
+		}
+		pkgPath := filepath.Join(tmpDir, r.pkgName)
 
-	if r.testCase.Config.Debug {
-		fmt.Printf("Running test against package %s in dir %s \n", r.pkgName, pkgPath)
-	}
-	if !r.testCase.Config.Debug {
-		// if debug is true, keep the test directory around for debugging
-		defer os.RemoveAll(tmpDir)
-	}
-	var resultsDir, destDir string
+		if r.testCase.Config.Debug {
+			fmt.Printf("Running test against package %s in dir %s \n", r.pkgName, pkgPath)
+		}
+		var resultsDir, destDir string
 
-	if r.IsFnResultExpected() {
-		resultsDir = filepath.Join(tmpDir, "results")
-	}
+		if r.IsFnResultExpected() {
+			resultsDir = filepath.Join(tmpDir, "results")
+		}
 
-	if r.IsOutOfPlace() {
-		destDir = filepath.Join(pkgPath, outDir)
-	}
+		if r.IsOutOfPlace() {
+			destDir = filepath.Join(pkgPath, outDir)
+		}
 
-	// copy package to temp directory
-	err = copyDir(r.testCase.Path, pkgPath)
-	if err != nil {
-		return fmt.Errorf("failed to copy package: %w", err)
-	}
+		// copy package to temp directory
+		err = copyDir(r.testCase.Path, pkgPath)
+		if err != nil {
+			return fmt.Errorf("failed to copy package: %w", err)
+		}
+
+		// init and commit package files
+		err = r.preparePackage(pkgPath)
+		if err != nil {
+			return fmt.Errorf("failed to prepare package: %w", err)
+		}
 
-	// init and commit package files
-	err = r.preparePackage(pkgPath)
-	if err != nil {
-		return fmt.Errorf("failed to prepare package: %w", err)
-	}
 
-	// run function
-	for i := 0; i < r.testCase.Config.RunCount(); i++ {
 		err = r.runSetupScript(pkgPath)
 		if err != nil {
 			return err
@@ -240,7 +237,7 @@ func (r *Runner) runFnEval() error {
 		}
 
 		// compare results
-		err = r.compareResult(i, fnErr, stdout, sanitizeTimestamps(stderr), pkgPath, resultsDir)
+		err = r.compareResult(fnErr, stdout, sanitizeTimestamps(stderr), pkgPath, resultsDir)
 		if err != nil {
 			return err
 		}
@@ -254,6 +251,11 @@ func (r *Runner) runFnEval() error {
 		if err != nil {
 			return err
 		}
+
+		// cleanup temp directory after iteration
+		if !r.testCase.Config.Debug {
+			os.RemoveAll(tmpDir)
+		}
 	}
 
 	return nil
@@ -290,54 +292,50 @@ func (r *Runner) IsOutOfPlace() bool {
 }
 
 func (r *Runner) runFnRender() error {
-	r.t.Logf("Running test against package %s\n", r.pkgName)
-	tmpDir, err := os.MkdirTemp("", "kpt-pipeline-e2e-*")
-	if err != nil {
-		return fmt.Errorf("failed to create temporary dir: %w", err)
-	}
-	if r.testCase.Config.Debug {
-		fmt.Printf("Running test against package %s in dir %s \n", r.pkgName, tmpDir)
-	}
-	if !r.testCase.Config.Debug {
-		// if debug is true, keep the test directory around for debugging
-		defer os.RemoveAll(tmpDir)
-	}
-	pkgPath := filepath.Join(tmpDir, r.pkgName)
-	// create dir to store untouched pkg to compare against
-	origPkgPath := filepath.Join(tmpDir, "original")
-	err = os.Mkdir(origPkgPath, 0755)
-	if err != nil {
-		return fmt.Errorf("failed to create original dir %s: %w", origPkgPath, err)
-	}
+	// run function
+	for i := 0; i < r.testCase.Config.RunCount(); i++ {
+		r.t.Logf("Running test against package %s, iteration %d \n", r.pkgName, i+1)
+		tmpDir, err := os.MkdirTemp("", "kpt-pipeline-e2e-*")
+		if err != nil {
+			return fmt.Errorf("failed to create temporary dir: %w", err)
+		}
+		if r.testCase.Config.Debug {
+			fmt.Printf("Running test against package %s in dir %s \n", r.pkgName, tmpDir)
+		}
+		pkgPath := filepath.Join(tmpDir, r.pkgName)
+		// create dir to store untouched pkg to compare against
+		origPkgPath := filepath.Join(tmpDir, "original")
+		err = os.Mkdir(origPkgPath, 0755)
+		if err != nil {
+			return fmt.Errorf("failed to create original dir %s: %w", origPkgPath, err)
+		}
 
-	var resultsDir, destDir string
+		var resultsDir, destDir string
 
-	if r.IsFnResultExpected() {
-		resultsDir = filepath.Join(tmpDir, "results")
-	}
+		if r.IsFnResultExpected() {
+			resultsDir = filepath.Join(tmpDir, "results")
+		}
 
-	if r.IsOutOfPlace() {
-		destDir = filepath.Join(pkgPath, outDir)
-	}
+		if r.IsOutOfPlace() {
+			destDir = filepath.Join(pkgPath, outDir)
+		}
 
-	// copy package to temp directory
-	err = copyDir(r.testCase.Path, pkgPath)
-	if err != nil {
-		return fmt.Errorf("failed to copy package: %w", err)
-	}
-	err = copyDir(r.testCase.Path, origPkgPath)
-	if err != nil {
-		return fmt.Errorf("failed to copy package: %w", err)
-	}
+		// copy package to temp directory
+		err = copyDir(r.testCase.Path, pkgPath)
+		if err != nil {
+			return fmt.Errorf("failed to copy package: %w", err)
+		}
+		err = copyDir(r.testCase.Path, origPkgPath)
+		if err != nil {
+			return fmt.Errorf("failed to copy package: %w", err)
+		}
 
-	// init and commit package files
-	err = r.preparePackage(pkgPath)
-	if err != nil {
-		return fmt.Errorf("failed to prepare package: %w", err)
-	}
+		// init and commit package files
+		err = r.preparePackage(pkgPath)
+		if err != nil {
+			return fmt.Errorf("failed to prepare package: %w", err)
+		}
 
-	// run function
-	for i := 0; i < r.testCase.Config.RunCount(); i++ {
 		err = r.runSetupScript(pkgPath)
 		if err != nil {
 			return err
@@ -391,7 +389,7 @@ func (r *Runner) runFnRender() error {
 			r.t.Logf("kpt error, stdout: %s; stderr: %s", stdout, stderr)
 		}
 		// compare results
-		err = r.compareResult(i, fnErr, stdout, sanitizeTimestamps(stderr), pkgPath, resultsDir)
+		err = r.compareResult(fnErr, stdout, sanitizeTimestamps(stderr), pkgPath, resultsDir)
 		if err != nil {
 			return err
 		}
@@ -401,6 +399,12 @@ func (r *Runner) runFnRender() error {
 		if err != nil {
 			return err
 		}
+
+		// cleanup temp directory after iteration
+		if !r.testCase.Config.Debug {
+			os.RemoveAll(tmpDir)
+		}
+
 		if fnErr != nil {
 			break
 		}
@@ -428,7 +432,7 @@ func (r *Runner) preparePackage(pkgPath string) error {
 	return err
 }
 
-func (r *Runner) compareResult(cnt int, exitErr error, stdout string, inStderr string, tmpPkgPath, resultsPath string) error {
+func (r *Runner) compareResult(exitErr error, stdout string, inStderr string, tmpPkgPath, resultsPath string) error {
 	stderr := r.stripLines(inStderr, r.testCase.Config.StdErrStripLines)
 
 	expected, err := newExpected(tmpPkgPath)
@@ -447,44 +451,40 @@ func (r *Runner) compareResult(cnt int, exitErr error, stdout string, inStderr s
 		return fmt.Errorf("actual exit code %d doesn't match expected %d", exitCode, r.testCase.Config.ExitCode)
 	}
 
-	// we only check output and results for the first iteration of running because
-	// idempotency is only applied to changes in file system.
-	if cnt == 0 {
-		err = r.compareOutput(stdout, stderr)
-		if err != nil {
-			return err
-		}
+	err = r.compareOutput(stdout, stderr)
+	if err != nil {
+		return err
+	}
 
-		// compare results
-		actual, err := readActualResults(resultsPath)
-		if err != nil {
-			return fmt.Errorf("failed to read actual results: %w", err)
-		}
+	// compare results
+	actualResults, err := readActualResults(resultsPath)
+	if err != nil {
+		return fmt.Errorf("failed to read actual results: %w", err)
+	}
 
-		actual = r.stripLines(actual, r.testCase.Config.ActualStripLines)
+	actualResults = r.stripLines(actualResults, r.testCase.Config.ActualStripLines)
 
-		diffOfResult, err := diffStrings(actual, expected.Results)
-		if err != nil {
-			return fmt.Errorf("error when run diff of results: %w: %s", err, diffOfResult)
-		}
-		if actual != expected.Results {
-			return fmt.Errorf("actual results doesn't match expected\nActual\n===\n%s\nDiff of Results\n===\n%s",
-				actual, diffOfResult)
-		}
+	diffOfResult, err := diffStrings(actualResults, expected.Results)
+	if err != nil {
+		return fmt.Errorf("error when run diff of results: %w: %s", err, diffOfResult)
+	}
+	if actualResults != expected.Results {
+		return fmt.Errorf("actual results doesn't match expected\nActual\n===\n%s\nDiff of Results\n===\n%s",
+			actualResults, diffOfResult)
 	}
 
 	// compare diff
-	actual, err := readActualDiff(tmpPkgPath, r.initialCommit)
+	actualDiff, err := readActualDiff(tmpPkgPath, r.initialCommit)
 	if err != nil {
 		return fmt.Errorf("failed to read actual diff: %w", err)
 	}
-	if actual != expected.Diff {
-		diffOfDiff, err := diffStrings(actual, expected.Diff)
+	if actualDiff != expected.Diff {
+		diffOfDiff, err := diffStrings(actualDiff, expected.Diff)
 		if err != nil {
 			return fmt.Errorf("error when run diff of diff: %w: %s", err, diffOfDiff)
 		}
 		return fmt.Errorf("actual diff doesn't match expected\nActual\n===\n%s\nDiff of Diff\n===\n%s",
-			actual, diffOfDiff)
+			actualDiff, diffOfDiff)
 	}
 	return nil
 }
