Ensure task list is single element, introduce upgrade task (#252)

* implement 3 way merge without kio.Pipeline

* introduce upgrade task in porch

* ensure task list has one element, porchctl upgrade

* fix upgrade/update typo

* fix lint

* adapt to new cli e2e

* fix cli upgrade, add pack gcr prefix override to custom_test.go

* improve coverage and duplicate code

* additional tests for upgrade task

* generictaskhandler.go coverage

* address some review comments

* SOURCE_PACKAGE -> SOURCE_PACKAGE_REVISION

* remove tests for the removed findUpgradeTask

* rename concurrent edit test repo

* pv controller coverage and fixes

* update porchctl help text

* re-add discovery to porchctl rpkg upgrade, expand e2e test for it, change Revision2Str to include v prefix

* fix addMutator

* fix addMutator 2

* copy and adapt TestDiscoverUpdates to Upgrade

* rewrite most of unit test for upgrade cli

* only pass CRDs to SchemasFromCrdKubeObjects

* Remove unused patch diff generation

* Remove all deprecated task types from porch

* address review comments

* update how task types work around commit messages

* fix infinite render task addition

* fix unit test

* revert Revision2Str changes

* update TestUpdateResourcesEmptyPatch

* fix task list for db cache

---------

Co-authored-by: Gyorgy Dániel <daniel.gyorgy@nokia.com>

Author: mozesl-nokia

Makefile

@@ -366,6 +366,36 @@ deploy-current-config: ## Deploy the configuration that is currently in $(DEPLOY
 	@kubectl rollout status deployment porch-server --namespace porch-system 2>/dev/null || true
 	@echo "Done."
 
+.PHONY: reload-function-runner
+reload-function-runner: IMAGE_REPO=porch-kind
+reload-function-runner: IMAGE_TAG:=test
+reload-function-runner:
+	echo "Building $(IMAGE_REPO)/$(PORCH_FUNCTION_RUNNER_IMAGE):${IMAGE_TAG}"
+	IMAGE_NAME="$(PORCH_FUNCTION_RUNNER_IMAGE)" WRAPPER_SERVER_IMAGE_NAME="$(PORCH_WRAPPER_SERVER_IMAGE)" make -C func/ build-image
+	kind load docker-image $(IMAGE_REPO)/$(PORCH_FUNCTION_RUNNER_IMAGE):${IMAGE_TAG} $(IMAGE_REPO)/$(PORCH_WRAPPER_SERVER_IMAGE):${IMAGE_TAG} -n ${KIND_CONTEXT_NAME}
+	kubectl rollout restart -n porch-system deployment/function-runner
+	@kubectl rollout status deployment function-runner -n porch-system 2>/dev/null || true
+
+.PHONY: reload-server
+reload-server: IMAGE_REPO=porch-kind
+reload-server: IMAGE_TAG:=test
+reload-server:
+	echo "Building $(IMAGE_REPO)/$(PORCH_SERVER_IMAGE):${IMAGE_TAG}"
+	docker build --load --tag $(IMAGE_REPO)/$(PORCH_SERVER_IMAGE):${IMAGE_TAG} -f ./build/Dockerfile "$(PORCHDIR)"
+	kind load docker-image $(IMAGE_REPO)/$(PORCH_SERVER_IMAGE):${IMAGE_TAG} -n ${KIND_CONTEXT_NAME}
+	kubectl rollout restart -n porch-system deployment/porch-server
+	@kubectl rollout status deployment porch-server -n porch-system 2>/dev/null || true
+
+.PHONY: reload-controllers
+reload-controllers: IMAGE_REPO=porch-kind
+reload-controllers: IMAGE_TAG:=test
+reload-controllers:
+	echo "Building $(IMAGE_REPO)/$(PORCH_CONTROLLERS_IMAGE):${IMAGE_TAG}"
+	IMAGE_NAME="$(PORCH_CONTROLLERS_IMAGE)" make -C controllers/ build-image
+	kind load docker-image $(IMAGE_REPO)/$(PORCH_CONTROLLERS_IMAGE):${IMAGE_TAG} -n ${KIND_CONTEXT_NAME}
+	kubectl rollout restart -n porch-system deployment/porch-controllers
+	@kubectl rollout status deployment porch-controllers -n porch-system 2>/dev/null || true
+
 PKG=gitea-dev
 .PHONY: deploy-gitea-dev-pkg
 deploy-gitea-dev-pkg:

api/generated/openapi/zz_generated.openapi.go

@@ -16,7 +16,6 @@ package porch
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // PackageRevision
@@ -105,22 +104,18 @@ type PackageRevisionStatus struct {
 type TaskType string
 
 const (
-	TaskTypeInit   TaskType = "init"
-	TaskTypeClone  TaskType = "clone"
-	TaskTypePatch  TaskType = "patch"
-	TaskTypeEdit   TaskType = "edit"
-	TaskTypeEval   TaskType = "eval"
-	TaskTypeUpdate TaskType = "update"
+	TaskTypeInit    TaskType = "init"
+	TaskTypeClone   TaskType = "clone"
+	TaskTypeEdit    TaskType = "edit"
+	TaskTypeUpgrade TaskType = "upgrade"
 )
 
 type Task struct {
-	Type   TaskType               `json:"type"`
-	Init   *PackageInitTaskSpec   `json:"init,omitempty"`
-	Clone  *PackageCloneTaskSpec  `json:"clone,omitempty"`
-	Patch  *PackagePatchTaskSpec  `json:"patch,omitempty"`
-	Edit   *PackageEditTaskSpec   `json:"edit,omitempty"`
-	Eval   *FunctionEvalTaskSpec  `json:"eval,omitempty"`
-	Update *PackageUpdateTaskSpec `json:"update,omitempty"`
+	Type    TaskType                `json:"type"`
+	Init    *PackageInitTaskSpec    `json:"init,omitempty"`
+	Clone   *PackageCloneTaskSpec   `json:"clone,omitempty"`
+	Edit    *PackageEditTaskSpec    `json:"edit,omitempty"`
+	Upgrade *PackageUpgradeTaskSpec `json:"upgrade,omitempty"`
 }
 
 type TaskResult struct {
@@ -167,9 +162,28 @@ type PackageCloneTaskSpec struct {
 
 type PackageMergeStrategy string
 
-type PackageUpdateTaskSpec struct {
-	// `Upstream` is the reference to the upstream package.
-	Upstream UpstreamPackage `json:"upstreamRef,omitempty"`
+type PackageUpgradeTaskSpec struct {
+	// `OldUpstream` is the reference to the original upstream package revision that is
+	// the common ancestor of the local package and the new upstream package revision.
+	OldUpstream PackageRevisionRef `json:"oldUpstreamRef,omitempty"`
+
+	// `NewUpstream` is the reference to the new upstream package revision that the
+	// local package will be upgraded to.
+	NewUpstream PackageRevisionRef `json:"newUpstreamRef,omitempty"`
+
+	// `LocalPackageRevisionRef` is the reference to the local package revision that
+	// contains all the local changes on top of the `OldUpstream` package revision.
+	LocalPackageRevisionRef PackageRevisionRef `json:"localPackageRevisionRef,omitempty"`
+
+	// 	Defines which strategy should be used to update the package. It defaults to 'resource-merge'.
+	//  * resource-merge: Perform a structural comparison of the original /
+	//    updated resources, and merge the changes into the local package.
+	//  * fast-forward: Fail without updating if the local package was modified
+	//    since it was fetched.
+	//  * force-delete-replace: Wipe all the local changes to the package and replace
+	//    it with the remote version.
+	//  * copy-merge: Copy all the remote changes to the local package.
+	Strategy PackageMergeStrategy `json:"strategy,omitempty"`
 }
 
 const (
@@ -179,11 +193,6 @@ const (
 	CopyMerge          PackageMergeStrategy = "copy-merge"
 )
 
-type PackagePatchTaskSpec struct {
-	// Patches is a list of individual patch operations.
-	Patches []PatchSpec `json:"patches,omitempty"`
-}
-
 type PatchType string
 
 const (
@@ -262,26 +271,6 @@ type RepositoryRef struct {
 	Name string `json:"name"`
 }
 
-type FunctionEvalTaskSpec struct {
-	// `Subpackage` is a directory path to a subpackage in which to evaluate the function.
-	Subpackage string `json:"subpackage,omitempty"`
-	// `Image` specifies the function image, such as `gcr.io/kpt-fn/gatekeeper:v0.2`.
-	Image string `json:"image,omitempty"`
-	// `ConfigMap` specifies the function config (https://kpt.dev/reference/cli/fn/eval/). Mutually exclusive with Config.
-	ConfigMap map[string]string `json:"configMap,omitempty"`
-
-	// `Config` specifies the function config, arbitrary KRM resource. Mutually exclusive with ConfigMap.
-	Config runtime.RawExtension `json:"config,omitempty"`
-
-	// If enabled, meta resources (i.e. `Kptfile` and `functionConfig`) are included
-	// in the input to the function. By default it is disabled.
-	IncludeMetaResources bool `json:"includeMetaResources,omitempty"`
-	// `EnableNetwork` controls whether the function has access to network. Defaults to `false`.
-	EnableNetwork bool `json:"enableNetwork,omitempty"`
-	// Match specifies the selection criteria for the function evaluation.
-	Match Selector `json:"match,omitempty"`
-}
-
 type Selector struct {
 	// APIVersion of the target resources
 	APIVersion string `json:"apiVersion,omitempty"`