kptdev
diff --git a/‎api/porch/v1alpha1/util.go‎
Lines changed: 46 additions & 29 deletions b/‎api/porch/v1alpha1/util.go‎
Lines changed: 46 additions & 29 deletions
diff --git a/‎api/porch/v1alpha1/util_test.go‎
Lines changed: 38 additions & 31 deletions b/‎api/porch/v1alpha1/util_test.go‎
Lines changed: 38 additions & 31 deletions
diff --git a/‎docs/content/en/docs/2_concepts/subpackages.md‎
Lines changed: 37 additions & 5 deletions b/‎docs/content/en/docs/2_concepts/subpackages.md‎
Lines changed: 37 additions & 5 deletions
diff --git a/‎docs/content/en/docs/4_tutorials_and_how-tos/working_with_package_revisions/working-with-subpackages.md‎
Lines changed: 3 additions & 0 deletions b/‎docs/content/en/docs/4_tutorials_and_how-tos/working_with_package_revisions/working-with-subpackages.md‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎docs/content/en/docs/7_cli_api/porchctl.md‎
Lines changed: 9 additions & 1 deletion b/‎docs/content/en/docs/7_cli_api/porchctl.md‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎docs/content/en/docs/9_troubleshooting_and_faq/lazy-dog/_index.md‎
Lines changed: 10 additions & 6 deletions b/‎docs/content/en/docs/9_troubleshooting_and_faq/lazy-dog/_index.md‎
Lines changed: 10 additions & 6 deletions
diff --git a/‎pkg/cli/commands/rpkg/clone/command.go‎
Lines changed: 3 additions & 2 deletions b/‎pkg/cli/commands/rpkg/clone/command.go‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎pkg/cli/commands/rpkg/upgrade/command.go‎
Lines changed: 2 additions & 2 deletions b/‎pkg/cli/commands/rpkg/upgrade/command.go‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎pkg/cli/commands/rpkg/upgrade/command_test.go‎
Lines changed: 14 additions & 0 deletions b/‎pkg/cli/commands/rpkg/upgrade/command_test.go‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎pkg/task/generictaskhandler.go‎
Lines changed: 4 additions & 3 deletions b/‎pkg/task/generictaskhandler.go‎
Lines changed: 4 additions & 3 deletions
@@ -19,15 +19,15 @@ import (
 	"regexp"
 	"slices"
 	"strings"
+
+	pkgerrors "github.com/pkg/errors"
+	"k8s.io/apimachinery/pkg/util/validation"
 )
 
-// Valid relative paths should not start with '/', should not contain '..' components,
-// and should only contain valid path characters
+// validRelativePathRegex validates the basic shape of a relative path (slash-separated segments made of allowed characters).
+// Additional constraints (e.g. no leading/trailing '/', no '.', and DNS1123-compliant name composition) are enforced in IsValidSubpackageDir.
 var validRelativePathRegex = regexp.MustCompile(`^(?:[a-zA-Z0-9._-]+(?:/[a-zA-Z0-9._-]+)*)?$`)
 
-// Check that there are no '..' components in a path
-var noDoubleDots = regexp.MustCompile(`(^|/)\.\.(/|$)`)
-
 func (pr *PackageRevision) IsPublished() bool {
 	return LifecycleIsPublished(pr.Spec.Lifecycle)
 }
@@ -105,10 +105,49 @@ func GetSubpackageDir(pkgRev *PackageRevision) (string, error) {
 	}
 
 	subpackageDir := getSubpackageDir(pkgRev.Spec.Tasks[1])
