Fix get cmd early exit

pull/16/head
stefanprodan 5 years ago
parent 9069a65a97
commit 155cc66db9

@ -45,7 +45,7 @@ func getKsCmdRun(cmd *cobra.Command, args []string) error {
for _, kustomization := range list.Items { for _, kustomization := range list.Items {
if kustomization.Spec.Suspend { if kustomization.Spec.Suspend {
logSuccess("%s is suspended", kustomization.GetName()) logSuccess("%s is suspended", kustomization.GetName())
break continue
} }
isInitialized := false isInitialized := false
for _, condition := range kustomization.Status.Conditions { for _, condition := range kustomization.Status.Conditions {

@ -3,9 +3,11 @@ package main
import ( import (
"context" "context"
"fmt" "fmt"
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1alpha1" kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1alpha1"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
) )
var resumeKsCmd = &cobra.Command{ var resumeKsCmd = &cobra.Command{
@ -51,9 +53,24 @@ func resumeKsCmdRun(cmd *cobra.Command, args []string) error {
} }
logSuccess("kustomization resumed") logSuccess("kustomization resumed")
if err := syncKsCmdRun(nil, []string{name}); err != nil { logWaiting("waiting for kustomization sync")
if err := wait.PollImmediate(pollInterval, timeout,
isKustomizationReady(ctx, kubeClient, name, namespace)); err != nil {
return err return err
} }
logSuccess("kustomization sync completed")
err = kubeClient.Get(ctx, namespacedName, &kustomization)
if err != nil {
return err
}
if kustomization.Status.LastAppliedRevision != "" {
logSuccess("applied revision %s", kustomization.Status.LastAppliedRevision)
} else {
return fmt.Errorf("kustomization sync failed")
}
return nil return nil
} }

Loading…
Cancel
Save