Add missing package condition while waiting for app pause (#944)

When a package install for which the installed package version is now removed from the cluster, the app cr is never paused and so we need to check for the failing condition in package install

Author: praveenrewar

cli/pkg/kctrl/cmd/package/installed/create_or_update.go

@@ -901,6 +901,8 @@ func (o *CreateOrUpdateOptions) unpauseReconciliation(client kcclient.Interface)
 }
 
 // Waits for the App CR created by the package installation to pick up it's paused status
+// TODO: Have common place for waiting logic and refactor based on
+// https://github.com/vmware-tanzu/carvel-kapp-controller/issues/639
 func (o *CreateOrUpdateOptions) waitForAppPause(client kcclient.Interface) error {
 	if err := wait.Poll(o.WaitFlags.CheckInterval, o.WaitFlags.Timeout, func() (done bool, err error) {
 		appResource, err := client.KappctrlV1alpha1().Apps(o.NamespaceFlags.Name).Get(context.Background(), o.Name, metav1.GetOptions{})
@@ -913,6 +915,18 @@ func (o *CreateOrUpdateOptions) waitForAppPause(client kcclient.Interface) error
 		if appResource.Status.FriendlyDescription == "Canceled/paused" {
 			return true, nil
 		}
+		pkgi, err := client.PackagingV1alpha1().PackageInstalls(o.NamespaceFlags.Name).Get(context.Background(), o.Name, metav1.GetOptions{})
+		if err != nil {
+			return false, err
+		}
+		if pkgi.Generation != pkgi.Status.ObservedGeneration {
+			return false, nil
+		}
+		for _, condition := range pkgi.Status.Conditions {
+			if condition.Type == "ReconcileFailed" && strings.Contains(condition.Message, "Expected to find at least one version") {
+				return true, nil
+			}
+		}
 		return false, nil
 	}); err != nil {
 		return fmt.Errorf("Waiting for app '%s' in namespace '%s' to be paused: %s", o.Name, o.NamespaceFlags.Name, err)

cli/pkg/kctrl/cmd/package/installed/pause_or_kick.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/cppforlife/go-cli-ui/ui"
@@ -234,6 +235,18 @@ func (o *PauseOrKickOptions) waitForAppPause(client kcclient.Interface) error {
 		if appResource.Status.FriendlyDescription == "Canceled/paused" {
 			return true, nil
 		}
+		pkgi, err := client.PackagingV1alpha1().PackageInstalls(o.NamespaceFlags.Name).Get(context.Background(), o.Name, metav1.GetOptions{})
+		if err != nil {
+			return false, err
+		}
+		if pkgi.Generation != pkgi.Status.ObservedGeneration {
+			return false, nil
+		}
+		for _, condition := range pkgi.Status.Conditions {
+			if condition.Type == "ReconcileFailed" && strings.Contains(condition.Message, "Expected to find at least one version") {
+				return true, nil
+			}
+		}
 		return false, nil
 	}); err != nil {
 		return fmt.Errorf("Waiting for app '%s' in namespace '%s' to be paused: %s", o.Name, o.NamespaceFlags.Name, err)

cli/test/e2e/package_install_test.go

@@ -255,4 +255,17 @@ key2: value2
 		})
 		require.Contains(t, err.Error(), "not found")
 	})
+
+	logger.Section("package installed update with missing old version", func() {
+		kappCtrl.RunWithOpts([]string{"package", "installed", "create", "--package-install", pkgiName,
+			"-p", packageMetadataName, "--version", packageVersion1,
+			"--values-file", "-"}, RunOpts{StdinReader: strings.NewReader(valuesFile1)})
+
+		kapp.RunWithOpts([]string{"deploy", "-a", appName, "-f", "-"}, RunOpts{
+			StdinReader: strings.NewReader(packageMetadata + "\n" + packageCR2)})
+
+		kappCtrl.RunWithOpts([]string{"package", "installed", "update", "--package-install", pkgiName,
+			"-p", packageMetadataName, "--version", packageVersion2,
+			"--values-file", "-"}, RunOpts{StdinReader: strings.NewReader(valuesFile2)})
+	})
 }