Make labels and annotations in the Kptfile accessible via the PackageRevision object (kptdev#375)

* Introduce packageMetadata field to PackageRevision

* Add .status.selfLock field to api packagerevision

* Implement packageMetadata updates

* remove sorting of slices in SetConditions, fix rebase, fix tests

* PackageRevision field selectors for Kptfile labels

* add missing PackageMetadata return to db cache, add basens/v4 with labels and annotations, fix .env read for make

* fix cli e2e

* fix cli e2e even more

* resolve bundle conflict

* update bundle + adapt to merged e2e tests

* fix bad cli e2e merge

---------

Co-authored-by: jkosimov <javlonbek.kosimov@nokia.com>

Author: mozesl-nokia

Makefile

@@ -47,6 +47,7 @@ KIND_CONTEXT_NAME ?= porch-test
 # Include environment file if it exists
 ifneq ("$(wildcard .env)", "")
     include .env
+    export
 endif
 
 # Include module makefiles
@@ -77,4 +78,3 @@ dev: build check ## Full development cycle (build + check)
 
 .PHONY: quick-test
 quick-test: fmt vet test ## Quick development test cycle
-

api/generated/openapi/zz_generated.openapi.go

@@ -118,6 +118,13 @@ type PackageRevisionSpec struct {
 	Tasks []Task `json:"tasks,omitempty"`
 
 	ReadinessGates []ReadinessGate `json:"readinessGates,omitempty"`
+
+	PackageMetadata *PackageMetadata `json:"packageMetadata,omitempty"`
+}
+
+type PackageMetadata struct {
+	Labels      map[string]string `json:"labels,omitempty"`
+	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
 type ReadinessGate struct {
@@ -135,7 +142,10 @@ type ParentReference struct {
 // PackageRevisionStatus defines the observed state of PackageRevision
 type PackageRevisionStatus struct {
 	// UpstreamLock identifies the upstream data for this package.
-	UpstreamLock *UpstreamLock `json:"upstreamLock,omitempty"`
+	UpstreamLock *Locator `json:"upstreamLock,omitempty"`
+
+	// SelfLock identifies the location of the current package's data
+	SelfLock *Locator `json:"selfLock,omitempty"`
 
 	// PublishedBy is the identity of the user who approved the packagerevision.
 	PublishedBy string `json:"publishedBy,omitempty"`
@@ -311,14 +321,14 @@ type Selector struct {
 	Namespace string `json:"namespace,omitempty"`
 }
 
-// The following types (UpstreamLock, OriginType, and GitLock) are duplicates from the kpt library.
+// The following types (Locator, OriginType, and GitLock) are duplicates from the kpt library.
 // We are repeating them here to avoid cyclic dependencies, but these duplicate type should be removed when
 // https://github.com/kptdev/kpt/issues/3297 is resolved.
 
 type OriginType string
 
-// UpstreamLock is a resolved locator for the last fetch of the package.
-type UpstreamLock struct {
+// Locator is a resolved locator for the last fetch of the package.
+type Locator struct {
 	// Type is the type of origin.
 	Type OriginType `json:"type,omitempty"`
 

api/porch/types.go

@@ -119,6 +119,13 @@ type PackageRevisionSpec struct {
 	Tasks []Task `json:"tasks,omitempty"`
 
 	ReadinessGates []ReadinessGate `json:"readinessGates,omitempty"`
+
+	PackageMetadata *PackageMetadata `json:"packageMetadata,omitempty"`
+}
+
+type PackageMetadata struct {
+	Labels      map[string]string `json:"labels,omitempty"`
+	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
 type ReadinessGate struct {
@@ -136,7 +143,10 @@ type ParentReference struct {
 // PackageRevisionStatus defines the observed state of PackageRevision
 type PackageRevisionStatus struct {
 	// UpstreamLock identifies the upstream data for this package.
-	UpstreamLock *UpstreamLock `json:"upstreamLock,omitempty"`
+	UpstreamLock *Locator `json:"upstreamLock,omitempty"`
+
+	// SelfLock identifies the location of the current package's data
+	SelfLock *Locator `json:"selfLock,omitempty"`
 
 	// PublishedBy is the identity of the user who approved the packagerevision.
 	PublishedBy string `json:"publishedBy,omitempty"`
@@ -312,14 +322,14 @@ type Selector struct {
 	Namespace string `json:"namespace,omitempty"`
 }
 
-// The following types (UpstreamLock, OriginType, and GitLock) are duplicates from the kpt library.
+// The following types (Locator, OriginType, and GitLock) are duplicates from the kpt library.
 // We are repeating them here to avoid cyclic dependencies, but these duplicate type should be removed when
 // https://github.com/kptdev/kpt/issues/3297 is resolved.
 
 type OriginType string
 
-// UpstreamLock is a resolved locator for the last fetch of the package.
-type UpstreamLock struct {
+// Locator is a resolved locator for the last fetch of the package.
+type Locator struct {
 	// Type is the type of origin.
 	Type OriginType `json:"type,omitempty"`