nr: D persist/sqldb/retry/offload_node_status_repo_with_retry.go

Signed-off-by: Alex Collins <alex_collins@intuit.com>
alexec · Nov 10, 2020 · 4ba6d3b · 4ba6d3b
1 parent a37b532
commit 4ba6d3b
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 172 deletions.
diff --git a/persist/sqldb/retry/offload_node_status_repo_with_retry.go b/persist/sqldb/retry/offload_node_status_repo_with_retry.go
diff --git a/persist/sqldb/retry/offload_node_status_repo_with_retry_test.go b/persist/sqldb/retry/offload_node_status_repo_with_retry_test.go
diff --git a/server/apiserver/argoserver.go b/server/apiserver/argoserver.go
@@ -22,7 +22,6 @@ import (
 	"github.com/argoproj/argo"
 	"github.com/argoproj/argo/config"
 	"github.com/argoproj/argo/persist/sqldb"
-	"github.com/argoproj/argo/persist/sqldb/retry"
 	clusterwftemplatepkg "github.com/argoproj/argo/pkg/apiclient/clusterworkflowtemplate"
 	cronworkflowpkg "github.com/argoproj/argo/pkg/apiclient/cronworkflow"
 	eventpkg "github.com/argoproj/argo/pkg/apiclient/event"
@@ -158,7 +157,6 @@ func (as *argoServer) Run(ctx context.Context, port int, browserOpenFunc func(st
 		if err != nil {
 			log.Fatal(err)
 		}
-		offloadRepo = retry.WithRetry(offloadRepo)
 		// we always enable the archive for the Argo Server, as the Argo Server does not write records, so you can
 		// disable the archiving - and still read old records
 		wfArchive = sqldb.NewWorkflowArchive(session, persistence.GetClusterName(), as.managedNamespace, instanceIDService)

diff --git a/test/e2e/argo_server_test.go b/test/e2e/argo_server_test.go
@@ -1201,9 +1201,7 @@ spec:
   templates:
     - name: run-archie
       container:
-        image: argoproj/argosay:v2
-        command: [cowsay, ":) Hello Argo!"]
-        imagePullPolicy: IfNotPresent`).
+        image: argoproj/argosay:v2`).
 		When().
 		SubmitWorkflow().
 		WaitForWorkflow(fixtures.ToBeArchived).
@@ -1223,9 +1221,7 @@ spec:
   templates:
     - name: run-betty
       container:
-        image: argoproj/argosay:v2
-        command: [cowsay, ":) Hello Argo!"]
-        imagePullPolicy: IfNotPresent`).
+        image: argoproj/argosay:v2`).
 		When().
 		SubmitWorkflow().
 		WaitForWorkflow(fixtures.ToBeArchived, "to be archived")

diff --git a/test/e2e/fixtures/persistence.go b/test/e2e/fixtures/persistence.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/argoproj/argo/config"
 	"github.com/argoproj/argo/persist/sqldb"
-	"github.com/argoproj/argo/persist/sqldb/retry"
 	"github.com/argoproj/argo/util/instanceid"
 )
 
@@ -33,7 +32,6 @@ func newPersistence(kubeClient kubernetes.Interface, wcConfig *config.Config) *P
 		if err != nil {
 			panic(err)
 		}
-		offloadNodeStatusRepo = retry.WithRetry(offloadNodeStatusRepo)
 		instanceIDService := instanceid.NewService(wcConfig.InstanceID)
 		workflowArchive := sqldb.NewWorkflowArchive(session, persistence.GetClusterName(), Namespace, instanceIDService)
 		return &Persistence{session, offloadNodeStatusRepo, workflowArchive}

diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -1853,7 +1853,7 @@ func (woc *wfOperationCtx) markWorkflowPhase(phase wfv1.NodePhase, message strin
 					woc.log.Infof("Marking workflow as pending archiving")
 					woc.wf.Labels[common.LabelKeyWorkflowArchivingStatus] = "Pending"
 				} else {
-				woc.log.Infof("Does't match with archive label selector. Skipping Archive")
+					woc.log.Infof("Doesn't match with archive label selector. Skipping Archive")
 				}
 			}
 			woc.updated = true