-	if IsValidSubpackageDir(subpackageDir) {
+	if err := IsValidSubpackageDir(subpackageDir); err == nil {
 		return subpackageDir, nil
 	} else {
-		return "", fmt.Errorf("subpackage directory %q is invalid", subpackageDir)
+		return "", err
+	}
+}
+
+// IsValidSubpackageDir returns an error if subpackageDir is invalid.
+func IsValidSubpackageDir(subpackageDir string) error {
+	// Empty string is invalid, a subpackage directory must be a relative path.
+	if subpackageDir == "" {
+		return pkgerrors.Errorf("subpackage directory %q is invalid", subpackageDir)
+	}
+
+	// Check basic format and ensure it doesn't start with '/', doesn't end with '/', and doesn't contain '.'
+	if subpackageDir[0] == '/' || strings.HasSuffix(subpackageDir, "/") || strings.Contains(subpackageDir, ".") {
+		return pkgerrors.Errorf("subpackage directory %q is invalid, it cannot contain '.' or start with '/' or end with '/'", subpackageDir)
+	}
+
+	if !validRelativePathRegex.MatchString(subpackageDir) {
+		return pkgerrors.Errorf("subpackage directory %q is invalid, it must match regular expression %q", subpackageDir, validRelativePathRegex.String())
+	}
+
+	if _, err := ComposeSubpkgObjName(subpackageDir); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func ComposeSubpkgObjName(subpackageDir string) (string, error) {
+	if subpackageDir == "" {
+		return "", pkgerrors.Errorf("subpackage directory %q is invalid", subpackageDir)
+	}
+
+	subpackageName := strings.ReplaceAll(subpackageDir, "/", ".")
+
+	objNameErrs := validation.IsDNS1123Subdomain(subpackageName)
+
+	if len(objNameErrs) == 0 {
+		return subpackageName, nil
+	} else {
+		return "", pkgerrors.Errorf("subpackage resource name %q invalid: %s", subpackageName, strings.Join(objNameErrs, ","))
 	}
 }
 
@@ -130,28 +169,6 @@ func getSubpackageDir(task Task) string {
 	}
 }
 
-// IsValidSubpackageDir returns true if subpackageDir is valid, false otherwise.
-func IsValidSubpackageDir(subpackageDir string) bool {
-	// Empty string is invalid, a subpackage directory must be a relative path.
-	if subpackageDir == "" {
-		return false
-	}
-
-	// Check basic format and ensure it doesn't contain '..' or start with '/' or end with '/'
-	if subpackageDir[0] == '/' || strings.HasSuffix(subpackageDir, "/") || noDoubleDots.MatchString(subpackageDir) {
-		return false
-	}
-
-	// Reject any path segment equal to "." (for example ".", "./subpkg", or "subpkg/./nested").
-	for _, segment := range strings.Split(subpackageDir, "/") {
-		if segment == "." {
-			return false
-		}
-	}
-
-	return validRelativePathRegex.MatchString(subpackageDir)
-}
-
 func (pr *PackageRevision) IsPushOnRenderFailure() bool {
 	ann := pr.GetAnnotations()
 	v, ok := ann[PushOnFnRenderFailureKey]
 
@@ -23,45 +23,52 @@ import (
 
 func TestIsValidSubpackageDir(t *testing.T) {
 	tests := []struct {
-		name     string
-		dir      string
-		expected bool
+		name        string
+		dir         string
+		expectValid bool
 	}{
 		// Invalid cases
-		{name: "empty string", dir: "", expected: false},
-		{name: "leading slash", dir: "/subpkg", expected: false},
-		{name: "trailing slash", dir: "subpkg/", expected: false},
-		{name: "double dots at start", dir: "../subpkg", expected: false},
-		{name: "double dots in middle", dir: "sub/../pkg", expected: false},
-		{name: "double dots at end", dir: "subpkg/..", expected: false},
-		{name: "only double dots", dir: "..", expected: false},
-		{name: "dot segment at start", dir: "./subpkg", expected: false},
-		{name: "dot segment in middle", dir: "sub/./pkg", expected: false},
-		{name: "only dot", dir: ".", expected: false},
-		{name: "leading and trailing slash", dir: "/subpkg/", expected: false},
-		{name: "spaces in path", dir: "sub pkg", expected: false},
-		{name: "special characters", dir: "sub@pkg", expected: false},
-		{name: "backslash", dir: "sub\\pkg", expected: false},
-		{name: "colon in path", dir: "sub:pkg", expected: false},
-		{name: "empty segment (double slash)", dir: "sub//pkg", expected: false},
+		{name: "empty string", dir: "", expectValid: false},
+		{name: "leading slash", dir: "/subpkg", expectValid: false},
+		{name: "trailing slash", dir: "subpkg/", expectValid: false},
+		{name: "double dots at start", dir: "../subpkg", expectValid: false},
+		{name: "double dots in middle", dir: "sub/../pkg", expectValid: false},
+		{name: "double dots at end", dir: "subpkg/..", expectValid: false},
+		{name: "only double dots", dir: "..", expectValid: false},
+		{name: "dot segment at start", dir: "./subpkg", expectValid: false},
+		{name: "dot segment in middle", dir: "sub/./pkg", expectValid: false},
+		{name: "only dot", dir: ".", expectValid: false},
+		{name: "leading and trailing slash", dir: "/subpkg/", expectValid: false},
+		{name: "spaces in path", dir: "sub pkg", expectValid: false},
+		{name: "special characters", dir: "sub@pkg", expectValid: false},
+		{name: "backslash", dir: "sub\\pkg", expectValid: false},
+		{name: "colon in path", dir: "sub:pkg", expectValid: false},
+		{name: "empty segment (double slash)", dir: "sub//pkg", expectValid: false},
+		{name: "with underscores (invalid DNS)", dir: "my_subpkg", expectValid: false},
+		{name: "mixed with underscores (invalid DNS)", dir: "my-sub_pkg.v1/nested-dir", expectValid: false},
+		{name: "with dots in name", dir: "my.subpkg", expectValid: false},
 
 		// Valid cases
-		{name: "simple directory", dir: "subpkg", expected: true},
-		{name: "nested directory", dir: "path/to/subpkg", expected: true},
-		{name: "two levels", dir: "sub/pkg", expected: true},
-		{name: "with hyphens", dir: "my-subpkg", expected: true},
-		{name: "with underscores", dir: "my_subpkg", expected: true},
-		{name: "with dots in name", dir: "my.subpkg", expected: true},
-		{name: "numeric name", dir: "123", expected: true},
-		{name: "mixed valid chars", dir: "my-sub_pkg.v1/nested-dir", expected: true},
-		{name: "deeply nested", dir: "a/b/c/d/e", expected: true},
-		{name: "single char segments", dir: "a/b/c", expected: true},
+		{name: "simple directory", dir: "subpkg", expectValid: true},
+		{name: "nested directory", dir: "path/to/subpkg", expectValid: true},
+		{name: "two levels", dir: "sub/pkg", expectValid: true},
+		{name: "with hyphens", dir: "my-subpkg", expectValid: true},
+		{name: "numeric name", dir: "123", expectValid: true},
+		{name: "deeply nested", dir: "a/b/c/d/e", expectValid: true},
+		{name: "single char segments", dir: "a/b/c", expectValid: true},
+		{name: "starts with digit", dir: "1subpackage", expectValid: true},
+		{name: "ends with digit", dir: "subpackage1", expectValid: true},
+		{name: "contains digits", dir: "1subpckage2/3subpackage4/5subpackage6", expectValid: true},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			result := IsValidSubpackageDir(tt.dir)
-			assert.Equal(t, tt.expected, result)
+			err := IsValidSubpackageDir(tt.dir)
+			if tt.expectValid {
+				assert.NoError(t, err)
+			} else {
+				assert.Error(t, err)
+			}
 		})
 	}
 }
 
