Clear the status of the subpackage Kptfile on subpackage clones and upgrades (#1118)

* Updated upstream

Signed-off-by: liamfallon <liam.fallon@est.tech>

* Clear of status of kptfile in subpackages implemented

Signed-off-by: liamfallon <liam.fallon@est.tech>

* Updated error messages

Signed-off-by: liamfallon <liam.fallon@est.tech>

* Added unit tests

Signed-off-by: liamfallon <liam.fallon@est.tech>

* Address CoPilot comments

Signed-off-by: liamfallon <liam.fallon@est.tech>

---------

Signed-off-by: liamfallon <liam.fallon@est.tech>

Author: liamfallon

pkg/task/generictaskhandler.go

@@ -280,7 +280,11 @@ func (th *genericTaskHandler) applySubpackageTask(
 
 	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)
+		return pkgerrors.Wrapf(err, "failed to write package name %q to subpackage Kptfile %q", subpackageName, path.Join(subpackageDir, kptfilev1.KptFileName))
+	}
+
+	if err := kptFile.ClearStatus(); err != nil {
+		return pkgerrors.Wrapf(err, "failed to clear status in Kptfile %q", path.Join(subpackageDir, kptfilev1.KptFileName))
 	}
 
 	if err := kptFile.WriteToPackage(subpackageResources.Contents); err != nil {

pkg/task/generictaskhandler_test.go

@@ -1416,8 +1416,96 @@ func TestApplySubpackageTask_InvalidSubpackageName(t *testing.T) {
 
 	err := th.applySubpackageTask(context.Background(), draft, obj, repository.PackageResources{Contents: map[string]string{}})
 	require.Error(t, err)
-	assert.Contains(t, err.Error(), "subpackage resource name")
-	assert.Contains(t, err.Error(), "lowercase RFC 1123 subdomain")
+	require.Contains(t, err.Error(), "subpackage resource name")
+}
+
+func TestApplySubpackageTask_CheckKptfileStatusCleared(t *testing.T) {
+	// SubpackageDir that produces an invalid k8s name (uppercase letters)
+	upstreamPrKey := repository.PackageRevisionKey{
+		PkgKey: repository.PackageKey{
+			RepoKey: repository.RepositoryKey{
+				Namespace: "default",
+				Name:      "upstream-repo",
+			},
+			Package: "subpkg",
+		},
+		WorkspaceName: "ws",
+		Revision:      1,
+	}
+
+	upstreamPR := &fakeextrepo.FakePackageRevision{
+		PrKey: upstreamPrKey,
+		Resources: &porchapi.PackageRevisionResources{
+			Spec: porchapi.PackageRevisionResourcesSpec{
+				Resources: map[string]string{
+					kptfilev1.KptFileName: "apiVersion: kpt.dev/v1\nkind: Kptfile\nmetadata:\n  name: subpkg\nstatus:\n  conditions:\n",
+				},
+			},
+		},
+		Kptfile: kptfilev1.KptFile{
+			Upstream: &kptfilev1.Upstream{
+				Type: kptfilev1.GitOrigin,
+				Git:  &kptfilev1.Git{Repo: "https://github.com/example/repo.git", Ref: "main", Directory: "/subpkg"},
+			},
+			UpstreamLock: &kptfilev1.Locator{
+				Type: kptfilev1.GitOrigin,
+				Git:  &kptfilev1.GitLock{Repo: "https://github.com/example/repo.git", Ref: "main", Directory: "/subpkg", Commit: "abc123"},
+			},
+		},
+	}
+
+	fakeRepo := &fakeextrepo.Repository{
+		PackageRevisions: []repository.PackageRevision{upstreamPR},
+	}
+
+	obj := &porchapi.PackageRevision{
+		Spec: porchapi.PackageRevisionSpec{
+			Tasks: []porchapi.Task{
+				{Type: porchapi.TaskTypeClone, Clone: &porchapi.PackageCloneTaskSpec{}},
+				{
+					Type: porchapi.TaskTypeClone,
+					Clone: &porchapi.PackageCloneTaskSpec{
+						SubpackageDir: "my-subpackage",
+						Upstream: porchapi.UpstreamPackage{
+							UpstreamRef: &porchapi.PackageRevisionRef{
+								Name: "upstream-repo.subpkg.ws",
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	draft := &fakeextrepo.FakePackageRevision{
+		PrKey: repository.PackageRevisionKey{
+			PkgKey: repository.PackageKey{
+				RepoKey: repository.RepositoryKey{
+					Namespace: "default",
+					Name:      "test-repo",
+				},
+				Package: "test-pkg",
+			},
+			WorkspaceName: "ws",
+		},
+		Resources: &porchapi.PackageRevisionResources{
+			Spec: porchapi.PackageRevisionResourcesSpec{
+				Resources: map[string]string{},
+			},
+		},
+	}
+
+	th := &genericTaskHandler{
+		referenceResolver: &mockReferenceResolver{repo: &configapi.Repository{}},
+		repoOpener:        &mockRepositoryOpener{repo: fakeRepo},
+	}
+
+	resources := repository.PackageResources{Contents: map[string]string{}}
+
+	err := th.applySubpackageTask(context.Background(), draft, obj, resources)
+	require.NoError(t, err)
+	require.Contains(t, upstreamPR.Resources.Spec.Resources[kptfilev1.KptFileName], "\nstatus:")
+	require.NotContains(t, resources.Contents["my-subpackage/"+kptfilev1.KptFileName], "\nstatus:")
 }
 
 type mockReferenceResolver struct {