Merge branch 'master' of https://github.com/argoproj/argo

argoproj · Apr 3, 2020 · f5e3c8f · f5e3c8f
2 parents e02a98c + 3d14614
commit f5e3c8f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/ui/src/app/workflows/components/workflow-list-item/workflow-list-item.tsx b/ui/src/app/workflows/components/workflow-list-item/workflow-list-item.tsx
@@ -17,7 +17,7 @@ export interface WorkflowListItemProps {
 }
 
 function wfDuration(workflow: models.WorkflowStatus, now: moment.Moment) {
- const endTime = workflow.finishedAt ? moment(workflow.finishedAt) : now
+ const endTime = workflow.finishedAt ? moment(workflow.finishedAt) : now;
  return endTime.diff(moment(workflow.startedAt)) / 1000;
 }
 
@@ -66,9 +66,7 @@ export const WorkflowListItem = (props: WorkflowListItemProps) => (
  <div className='workflow-list-item__content-details-row row'>
  <div className='columns large-4'>DURATION:</div>
  <div className='columns large-8'>
- <Ticker>
- {now => <Duration durationMs={wfDuration(props.workflow.status, now)} />}
- </Ticker>
+ <Ticker>{now => <Duration durationMs={wfDuration(props.workflow.status, now)} />}</Ticker>
  </div>
  </div>
  </div>

diff --git a/workflow/common/util.go b/workflow/common/util.go
@@ -458,7 +458,7 @@ func DeletePod(c kubernetes.Interface, podName, namespace string) error {
  for attempt := 0; attempt < deleteRetries; attempt++ {
  err = c.CoreV1().Pods(namespace).Delete(podName, &metav1.DeleteOptions{})
  if err == nil || apierr.IsNotFound(err) {
- break
+ return nil
  }
  time.Sleep(100 * time.Millisecond)
  }

diff --git a/workflow/common/util_test.go b/workflow/common/util_test.go
@@ -5,6 +5,8 @@ import (
 
  "github.com/stretchr/testify/assert"
  corev1 "k8s.io/api/core/v1"
+ v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/client-go/kubernetes/fake"
 
  wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
 )
@@ -68,3 +70,17 @@ spec:
  _, err = SplitWorkflowYAMLFile([]byte(invalidWf), false)
  assert.EqualError(t, err, `error unmarshaling JSON: while decoding JSON: json: unknown field "doesNotExist"`)
 }
+
+func TestDeletePod(t *testing.T) {
+ kube := fake.NewSimpleClientset(&corev1.Pod{
+ ObjectMeta: v1.ObjectMeta{Name: "my-pod", Namespace: "my-ns"},
+ })
+ t.Run("Exists", func(t *testing.T) {
+ err := DeletePod(kube, "my-pod", "my-ms")
+ assert.NoError(t, err)
+ })
+ t.Run("NotExists", func(t *testing.T) {
+ err := DeletePod(kube, "not-exists", "my-ms")
+ assert.NoError(t, err)
+ })
+}
diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -338,7 +338,7 @@ func (woc *wfOperationCtx) operate() {
  onExitNode, err = woc.executeTemplate(onExitNodeName, &wfv1.WorkflowStep{Template: woc.wf.Spec.OnExit}, tmplCtx, woc.wf.Spec.Arguments, &executeTemplateOpts{onExitTemplate: true})
  if err != nil {
  // the error are handled in the callee so just log it.
- woc.log.Errorf("%s error in exit template execution: %+v", woc.wf.Name, err)
+ woc.log.Errorf("error in exit template execution: %+v", err)
  return
  }
  if onExitNode == nil || !onExitNode.Completed() {