@@ -40,7 +40,8 @@ parent package revision. The clone operation:
 
 1. Copies the upstream package contents into the specified subdirectory
 2. Preserves the upstream's `Kptfile`
-3. Adds the origin information of the subpackage to the `Kptfile` of the cloned subpackage
+3. Updates the `metadata.name` of the subpackage
+4. Adds the origin information of the subpackage to the `Kptfile` of the cloned subpackage
 
 ```bash
 porchctl rpkg clone upstream-repo.blueprint.v1 deployment.my-app.v2 \
@@ -57,9 +58,10 @@ When a new version of the upstream package is published, the independent subpack
 the parent package. The upgrade operation:
 
 1. Reads the subpackage's `Kptfile` to determine its current upstream source
-2. Merges the new upstream version into the subpackage directory employing the specified strategy,
-  using the same mechanism as a regular package revision upgrade
-3. Updates the origin information of the subpackage in the `Kptfile` of the cloned subpackage
+2. Merges the new upstream version into the subpackage directory employing the specified strategy, using the same mechanism
+as a regular package revision upgrade
+3. Updates the `metadata.name` of the subpackage
+4. Updates the origin information of the subpackage in the `Kptfile` of the cloned subpackage
 
 ```bash
 porchctl rpkg upgrade deployment.my-app.v2 \
@@ -77,7 +79,7 @@ one after another before it is proposed and approved.
 ## Constraints
 
 - The parent package revision must be in **Draft** state for both clone and upgrade operations
