WIP

Makefile

@@ -51,7 +51,7 @@ PLUGIN_SCOPE_ASSOCIATION_FILE ?= ""
 all: test build ## Prepare and run the project tests
 
 .PHONY: install
-install: test## Install the plugin binaries to the local machine
+install: ## Install the plugin binaries to the local machine
 	@# TODO avoid deleting an existing plugin once in place reinstalls are working again
 	@tanzu plugin delete apps > /dev/null 2>&1 || true
 	$(BUILDER_PLUGIN) plugin build --path $(PLUGIN_DIR) --binary-artifacts $(PLUGIN_BINARY_ARTIFACTS_DIR) --version $(PLUGIN_BUILD_VERSION) --ldflags "$(PLUGIN_LD_FLAGS)" --os-arch local

pkg/apis/cartographer/v1alpha1/workload_helpers.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"io"
 	"reflect"
+	"time"
 
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -560,6 +561,18 @@ func WorkloadReadyConditionFunc(target client.Object) (bool, error) {
 	return false, nil
 }
 
+func TestDelay(delay time.Duration) func(client.Object) (bool, error) {
+	return func(target client.Object) (bool, error) {
+		ok, err := WorkloadReadyConditionFunc(target)
+
+		if ok && err == nil {
+			time.Sleep(delay)
+			return WorkloadReadyConditionFunc(target)
+		}
+		return ok, err
+	}
+}
+
 func (w *Workload) DeprecationWarnings() []string {
 	warnings := []string{}
 	var serviceClaimDeprecationWarningMsg = "Cross namespace service claims are deprecated. Please use `tanzu service claim create` instead."

pkg/commands/workload.go

@@ -147,6 +147,7 @@ type WorkloadOptions struct {
 
 	Wait           bool
 	WaitTimeout    time.Duration
+	Delay          time.Duration
 	Tail           bool
 	TailTimestamps bool
 	DryRun         bool
@@ -907,7 +908,7 @@ func getReadyConditionWorker(c *cli.Config, workload *cartov1alpha1.Workload) wa
 		if err != nil {
 			return err
 		}
-		return wait.UntilCondition(ctx, clientWithWatch, types.NamespacedName{Name: workload.Name, Namespace: workload.Namespace}, &cartov1alpha1.WorkloadList{}, cartov1alpha1.WorkloadReadyConditionFunc)
+		return wait.UntilCondition(ctx, clientWithWatch, types.NamespacedName{Name: workload.Name, Namespace: workload.Namespace}, &cartov1alpha1.WorkloadList{}, cartov1alpha1.TestDelay(30*time.Second))
 	})
 
 	return worker
@@ -1018,6 +1019,8 @@ func (opts *WorkloadOptions) DefineFlags(ctx context.Context, c *cli.Config, cmd
 	cmd.MarkFlagFilename(cli.StripDash(flags.FilePathFlagName), ".yaml", ".yml")
 	cmd.Flags().BoolVar(&opts.DryRun, cli.StripDash(flags.DryRunFlagName), false, "print kubernetes resources to stdout rather than apply them to the cluster, messages normally on stdout will be sent to stderr")
 	cmd.Flags().BoolVarP(&opts.Yes, cli.StripDash(flags.YesFlagName), "y", false, "accept all prompts")
+
+	cmd.Flags().DurationVar(&opts.Delay, cli.StripDash(flags.DelayFlagName), 10*time.Second, "Delay for workload to become ready when waiting")
 }
 
 func (opts *WorkloadOptions) DefineEnvVars(ctx context.Context, c *cli.Config, cmd *cobra.Command) {

pkg/flags/flags.go

@@ -75,4 +75,5 @@ const (
 	WaitFlagName             = "--wait"
 	WaitTimeoutFlagName      = "--wait-timeout"
 	YesFlagName              = "--yes"
+	DelayFlagName            = "--delay"
 )