-- The `--subpackage-dir` path must be a valid relative path (no leading `/`, `./`, or `..` segments)
+- The `--subpackage-dir` path must be a valid relative path (no leading `/`, `./`, `.`, or `..` segments) and comply with the subpackage directory naming rules described in the [subpackage naming](#subpackage-naming) section below.
 - For clone: the subdirectory must **not already exist** in the package
 - For upgrade: the subdirectory **must already exist** and contain a valid `Kptfile` with upstream information
 - `--workspace` and `--repository` must not be specified when using `--subpackage-dir`
@@ -91,6 +93,36 @@ one after another before it is proposed and approved.
 | Upgrade | Creates a new package revision | Modifies the parent package revision in-place |
 | Tracking | PackageRevision tracks upstream | Subpackage's Kptfile tracks upstream |
 
+## Subpackage Naming
+
+When Porch clones or upgrades a subpackage it names the subpackage (sets `metadata.name`) based on the `--subpackage-dir` parameter value (`subpackageDir` on the API).
+It creates a Kubernetes-compliant DNS subdomain name and inserts it in the `metadata.name` field of the Kptfile.
+
+Porch converts any “/“ characters in the `--subpackage-dir` (or `subpackageDir` on the API) value into ‘.’ characters to create a
+[valid Kubernetes DNS Subdomain name](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/). This creates a
+unique name for the subpackage in the package. This means that `--subpackage-dir` and `subpackageDir` values are restricted to the rules for subdomain
+names in `--subpackage-dir` and `subpackageDir` values.
+
+- No more than 253 characters (after replacing "/" with ".")
+- Only lowercase alphanumeric characters, "-", "/" ("/" is converted to ".")
+- Must start and end with an alphanumeric character (letter or digit)
+
+This [Kubernetes validation IsDNS1123Subdomain() function](https://github.com/kubernetes/apimachinery/blob/master/pkg/util/validation/validation.go)
+is used to check the value once "/" characters are replaced with "." characters.
+
+So the following `subpackageDir` values result in the following `metadata.name` values in the Kptfile:
+
+| subpackageDir                            | metadata.name                            |
+|------------------------------------------|------------------------------------------|
+| subpackage                               | subpackage                               |
+| ran/subpackage                           | ran.subpackage                           |
+| ran/south/southeast/region-1a/subpackage | ran.south.southeast.region-1a.subpackage |
+| 1subpackage                              | 1subpackage                              |
+| 1subpckage2/3subpackage4/5subpackage6    | 1subpckage2.3subpackage4.5subpackage6    |
+| Subpackage                               | error (Uppercase character)              |
+| sub_package                              | error ("_" illegal)                      |
+| ran\subpackage                           | error ("\\" illegal)                     |
+
 ## Key Points
 
 - Independent subpackages enable composing a package from multiple upstream sources
 
@@ -24,6 +24,9 @@ Unlike a regular clone (which creates a new package revision), a subpackage clon
 Draft package revision. Similarly, a subpackage upgrade modifies the parent package revision in-place rather than
 creating a new one.
 
+Note that **Subpackage directory** paths must follow the
+[rules described on the subpackage page]({{% relref "/docs/2_concepts/subpackages/#subpackage-naming" %}}).
+
 ## Prerequisites
 
 Before following this guide, ensure you have:
 
@@ -327,13 +327,17 @@ porchctl rpkg clone SOURCE_PACKAGE NAME [flags]
 | Flag | Description | Default |
 |------|-------------|---------|
 | `--repository string` | Downstream repository for cloned package | (required unless `--subpackage-dir` is set) |
-| `--workspace string` | Workspace name for new package | `v1` (ignored when `--subpackage-dir` is set; must not be explicitly specified) |
+| `--workspace string` | Workspace name for new package | `v1` (must not be explicitly specified together with `--subpackage-dir`) |
 | `--directory string` | Directory within upstream repository (Git only) | |
 | `--ref string` | Branch, tag, or SHA in upstream repository (Git only) | |
 | `--strategy string` | Update strategy: `resource-merge`, `fast-forward`, `force-delete-replace`, `copy-merge` | `resource-merge` |
 | `--secret-ref string` | Secret name for basic auth (Git only) | |
 | `--subpackage-dir string` | Directory path into which the upstream package will be cloned as an independent subpackage. When set, `NAME` refers to the parent package revision (which must be in Draft state), and `--repository`/`--workspace` must not be specified. | |
 
+Note that **--subpackage-dir** paths must follow the
+[rules described on the subpackage page]({{% relref "/docs/2_concepts/subpackages/#subpackage-naming" %}}).
+
+
 **Examples:**
 
 ```bash
@@ -597,6 +601,10 @@ porchctl rpkg upgrade SOURCE_PACKAGE_REVISION [flags]
 | `--discover string` | Discover available updates instead of upgrading. Options: `upstream`, `downstream` | |
 | `--subpackage-dir string` | Directory path of an independent subpackage to upgrade within the parent package. When set, `SOURCE_PACKAGE_REVISION` refers to the parent Draft package revision, and `--workspace` must not be specified. | |
 
+
+Note that **--subpackage-dir** paths must follow the
+[rules described on the subpackage page]({{% relref "/docs/2_concepts/subpackages/#subpackage-naming" %}}).
+
 **Examples:**
 
 ```bash
 
@@ -58,11 +58,15 @@ into your Starlark script, which will cause an error and trigger the output:
 You can use the Porch Kubernetes API directly (via `kubectl` or `curl`) to clone an upstream package as an independent
 subpackage into an existing Draft package revision, and to upgrade that subpackage later.
 
+Note that **subpackageDir** paths must follow the
+[rules described on the subpackage page]({{% relref "/docs/2_concepts/subpackages/#subpackage-naming" %}}).
+
 ### Cloning a subpackage via the API
 
- To clone an upstream package into a subdirectory of an existing Draft package revision, update the parent `PackageRevision` by appending
- an additional task of type `clone` that includes `subpackageDir` (for example via `kubectl apply` / server-side apply, or
- a PATCH request). The parent must already exist in Draft state with exactly one task.
+To clone an upstream package into a subdirectory of an existing Draft package revision, update the parent `PackageRevision` by appending
+an additional task of type `clone` that includes `subpackageDir` (for example via `kubectl apply` / server-side apply, or
+a PATCH request). The parent must already exist in Draft state with exactly one task.
+
 
 ```json
 {
@@ -107,9 +111,9 @@ Key points:
 
 ### Upgrading a subpackage via the API
 
- To upgrade an existing independent subpackage, update the parent `PackageRevision` by appending
- an additional task of type `upgrade` that includes `subpackageDir` (for example via `kubectl apply` / server-side apply,
- or a PATCH request). The parent must be in Draft state with exactly one task.
+To upgrade an existing independent subpackage, update the parent `PackageRevision` by appending
+an additional task of type `upgrade` that includes `subpackageDir` (for example via `kubectl apply` / server-side apply,
+or a PATCH request). The parent must be in Draft state with exactly one task.
 
 ```json
 {
 
@@ -24,6 +24,7 @@ import (
 	porchapi "github.com/kptdev/porch/api/porch/v1alpha1"
 	cliutils "github.com/kptdev/porch/internal/cliutils"
 	"github.com/kptdev/porch/pkg/cli/commands/rpkg/docs"
+	pkgerrors "github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -108,8 +109,8 @@ func (r *runner) preRunE(_ *cobra.Command, args []string) error {
 		}
 
 	} else {
-		if !porchapi.IsValidSubpackageDir(r.subpackageDir) {
-			return errors.E(op, fmt.Errorf("invalid --subpackage-dir %q", r.subpackageDir))
+		if err = porchapi.IsValidSubpackageDir(r.subpackageDir); err != nil {
+			return errors.E(op, pkgerrors.Wrapf(err, "invalid --subpackage-dir %q", r.subpackageDir))
 		}
 
 		r.clone.SubpackageDir = r.subpackageDir
 
@@ -122,8 +122,8 @@ func (r *runner) preRunE(_ *cobra.Command, args []string) error {
 				return errors.E(op, fmt.Errorf("workspace is required"))
 			}
 		} else {
-			if !porchapi.IsValidSubpackageDir(r.subpackageDir) {
-				return errors.E(op, fmt.Errorf("invalid --subpackage-dir %q", r.subpackageDir))
+			if err = porchapi.IsValidSubpackageDir(r.subpackageDir); err != nil {
+				return errors.E(op, pkgerrors.Wrapf(err, "invalid --subpackage-dir %q", r.subpackageDir))
 			}
 
 			if r.Command.Flags().Changed("workspace") {
 
@@ -220,6 +220,20 @@ func TestPreRunSubpackageDir(t *testing.T) {
 		err := r.preRunE(r.Command, []string{"some-pr"})
 		assert.NoError(t, err)
 	})
+
+	t.Run("Subpackage upgrade with invalid subpackage-dir returns error", func(t *testing.T) {
+		r := &runner{
+			ctx:           context.Background(),
+			cfg:           &genericclioptions.ConfigFlags{Namespace: func() *string { s := ns; return &s }()},
+			Command:       NewCommand(context.Background(), &genericclioptions.ConfigFlags{Namespace: func() *string { s := ns; return &s }()}),
+			revision:      2,
+			subpackageDir: "../invalid",
+			strategy:      "resource-merge",
+		}
+		err := r.preRunE(r.Command, []string{"some-pr"})
+		assert.Error(t, err)
+		assert.Contains(t, err.Error(), `invalid --subpackage-dir "../invalid"`)
+	})
 }
 
 func TestUpgradeCommand(t *testing.T) {
 
@@ -277,12 +277,13 @@ func (th *genericTaskHandler) applySubpackageTask(
 		return err
 	}
 
-	if err := kptFile.SetName(path.Base(subpackageDir)); err != nil {
-		return pkgerrors.Wrapf(err, "failed to write package name %q to subpackage Kptfile", path.Base(subpackageDir))
+	subpackageName, _ := porchapi.ComposeSubpkgObjName(subpackageDir)
+	if err := kptFile.SetName(subpackageName); err != nil {
+		return pkgerrors.Wrapf(err, "failed to write package name %q to subpackage Kptfile", subpackageName)
 	}
 
 	if err := kptFile.WriteToPackage(subpackageResources.Contents); err != nil {
-		return pkgerrors.Wrap(err, "failed to write to subpackage Kptfile")
+		return pkgerrors.Wrapf(err, "failed to write to subpackage Kptfile %q", path.Join(subpackageDir, kptfilev1.KptFileName))
 	}
 
 	// Remove the subpackage task to prevent re-execution of the task
Original file line number	Diff line number	Diff line change
`@@ -122,8 +122,8 @@ func (r runner) preRunE(_ cobra.Command, args []string) error {`
`122`	`122`	`return errors.E(op, fmt.Errorf("workspace is required"))`
`123`	`123`	`}`
`124`	`124`	`} else {`
`125`		`- if !porchapi.IsValidSubpackageDir(r.subpackageDir) {`
`126`		`- return errors.E(op, fmt.Errorf("invalid --subpackage-dir %q", r.subpackageDir))`
	`125`	`+ if err = porchapi.IsValidSubpackageDir(r.subpackageDir); err != nil {`
	`126`	`+ return errors.E(op, pkgerrors.Wrapf(err, "invalid --subpackage-dir %q", r.subpackageDir))`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`if r.Command.Flags().Changed("workspace") {`
Original file line number	Diff line number	Diff line change
`@@ -277,12 +277,13 @@ func (th *genericTaskHandler) applySubpackageTask(`
`277`	`277`	`return err`
`278`	`278`	`}`
`279`	`279`
`280`		`- if err := kptFile.SetName(path.Base(subpackageDir)); err != nil {`
`281`		`- return pkgerrors.Wrapf(err, "failed to write package name %q to subpackage Kptfile", path.Base(subpackageDir))`
	`280`	`+ subpackageName, _ := porchapi.ComposeSubpkgObjName(subpackageDir)`
	`281`	`+ if err := kptFile.SetName(subpackageName); err != nil {`
	`282`	`+ return pkgerrors.Wrapf(err, "failed to write package name %q to subpackage Kptfile", subpackageName)`
`282`	`283`	`}`
`283`	`284`
`284`	`285`	`if err := kptFile.WriteToPackage(subpackageResources.Contents); err != nil {`
`285`		`- return pkgerrors.Wrap(err, "failed to write to subpackage Kptfile")`
	`286`	`+ return pkgerrors.Wrapf(err, "failed to write to subpackage Kptfile %q", path.Join(subpackageDir, kptfilev1.KptFileName))`
`286`	`287`	`}`
`287`	`288`
`288`	`289`	`// Remove the subpackage task to prevent re-execution of the task`