Repository: argoproj/argo
Pull request #2519 (2020-03-26 08:22:38)

docs: couple of examples for REST API usage of argo-server
Checklist:

* [ c] Either (a) I've created an [enhancement proposal](https://github.com/argoproj/argo/issues/new/choose) and discussed it with the community, (b) this is a bug fix, or (c) this is a chore.
* [ b] The title of the PR is (a) [conventional](https://www.conventionalcommits.org/en/v1.0.0/), (b) states what changed, and (c) suffixes the related issues number. E.g. `"fix(controller): Updates such and such. Fixes #1234"`.  
* [ not applicable] I have written unit and/or e2e tests for my change. PRs without these are unlike to be merged.
* [ ] Optional. I've added My organization is added to the USERS.md.
* [not applicable ] I've signed the CLA and required builds are green. 


CLAassistant: [![CLA assistant check](https://cla-assistant.io/pull/badge/not_signed)](https://cla-assistant.io/argoproj/argo?pullRequest=2519) <br/>Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our [Contributor License Agreement](https://cla-assistant.io/argoproj/argo?pullRequest=2519) before we can accept your contribution.<br/><sub>You have signed the CLA already but the status is still pending? Let us [recheck](https://cla-assistant.io/check/argoproj/argo?pullRequest=2519) it.</sub>
codecov[bot]: # [Codecov](https://codecov.io/gh/argoproj/argo/pull/2519?src=pr&el=h1) Report
> :exclamation: No coverage uploaded for pull request base (`master@b277124`). [Click here to learn what that means](https://docs.codecov.io/docs/error-reference#section-missing-base-commit).
> The diff coverage is `n/a`.

[![Impacted file tree graph](https://codecov.io/gh/argoproj/argo/pull/2519/graphs/tree.svg?width=650&token=4c3DPSTq8o&height=150&src=pr)](https://codecov.io/gh/argoproj/argo/pull/2519?src=pr&el=tree)

```diff
@@            Coverage Diff            @@
##             master    #2519   +/-   ##
=========================================
  Coverage          ?   11.31%           
=========================================
  Files             ?       75           
  Lines             ?    31705           
  Branches          ?        0           
=========================================
  Hits              ?     3589           
  Misses            ?    27638           
  Partials          ?      478
```



------

[Continue to review full report at Codecov](https://codecov.io/gh/argoproj/argo/pull/2519?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/argoproj/argo/pull/2519?src=pr&el=footer). Last update [b277124...82e848f](https://codecov.io/gh/argoproj/argo/pull/2519?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).


Patch:
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index d76a8aed6..b5d07e600 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -5798,6 +5798,9 @@
         },
         "namespace": {
           "type": "string"
+        },
+        "nodeFieldSelector": {
+          "type": "string"
         }
       }
     },
@@ -5815,11 +5818,17 @@
     "io.argoproj.workflow.v1alpha1.WorkflowStopRequest": {
       "type": "object",
       "properties": {
+        "message": {
+          "type": "string"
+        },
         "name": {
           "type": "string"
         },
         "namespace": {
           "type": "string"
+        },
+        "nodeFieldSelector": {
+          "type": "string"
         }
       }
     },
diff --git a/cmd/argo/commands/resume.go b/cmd/argo/commands/resume.go
index 3a9bd9778..0b765cb11 100644
--- a/cmd/argo/commands/resume.go
+++ b/cmd/argo/commands/resume.go
@@ -5,12 +5,21 @@ import (
 	"log"
 
 	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/fields"
 
 	"github.com/argoproj/argo/cmd/argo/commands/client"
 	workflowpkg "github.com/argoproj/argo/pkg/apiclient/workflow"
 )
 
+type resumeOps struct {
+	nodeFieldSelector string // --node-field-selector
+}
+
 func NewResumeCommand() *cobra.Command {
+	var (
+		resumeArgs resumeOps
+	)
+
 	var command = &cobra.Command{
 		Use:   "resume WORKFLOW1 WORKFLOW2...",
 		Short: "resume zero or more workflows",
@@ -18,10 +27,17 @@ func NewResumeCommand() *cobra.Command {
 			ctx, apiClient := client.NewAPIClient()
 			serviceClient := apiClient.NewWorkflowServiceClient()
 			namespace := client.Namespace()
+
+			selector, err := fields.ParseSelector(resumeArgs.nodeFieldSelector)
+			if err != nil {
+				log.Fatalf("Unable to parse node field selector '%s': %s", resumeArgs.nodeFieldSelector, err)
+			}
+
 			for _, wfName := range args {
 				_, err := serviceClient.ResumeWorkflow(ctx, &workflowpkg.WorkflowResumeRequest{
-					Name:      wfName,
-					Namespace: namespace,
+					Name:              wfName,
+					Namespace:         namespace,
+					NodeFieldSelector: selector.String(),
 				})
 				if err != nil {
 					log.Fatalf("Failed to resume %s: %+v", wfName, err)
@@ -31,5 +47,6 @@ func NewResumeCommand() *cobra.Command {
 
 		},
 	}
+	command.Flags().StringVar(&resumeArgs.nodeFieldSelector, "node-field-selector", "", "selector of node to resume, eg: --node-field-selector inputs.paramaters.myparam.value=abc")
 	return command
 }
diff --git a/cmd/argo/commands/stop.go b/cmd/argo/commands/stop.go
index ae4008ec8..abb328c68 100644
--- a/cmd/argo/commands/stop.go
+++ b/cmd/argo/commands/stop.go
@@ -2,15 +2,26 @@ package commands
 
 import (
 	"fmt"
+	"log"
 
 	"github.com/argoproj/pkg/errors"
 	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/fields"
 
 	"github.com/argoproj/argo/cmd/argo/commands/client"
 	workflowpkg "github.com/argoproj/argo/pkg/apiclient/workflow"
 )
 
+type stopOps struct {
+	message           string // --message
+	nodeFieldSelector string // --node-field-selector
+}
+
 func NewStopCommand() *cobra.Command {
+	var (
+		stopArgs stopOps
+	)
+
 	var command = &cobra.Command{
 		Use:   "stop WORKFLOW WORKFLOW2...",
 		Short: "stop zero or more workflows",
@@ -19,15 +30,25 @@ func NewStopCommand() *cobra.Command {
 			ctx, apiClient := client.NewAPIClient()
 			serviceClient := apiClient.NewWorkflowServiceClient()
 			namespace := client.Namespace()
+
+			selector, err := fields.ParseSelector(stopArgs.nodeFieldSelector)
+			if err != nil {
+				log.Fatalf("Unable to parse node field selector '%s': %s", stopArgs.nodeFieldSelector, err)
+			}
+
 			for _, name := range args {
 				wf, err := serviceClient.StopWorkflow(ctx, &workflowpkg.WorkflowStopRequest{
-					Name:      name,
-					Namespace: namespace,
+					Name:              name,
+					Namespace:         namespace,
+					NodeFieldSelector: selector.String(),
+					Message:           stopArgs.message,
 				})
 				errors.CheckError(err)
 				fmt.Printf("workflow %s stopped\n", wf.Name)
 			}
 		},
 	}
+	command.Flags().StringVar(&stopArgs.message, "message", "", "Message to add to previously running nodes")
+	command.Flags().StringVar(&stopArgs.nodeFieldSelector, "node-field-selector", "", "selector of node to stop, eg: --node-field-selector inputs.paramaters.myparam.value=abc")
 	return command
 }
diff --git a/docs/workflow-controller-configmap_v2.7+.yaml b/docs/workflow-controller-configmap_v2.7+.yaml
index cca30a511..3519ab5df 100644
--- a/docs/workflow-controller-configmap_v2.7+.yaml
+++ b/docs/workflow-controller-configmap_v2.7+.yaml
@@ -86,6 +86,11 @@ data:
       secretKeySecret:
         name: my-s3-credentials
         key: secretKey
+      # When useSDKCreds is set to true it will use Amazon's SDK default credential chain. This will allow
+      # the use of IRSA (IAM roles for service accounts) as well as any of Amazons environment variables
+      # that you can find here: (https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html)
+      # and things like IAM instance roles etc.
+      useSDKCreds: true
 
   # Specifies the container runtime interface to use (default: docker)
   # must be one of: docker, kubelet, k8sapi, pns
diff --git a/examples/rest-examples.md b/examples/rest-examples.md
new file mode 100644
index 000000000..724aea4ab
--- /dev/null
+++ b/examples/rest-examples.md
@@ -0,0 +1,75 @@
+# Document contains couple of examples of workflow JSON's to submit via argo-server REST API. 
+
+> >v2.5
+
+Assuming
+
+* the namespace of argo-server is argo
+* authentication is turned off (otherwise provide Authentication header)
+* argo-server is available on localhost:2746
+
+## Submitting workflow
+
+```
+curl --request POST \
+  --url http://localhost:2746/api/v1/workflows/argo \
+  --header 'content-type: application/json' \
+  --data '{
+  "namespace": "argo",
+  "serverDryRun": false,
+	 "workflow": {
+      "metadata": {
+        "generateName": "hello-world-",
+        "namespace": "argo",
+        "labels": {
+          "workflows.argoproj.io/completed": "false"
+         }
+      },
+     "spec": {
+       "templates": [
+        {
+         "name": "whalesay",
+         "arguments": {},
+         "inputs": {},
+         "outputs": {},
+         "metadata": {},
+         "container": {
+          "name": "",
+          "image": "docker/whalesay:latest",
+          "command": [
+            "cowsay"
+          ],
+          "args": [
+            "hello world"
+          ],
+          "resources": {}
+        }
+      }
+    ],
+    "entrypoint": "whalesay",
+    "arguments": {}
+  }
+}
+}'
+```
+
+## Getting workflows for namespace argo
+
+```
+curl --request GET \
+  --url http://localhost:2746/api/v1/workflows/argo
+```
+
+## Getting single workflow for namespace argo
+
+```
+curl --request GET \
+  --url http://localhost:2746/api/v1/workflows/argo/abc-dthgt
+```
+
+## Deleting single workflow for namespace argo
+
+```
+curl --request DELETE \
+  --url http://localhost:2746/api/v1/workflows/argo/abc-dthgt
+```
diff --git a/pkg/apiclient/workflow/workflow.pb.go b/pkg/apiclient/workflow/workflow.pb.go
index 31dcaf9a4..66d06f7d2 100644
--- a/pkg/apiclient/workflow/workflow.pb.go
+++ b/pkg/apiclient/workflow/workflow.pb.go
@@ -371,6 +371,7 @@ func (m *WorkflowRetryRequest) GetNamespace() string {
 type WorkflowResumeRequest struct {
 	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	Namespace            string   `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
+	NodeFieldSelector    string   `protobuf:"bytes,3,opt,name=nodeFieldSelector,proto3" json:"nodeFieldSelector,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -423,6 +424,13 @@ func (m *WorkflowResumeRequest) GetNamespace() string {
 	return ""
 }
 
+func (m *WorkflowResumeRequest) GetNodeFieldSelector() string {
+	if m != nil {
+		return m.NodeFieldSelector
+	}
+	return ""
+}
+
 type WorkflowTerminateRequest struct {
 	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	Namespace            string   `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
@@ -481,6 +489,8 @@ func (m *WorkflowTerminateRequest) GetNamespace() string {
 type WorkflowStopRequest struct {
 	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	Namespace            string   `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
+	NodeFieldSelector    string   `protobuf:"bytes,3,opt,name=nodeFieldSelector,proto3" json:"nodeFieldSelector,omitempty"`
+	Message              string   `protobuf:"bytes,4,opt,name=message,proto3" json:"message,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -533,6 +543,20 @@ func (m *WorkflowStopRequest) GetNamespace() string {
 	return ""
 }
 
+func (m *WorkflowStopRequest) GetNodeFieldSelector() string {
+	if m != nil {
+		return m.NodeFieldSelector
+	}
+	return ""
+}
+
+func (m *WorkflowStopRequest) GetMessage() string {
+	if m != nil {
+		return m.Message
+	}
+	return ""
+}
+
 type WorkflowSuspendRequest struct {
 	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	Namespace            string   `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
@@ -1007,78 +1031,80 @@ func init() {
 }
 
 var fileDescriptor_1f6bb75f9e833cb6 = []byte{
-	// 1125 bytes of a gzipped FileDescriptorProto
+	// 1159 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x98, 0x5b, 0x6f, 0xdc, 0x44,
-	0x14, 0x80, 0x35, 0x49, 0x48, 0x93, 0x93, 0x4b, 0xcb, 0x00, 0x65, 0x65, 0xa5, 0x69, 0x3a, 0x10,
-	0x08, 0x69, 0x63, 0x67, 0x93, 0x00, 0xa5, 0x52, 0x91, 0x4a, 0x52, 0x85, 0xa2, 0x15, 0x54, 0x2e,
-	0x08, 0x95, 0x37, 0xaf, 0x77, 0xe2, 0xb8, 0xb1, 0x3d, 0xc6, 0x9e, 0xdd, 0x6a, 0xa9, 0x02, 0x82,
-	0x47, 0x84, 0x78, 0xe1, 0x05, 0xc1, 0x0b, 0xe2, 0x22, 0x21, 0x21, 0x71, 0xf9, 0x17, 0x3c, 0x22,
-	0xf1, 0x07, 0x50, 0xc4, 0x0f, 0x41, 0x33, 0xb6, 0xc7, 0x76, 0x76, 0x59, 0xcc, 0xba, 0x52, 0xdf,
-	0x66, 0x3c, 0x3e, 0xe7, 0x7c, 0x3e, 0x97, 0x39, 0x47, 0x86, 0xd5, 0xf0, 0xc8, 0x31, 0xac, 0xd0,
-	0xb5, 0x3d, 0x97, 0x06, 0xdc, 0xb8, 0xcf, 0xa2, 0xa3, 0x03, 0x8f, 0xdd, 0x57, 0x0b, 0x3d, 0x8c,
-	0x18, 0x67, 0x78, 0x26, 0xdb, 0x6b, 0x1b, 0x8e, 0xcb, 0x0f, 0xbb, 0x6d, 0xdd, 0x66, 0xbe, 0xe1,
-	0x30, 0x87, 0x19, 0xf2, 0x85, 0x76, 0xf7, 0x40, 0xee, 0xe4, 0x46, 0xae, 0x12, 0x41, 0x6d, 0xc9,
-	0x61, 0xcc, 0xf1, 0xa8, 0x30, 0x61, 0x58, 0x41, 0xc0, 0xb8, 0xc5, 0x5d, 0x16, 0xc4, 0xe9, 0xe9,
-	0xce, 0xd1, 0xd5, 0x58, 0x77, 0x99, 0x38, 0xf5, 0x2d, 0xfb, 0xd0, 0x0d, 0x68, 0xd4, 0x37, 0x52,
-	0xa2, 0xd8, 0xf0, 0x29, 0xb7, 0x8c, 0x5e, 0xd3, 0x70, 0x68, 0x40, 0x23, 0x8b, 0xd3, 0x4e, 0x2a,
-	0xb5, 0x5b, 0x40, 0xb0, 0x22, 0x69, 0xf4, 0x9e, 0x5c, 0xe4, 0xa2, 0xea, 0x3b, 0x7a, 0x4d, 0xcb,
-	0x0b, 0x0f, 0xad, 0x41, 0x25, 0x24, 0x37, 0x6d, 0xd8, 0x2c, 0xa2, 0x43, 0x0c, 0x91, 0x5f, 0x26,
-	0xe0, 0xa9, 0x77, 0x53, 0x4d, 0xbb, 0x11, 0xb5, 0x38, 0x35, 0xe9, 0xfb, 0x5d, 0x1a, 0x73, 0xbc,
-	0x04, 0xb3, 0x81, 0xe5, 0xd3, 0x38, 0xb4, 0x6c, 0xda, 0x40, 0x2b, 0x68, 0x6d, 0xd6, 0xcc, 0x1f,
-	0xe0, 0xbb, 0xa0, 0xfc, 0xd5, 0x98, 0x58, 0x41, 0x6b, 0x73, 0x5b, 0xd7, 0xf5, 0x9c, 0x59, 0xcf,
-	0x98, 0xe5, 0x42, 0x0f, 0x8f, 0x1c, 0x5d, 0x30, 0xeb, 0xca, 0xe5, 0x19, 0xb3, 0x9e, 0xd9, 0x36,
-	0x95, 0x3a, 0xbc, 0x0c, 0xe0, 0x06, 0x31, 0xb7, 0x02, 0x9b, 0xde, 0xda, 0x6b, 0x4c, 0x4a, 0xcb,
-	0x85, 0x27, 0x98, 0xc0, 0x7c, 0x4c, 0xa3, 0x1e, 0x8d, 0xf6, 0xa2, 0xbe, 0xd9, 0x0d, 0x1a, 0x53,
-	0x2b, 0x68, 0x6d, 0xc6, 0x2c, 0x3d, 0xc3, 0x77, 0x61, 0xc1, 0x96, 0x5f, 0xf3, 0x56, 0x28, 0x83,
-	0xd1, 0x78, 0x4c, 0x32, 0x6e, 0xeb, 0x89, 0x4b, 0xf4, 0x62, 0x34, 0x72, 0x3c, 0x11, 0x0d, 0xbd,
-	0xd7, 0xd4, 0x77, 0x8b, 0xa2, 0x66, 0x59, 0x13, 0xf9, 0x15, 0x01, 0xce, 0xa8, 0xf7, 0x29, 0xcf,
-	0xdc, 0x85, 0x61, 0x4a, 0x78, 0x27, 0xf5, 0x94, 0x5c, 0x97, 0x5d, 0x38, 0x71, 0xda, 0x85, 0xb7,
-	0x01, 0x1c, 0xca, 0x33, 0xc0, 0x49, 0x09, 0xb8, 0x59, 0x0d, 0x70, 0x5f, 0xc9, 0x99, 0x05, 0x1d,
-	0xf8, 0x3c, 0x4c, 0x1f, 0xb8, 0xd4, 0xeb, 0xc4, 0xd2, 0x27, 0xb3, 0x66, 0xba, 0x23, 0xdf, 0x20,
-	0x78, 0x22, 0x43, 0x6e, 0xb9, 0x31, 0xaf, 0x16, 0xe2, 0x3b, 0x30, 0xe7, 0xb9, 0xb1, 0x02, 0x4c,
-	0xa2, 0xdc, 0xac, 0x06, 0xd8, 0xca, 0x05, 0xcd, 0xa2, 0x96, 0x02, 0xe2, 0x64, 0x09, 0xd1, 0x81,
-	0xa7, 0x55, 0x2a, 0xd0, 0xb8, 0xdb, 0xf6, 0xdd, 0x1a, 0x9e, 0xd5, 0x60, 0xc6, 0xa7, 0x3e, 0x73,
-	0x3f, 0xa0, 0x1d, 0x69, 0x66, 0xc6, 0x54, 0x7b, 0xf2, 0x3a, 0x3c, 0x99, 0x1b, 0xe2, 0x51, 0x7f,
-	0x6c, 0x2b, 0xe4, 0x56, 0x5e, 0x39, 0x02, 0xd9, 0xa7, 0xe3, 0xab, 0x6a, 0x41, 0x23, 0x53, 0xf5,
-	0x36, 0x8d, 0x7c, 0x37, 0x28, 0xd4, 0xe1, 0xff, 0xd7, 0xb6, 0x9f, 0x47, 0xfb, 0x0e, 0x67, 0xe1,
-	0xf8, 0x8a, 0xde, 0x80, 0xf3, 0x4a, 0x51, 0x37, 0x0e, 0x69, 0xd0, 0x19, 0x5f, 0xd7, 0x77, 0x85,
-	0xb2, 0x69, 0x31, 0x67, 0xfc, 0xe0, 0x36, 0xe0, 0x4c, 0xc8, 0x3a, 0x6f, 0x0a, 0xa1, 0x24, 0x85,
-	0xb2, 0x2d, 0xbe, 0x01, 0xe0, 0x31, 0x27, 0xcb, 0xd7, 0x29, 0x99, 0xaf, 0x97, 0x0a, 0xf9, 0xaa,
-	0x8b, 0x4b, 0x50, 0x64, 0xe7, 0x6d, 0xd6, 0x69, 0xa9, 0x17, 0xcd, 0x82, 0x10, 0xf9, 0x1e, 0xe5,
-	0x41, 0xdd, 0xa3, 0x1e, 0xad, 0x11, 0x06, 0x71, 0x07, 0x75, 0xa4, 0x8a, 0x72, 0x89, 0x57, 0xbc,
-	0x83, 0xf6, 0x8a, 0xa2, 0x66, 0x59, 0x13, 0x69, 0xe4, 0x81, 0xc9, 0x28, 0xe3, 0x90, 0x05, 0x31,
-	0x25, 0x9f, 0x8a, 0x0f, 0xb0, 0xb8, 0x7d, 0x98, 0x9d, 0xc7, 0x8f, 0xae, 0xd8, 0xc9, 0x47, 0x79,
-	0xc8, 0x25, 0xd3, 0xcd, 0x1e, 0x0d, 0xa4, 0x27, 0x79, 0x3f, 0x54, 0x9e, 0x14, 0x6b, 0xfc, 0x0e,
-	0x4c, 0xb3, 0xf6, 0x3d, 0x6a, 0xf3, 0x87, 0xd3, 0x4c, 0x52, 0x65, 0xe4, 0x55, 0x98, 0x69, 0x31,
-	0xe7, 0x66, 0xc0, 0xa3, 0xbe, 0xc8, 0x1b, 0x9b, 0x05, 0x9c, 0x06, 0x3c, 0xb5, 0x9c, 0x6d, 0x8b,
-	0x19, 0x35, 0x51, 0xca, 0x28, 0xf2, 0x79, 0xe9, 0xe2, 0x0c, 0xf8, 0xa3, 0xee, 0x8d, 0x5b, 0x9f,
-	0x9d, 0x83, 0xb3, 0xaa, 0x24, 0x69, 0xd4, 0x73, 0x6d, 0x8a, 0xbf, 0x42, 0xb0, 0x98, 0x74, 0xac,
-	0xec, 0x04, 0x5f, 0xcc, 0xb5, 0x0d, 0x6d, 0xee, 0x5a, 0x3d, 0x20, 0xb2, 0xf6, 0xc9, 0x9f, 0x7f,
-	0x7f, 0x31, 0x41, 0xc8, 0x05, 0x39, 0x5b, 0xf4, 0x9a, 0x6a, 0x18, 0x89, 0x8d, 0x07, 0xca, 0x0f,
-	0xc7, 0xd7, 0xd0, 0x3a, 0xfe, 0x12, 0xc1, 0xdc, 0x3e, 0xe5, 0x8a, 0x6c, 0x69, 0x90, 0x2c, 0x6f,
-	0xa2, 0x75, 0xb1, 0xae, 0x48, 0xac, 0xe7, 0xf0, 0xb3, 0x23, 0xb1, 0x92, 0xf5, 0xb1, 0x40, 0x5b,
-	0x10, 0xa9, 0xab, 0x2a, 0x05, 0x5f, 0x18, 0x84, 0x2b, 0xb4, 0x4b, 0xed, 0x46, 0x2d, 0x3a, 0xa1,
-	0x89, 0xac, 0x4a, 0xc2, 0x8b, 0x78, 0xb4, 0xe3, 0xf0, 0x87, 0xb0, 0x58, 0x2e, 0xe2, 0x52, 0x44,
-	0x87, 0x95, 0xb7, 0x36, 0xc4, 0xb1, 0x79, 0xcd, 0x91, 0xcb, 0xd2, 0xee, 0x2a, 0x7e, 0xe6, 0xb4,
-	0xdd, 0x0d, 0x2a, 0xce, 0x4b, 0xd6, 0x37, 0x11, 0xfe, 0x18, 0xc1, 0x62, 0x72, 0xb1, 0x8c, 0x4a,
-	0xa9, 0xd2, 0x05, 0xa9, 0xad, 0xfc, 0xfb, 0x0b, 0xe9, 0xdd, 0x94, 0x86, 0x67, 0xbd, 0x5a, 0x78,
-	0x7e, 0x40, 0xb0, 0x20, 0x3b, 0xb4, 0x42, 0x58, 0x1e, 0xb4, 0x50, 0x6c, 0xe1, 0x75, 0xb3, 0xe7,
-	0x45, 0x89, 0x67, 0x68, 0xeb, 0x55, 0xf0, 0x8c, 0x48, 0x58, 0x16, 0x19, 0xfe, 0x33, 0x82, 0x73,
-	0xd9, 0xc8, 0xa2, 0x50, 0x2f, 0x0d, 0x43, 0x2d, 0x8d, 0x35, 0x75, 0x69, 0xaf, 0x4a, 0xda, 0x2d,
-	0x6d, 0xa3, 0x22, 0x6d, 0x62, 0x5c, 0x00, 0xff, 0x88, 0x60, 0x31, 0x19, 0x58, 0x46, 0x05, 0xb7,
-	0x34, 0xd2, 0xd4, 0x85, 0x7d, 0x49, 0xc2, 0x6e, 0x6a, 0x97, 0x2b, 0xc3, 0xfa, 0x54, 0xa0, 0xfe,
-	0x84, 0xe0, 0x6c, 0x3a, 0x79, 0x28, 0xd6, 0x21, 0x79, 0x56, 0x1e, 0x4e, 0xea, 0xc2, 0xbe, 0x2c,
-	0x61, 0x9b, 0xda, 0x95, 0x4a, 0xb0, 0x71, 0x62, 0x5b, 0xd0, 0xfe, 0x86, 0xe0, 0x71, 0x35, 0xbe,
-	0x29, 0x5e, 0x32, 0xc8, 0x7b, 0x7a, 0xc6, 0xab, 0x4b, 0xfc, 0x8a, 0x24, 0xde, 0xd6, 0xf4, 0x4a,
-	0xc4, 0x3c, 0xb3, 0x2e, 0x98, 0xbf, 0x45, 0x30, 0x2f, 0x86, 0x44, 0x85, 0x3b, 0xe4, 0x0e, 0x2c,
-	0x0c, 0x91, 0x75, 0x49, 0x77, 0x24, 0xa9, 0xae, 0xbd, 0x50, 0xcd, 0xb7, 0x9c, 0x85, 0x02, 0xf2,
-	0x6b, 0x04, 0xf3, 0xa2, 0xfd, 0x8e, 0x82, 0x2c, 0xb4, 0xe7, 0xba, 0x90, 0x1b, 0x12, 0xf2, 0x79,
-	0x42, 0x46, 0x43, 0x7a, 0x6e, 0x20, 0xeb, 0xa9, 0x0f, 0x67, 0x92, 0x81, 0x32, 0x1e, 0xd6, 0xdd,
-	0xf2, 0x59, 0x57, 0xc3, 0xf9, 0x69, 0x36, 0x95, 0x90, 0x6b, 0xd2, 0xd6, 0x0e, 0xde, 0xaa, 0xe4,
-	0x90, 0x07, 0xe9, 0x60, 0x72, 0x6c, 0x78, 0xcc, 0xd9, 0x44, 0xaf, 0x5d, 0xff, 0xfd, 0x64, 0x19,
-	0xfd, 0x71, 0xb2, 0x8c, 0xfe, 0x3a, 0x59, 0x46, 0xef, 0x19, 0xff, 0xf5, 0xd3, 0xe0, 0xd4, 0x1f,
-	0x90, 0xf6, 0xb4, 0xfc, 0x07, 0xb0, 0xfd, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb7, 0x33, 0x07,
-	0xf1, 0x22, 0x11, 0x00, 0x00,
+	0x14, 0xc7, 0x35, 0x69, 0xc8, 0x65, 0x72, 0x69, 0x3b, 0x40, 0x59, 0x59, 0x69, 0x9a, 0x0e, 0x04,
+	0x42, 0x9a, 0xd8, 0xd9, 0x24, 0x40, 0xa9, 0x54, 0xa4, 0x92, 0x94, 0x00, 0x5a, 0x41, 0xe5, 0x80,
+	0x50, 0x79, 0x73, 0xbc, 0x27, 0x8e, 0x1b, 0xdb, 0x63, 0xec, 0xd9, 0x8d, 0x96, 0x2a, 0x20, 0x78,
+	0x44, 0x08, 0x1e, 0x78, 0x41, 0xf0, 0x82, 0xb8, 0x48, 0x48, 0x48, 0x5c, 0xbe, 0x05, 0x8f, 0x48,
+	0x7c, 0x01, 0x14, 0xf1, 0x41, 0xd0, 0x8c, 0xed, 0xb1, 0x9d, 0x5d, 0x16, 0x13, 0x23, 0xfa, 0x36,
+	0xb3, 0xb3, 0x73, 0xfe, 0xbf, 0x39, 0x97, 0x99, 0x23, 0xe3, 0xc5, 0xf0, 0xd0, 0x31, 0xac, 0xd0,
+	0xb5, 0x3d, 0x17, 0x02, 0x6e, 0x1c, 0xb1, 0xe8, 0x70, 0xdf, 0x63, 0x47, 0x6a, 0xa0, 0x87, 0x11,
+	0xe3, 0x8c, 0x4c, 0x64, 0x73, 0x6d, 0xd5, 0x71, 0xf9, 0x41, 0x67, 0x4f, 0xb7, 0x99, 0x6f, 0x38,
+	0xcc, 0x61, 0x86, 0xfc, 0xc3, 0x5e, 0x67, 0x5f, 0xce, 0xe4, 0x44, 0x8e, 0x92, 0x8d, 0xda, 0x9c,
+	0xc3, 0x98, 0xe3, 0x81, 0x90, 0x30, 0xac, 0x20, 0x60, 0xdc, 0xe2, 0x2e, 0x0b, 0xe2, 0x74, 0x75,
+	0xf3, 0xf0, 0x7a, 0xac, 0xbb, 0x4c, 0xac, 0xfa, 0x96, 0x7d, 0xe0, 0x06, 0x10, 0xf5, 0x8c, 0x94,
+	0x28, 0x36, 0x7c, 0xe0, 0x96, 0xd1, 0x6d, 0x1a, 0x0e, 0x04, 0x10, 0x59, 0x1c, 0xda, 0xe9, 0xae,
+	0xad, 0x02, 0x82, 0x15, 0x49, 0xd1, 0x7b, 0x72, 0x90, 0x6f, 0x55, 0xe7, 0xe8, 0x36, 0x2d, 0x2f,
+	0x3c, 0xb0, 0xfa, 0x8d, 0xd0, 0x5c, 0xda, 0xb0, 0x59, 0x04, 0x03, 0x84, 0xe8, 0x4f, 0x23, 0xf8,
+	0xd1, 0xb7, 0x52, 0x4b, 0x5b, 0x11, 0x58, 0x1c, 0x4c, 0x78, 0xa7, 0x03, 0x31, 0x27, 0x73, 0x78,
+	0x32, 0xb0, 0x7c, 0x88, 0x43, 0xcb, 0x86, 0x06, 0x5a, 0x40, 0x4b, 0x93, 0x66, 0xfe, 0x03, 0xb9,
+	0x8b, 0x95, 0xbf, 0x1a, 0x23, 0x0b, 0x68, 0x69, 0x6a, 0xfd, 0xa6, 0x9e, 0x33, 0xeb, 0x19, 0xb3,
+	0x1c, 0xe8, 0xe1, 0xa1, 0xa3, 0x0b, 0x66, 0x5d, 0xb9, 0x3c, 0x63, 0xd6, 0x33, 0x6d, 0x53, 0x99,
+	0x23, 0xf3, 0x18, 0xbb, 0x41, 0xcc, 0xad, 0xc0, 0x86, 0x57, 0xb6, 0x1b, 0xe7, 0xa4, 0x72, 0xe1,
+	0x17, 0x42, 0xf1, 0x74, 0x0c, 0x51, 0x17, 0xa2, 0xed, 0xa8, 0x67, 0x76, 0x82, 0xc6, 0xe8, 0x02,
+	0x5a, 0x9a, 0x30, 0x4b, 0xbf, 0x91, 0xbb, 0x78, 0xc6, 0x96, 0xa7, 0x79, 0x3d, 0x94, 0xc1, 0x68,
+	0x3c, 0x24, 0x19, 0x37, 0xf4, 0xc4, 0x25, 0x7a, 0x31, 0x1a, 0x39, 0x9e, 0x88, 0x86, 0xde, 0x6d,
+	0xea, 0x5b, 0xc5, 0xad, 0x66, 0xd9, 0x12, 0xfd, 0x19, 0x61, 0x92, 0x51, 0xef, 0x00, 0xcf, 0xdc,
+	0x45, 0xf0, 0xa8, 0xf0, 0x4e, 0xea, 0x29, 0x39, 0x2e, 0xbb, 0x70, 0xe4, 0xb4, 0x0b, 0xef, 0x60,
+	0xec, 0x00, 0xcf, 0x00, 0xcf, 0x49, 0xc0, 0xb5, 0x6a, 0x80, 0x3b, 0x6a, 0x9f, 0x59, 0xb0, 0x41,
+	0x2e, 0xe1, 0xb1, 0x7d, 0x17, 0xbc, 0x76, 0x2c, 0x7d, 0x32, 0x69, 0xa6, 0x33, 0xfa, 0x15, 0xc2,
+	0x0f, 0x67, 0xc8, 0x2d, 0x37, 0xe6, 0xd5, 0x42, 0xbc, 0x8b, 0xa7, 0x3c, 0x37, 0x56, 0x80, 0x49,
+	0x94, 0x9b, 0xd5, 0x00, 0x5b, 0xf9, 0x46, 0xb3, 0x68, 0xa5, 0x80, 0x78, 0xae, 0x84, 0xe8, 0xe0,
+	0xc7, 0x54, 0x2a, 0x40, 0xdc, 0xd9, 0xf3, 0xdd, 0x1a, 0x9e, 0xd5, 0xf0, 0x84, 0x0f, 0x3e, 0x73,
+	0xdf, 0x85, 0xb6, 0x94, 0x99, 0x30, 0xd5, 0x9c, 0xbe, 0x8c, 0x1f, 0xc9, 0x85, 0x78, 0xd4, 0x3b,
+	0xb3, 0x0a, 0x3d, 0xca, 0x2b, 0x47, 0x20, 0xfb, 0x70, 0x76, 0xe0, 0x15, 0x7c, 0x31, 0x60, 0x6d,
+	0x78, 0x49, 0xf8, 0x62, 0x17, 0x3c, 0xb0, 0x39, 0x8b, 0x52, 0x07, 0xf5, 0x2f, 0xd0, 0x16, 0x6e,
+	0x64, 0xc2, 0x6f, 0x40, 0xe4, 0xbb, 0x41, 0xa1, 0x6a, 0xff, 0xfd, 0x31, 0x3e, 0x2d, 0x24, 0xc7,
+	0x2e, 0x67, 0xe1, 0xff, 0x74, 0x0a, 0xd2, 0xc0, 0xe3, 0x3e, 0xc4, 0xb1, 0xe5, 0x40, 0x9a, 0xad,
+	0xd9, 0x94, 0xbe, 0x8a, 0x2f, 0x29, 0xa0, 0x4e, 0x1c, 0x42, 0xd0, 0x3e, 0xfb, 0xe9, 0xbe, 0x29,
+	0x54, 0x6b, 0x8b, 0x39, 0x67, 0x3f, 0x5c, 0x03, 0x8f, 0x87, 0xac, 0xfd, 0x9a, 0xd8, 0x94, 0x1c,
+	0x29, 0x9b, 0x92, 0x5b, 0x18, 0x7b, 0xcc, 0xc9, 0xca, 0x64, 0x54, 0x96, 0xc9, 0xd5, 0x42, 0x99,
+	0xe8, 0xe2, 0xee, 0x15, 0x45, 0x71, 0x87, 0xb5, 0x5b, 0xea, 0x8f, 0x66, 0x61, 0x13, 0xfd, 0x16,
+	0xe5, 0xb9, 0xb4, 0x0d, 0x1e, 0xd4, 0x88, 0xa7, 0xb8, 0xfa, 0xda, 0xd2, 0x44, 0xf9, 0x66, 0xa9,
+	0x78, 0xf5, 0x6d, 0x17, 0xb7, 0x9a, 0x65, 0x4b, 0xb4, 0x91, 0x07, 0x26, 0xa3, 0x8c, 0x43, 0x16,
+	0xc4, 0x40, 0x3f, 0x12, 0x07, 0xb0, 0xb8, 0x7d, 0x90, 0xad, 0xc7, 0x0f, 0xee, 0x8e, 0xa1, 0xef,
+	0xe7, 0x21, 0x97, 0x4c, 0xb7, 0xbb, 0x10, 0x48, 0x4f, 0xf2, 0x5e, 0xa8, 0x3c, 0x29, 0xc6, 0xe4,
+	0x4d, 0x3c, 0xc6, 0xf6, 0xee, 0x81, 0xcd, 0xff, 0x9b, 0x37, 0x2c, 0x35, 0x46, 0x5f, 0xc0, 0x13,
+	0x2d, 0xe6, 0xdc, 0x0e, 0x78, 0xd4, 0x13, 0x79, 0x63, 0xb3, 0x80, 0x43, 0xc0, 0x53, 0xe5, 0x6c,
+	0x5a, 0xcc, 0xa8, 0x91, 0x52, 0x46, 0xd1, 0x4f, 0x4a, 0xf7, 0x75, 0xc0, 0x1f, 0xf4, 0x93, 0xbc,
+	0xfe, 0xf1, 0x05, 0x7c, 0x5e, 0x95, 0x24, 0x44, 0x5d, 0xd7, 0x06, 0xf2, 0x05, 0xc2, 0xb3, 0xc9,
+	0x43, 0x99, 0xad, 0x90, 0x2b, 0xb9, 0xb5, 0x81, 0x3d, 0x85, 0x56, 0x0f, 0x88, 0x2e, 0x7d, 0xf8,
+	0xfb, 0x9f, 0x9f, 0x8d, 0x50, 0x7a, 0x59, 0xb6, 0x34, 0xdd, 0xa6, 0xea, 0x81, 0x62, 0xe3, 0xbe,
+	0xf2, 0xc3, 0xf1, 0x0d, 0xb4, 0x4c, 0x3e, 0x47, 0x78, 0x6a, 0x07, 0xb8, 0x22, 0x9b, 0xeb, 0x27,
+	0xcb, 0xdf, 0xee, 0xba, 0x58, 0x2b, 0x12, 0xeb, 0x49, 0xf2, 0xc4, 0x50, 0xac, 0x64, 0x7c, 0x2c,
+	0xd0, 0x66, 0x44, 0xea, 0xaa, 0x4a, 0x21, 0x97, 0xfb, 0xe1, 0x0a, 0xaf, 0xb4, 0x76, 0xab, 0x16,
+	0x9d, 0xb0, 0x44, 0x17, 0x25, 0xe1, 0x15, 0x32, 0xdc, 0x71, 0xe4, 0x3d, 0x3c, 0x5b, 0x2e, 0xe2,
+	0x52, 0x44, 0x07, 0x95, 0xb7, 0x36, 0xc0, 0xb1, 0x79, 0xcd, 0xd1, 0x6b, 0x52, 0x77, 0x91, 0x3c,
+	0x7e, 0x5a, 0x77, 0x15, 0xc4, 0x7a, 0x49, 0x7d, 0x0d, 0x91, 0x0f, 0x10, 0x9e, 0x4d, 0x2e, 0x96,
+	0x61, 0x29, 0x55, 0xba, 0x20, 0xb5, 0x85, 0xbf, 0xff, 0x43, 0x7a, 0x37, 0xa5, 0xe1, 0x59, 0xae,
+	0x16, 0x9e, 0xef, 0x10, 0x9e, 0x91, 0x8d, 0x81, 0x42, 0x98, 0xef, 0x57, 0x28, 0x76, 0x0e, 0x75,
+	0xb3, 0xe7, 0x19, 0x89, 0x67, 0x68, 0xcb, 0x55, 0xf0, 0x8c, 0x48, 0x28, 0x8b, 0x0c, 0xff, 0x11,
+	0xe1, 0x0b, 0x59, 0xa7, 0xa4, 0x50, 0xaf, 0x0e, 0x42, 0x2d, 0x75, 0x53, 0x75, 0x69, 0xaf, 0x4b,
+	0xda, 0x75, 0x6d, 0xb5, 0x22, 0x6d, 0x22, 0x2e, 0x80, 0xbf, 0x47, 0x78, 0x36, 0xe9, 0x93, 0x86,
+	0x05, 0xb7, 0xd4, 0x49, 0xd5, 0x85, 0x7d, 0x56, 0xc2, 0xae, 0x69, 0xd7, 0x2a, 0xc3, 0xfa, 0x20,
+	0x50, 0x7f, 0x40, 0xf8, 0x7c, 0xda, 0x79, 0x28, 0xd6, 0x01, 0x79, 0x56, 0x6e, 0x4e, 0xea, 0xc2,
+	0x3e, 0x27, 0x61, 0x9b, 0xda, 0x4a, 0x25, 0xd8, 0x38, 0xd1, 0x16, 0xb4, 0xbf, 0x20, 0x7c, 0x51,
+	0xf5, 0x81, 0x8a, 0x97, 0xf6, 0xf3, 0x9e, 0x6e, 0x16, 0xeb, 0x12, 0x3f, 0x2f, 0x89, 0x37, 0x34,
+	0xbd, 0x12, 0x31, 0xcf, 0xd4, 0x05, 0xf3, 0xd7, 0x08, 0x4f, 0x8b, 0x66, 0x53, 0xe1, 0x0e, 0xb8,
+	0x03, 0x0b, 0xcd, 0x68, 0x5d, 0xd2, 0x4d, 0x49, 0xaa, 0x6b, 0x4f, 0x57, 0xf3, 0x2d, 0x67, 0xa1,
+	0x80, 0xfc, 0x12, 0xe1, 0x69, 0xf1, 0xfc, 0x0e, 0x83, 0x2c, 0x3c, 0xcf, 0x75, 0x21, 0x57, 0x25,
+	0xe4, 0x53, 0x94, 0x0e, 0x87, 0xf4, 0xdc, 0x40, 0xd6, 0x53, 0x0f, 0x8f, 0x27, 0x0d, 0x65, 0x3c,
+	0xe8, 0x75, 0xcb, 0x7b, 0x5d, 0x8d, 0xe4, 0xab, 0x59, 0x57, 0x42, 0x6f, 0x48, 0xad, 0x4d, 0xb2,
+	0x5e, 0xc9, 0x21, 0xf7, 0xd3, 0xc6, 0xe4, 0xd8, 0xf0, 0x98, 0xb3, 0x86, 0x5e, 0xbc, 0xf9, 0xeb,
+	0xc9, 0x3c, 0xfa, 0xed, 0x64, 0x1e, 0xfd, 0x71, 0x32, 0x8f, 0xde, 0x36, 0xfe, 0xe9, 0x5b, 0xc5,
+	0xa9, 0x0f, 0x2f, 0x7b, 0x63, 0xf2, 0xd3, 0xc3, 0xc6, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff,
+	0xd7, 0xe7, 0x76, 0x99, 0x11, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1952,6 +1978,13 @@ func (m *WorkflowResumeRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
+	if len(m.NodeFieldSelector) > 0 {
+		i -= len(m.NodeFieldSelector)
+		copy(dAtA[i:], m.NodeFieldSelector)
+		i = encodeVarintWorkflow(dAtA, i, uint64(len(m.NodeFieldSelector)))
+		i--
+		dAtA[i] = 0x1a
+	}
 	if len(m.Namespace) > 0 {
 		i -= len(m.Namespace)
 		copy(dAtA[i:], m.Namespace)
@@ -2034,6 +2067,20 @@ func (m *WorkflowStopRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
+	if len(m.Message) > 0 {
+		i -= len(m.Message)
+		copy(dAtA[i:], m.Message)
+		i = encodeVarintWorkflow(dAtA, i, uint64(len(m.Message)))
+		i--
+		dAtA[i] = 0x22
+	}
+	if len(m.NodeFieldSelector) > 0 {
+		i -= len(m.NodeFieldSelector)
+		copy(dAtA[i:], m.NodeFieldSelector)
+		i = encodeVarintWorkflow(dAtA, i, uint64(len(m.NodeFieldSelector)))
+		i--
+		dAtA[i] = 0x1a
+	}
 	if len(m.Namespace) > 0 {
 		i -= len(m.Namespace)
 		copy(dAtA[i:], m.Namespace)
@@ -2562,6 +2609,10 @@ func (m *WorkflowResumeRequest) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovWorkflow(uint64(l))
 	}
+	l = len(m.NodeFieldSelector)
+	if l > 0 {
+		n += 1 + l + sovWorkflow(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -2602,6 +2653,14 @@ func (m *WorkflowStopRequest) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovWorkflow(uint64(l))
 	}
+	l = len(m.NodeFieldSelector)
+	if l > 0 {
+		n += 1 + l + sovWorkflow(uint64(l))
+	}
+	l = len(m.Message)
+	if l > 0 {
+		n += 1 + l + sovWorkflow(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -3677,6 +3736,38 @@ func (m *WorkflowResumeRequest) Unmarshal(dAtA []byte) error {
 			}
 			m.Namespace = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field NodeFieldSelector", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowWorkflow
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthWorkflow
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthWorkflow
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.NodeFieldSelector = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipWorkflow(dAtA[iNdEx:])
@@ -3913,6 +4004,70 @@ func (m *WorkflowStopRequest) Unmarshal(dAtA []byte) error {
 			}
 			m.Namespace = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field NodeFieldSelector", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowWorkflow
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthWorkflow
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthWorkflow
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.NodeFieldSelector = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 4:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Message", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowWorkflow
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthWorkflow
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthWorkflow
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Message = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipWorkflow(dAtA[iNdEx:])
diff --git a/pkg/apiclient/workflow/workflow.proto b/pkg/apiclient/workflow/workflow.proto
index ac18ee454..8f71fd92f 100644
--- a/pkg/apiclient/workflow/workflow.proto
+++ b/pkg/apiclient/workflow/workflow.proto
@@ -48,6 +48,7 @@ message WorkflowRetryRequest {
 message WorkflowResumeRequest {
     string name = 1;
     string namespace = 2;
+    string nodeFieldSelector = 3;
 }
 
 message WorkflowTerminateRequest {
@@ -58,6 +59,8 @@ message WorkflowTerminateRequest {
 message WorkflowStopRequest {
      string name = 1;
      string namespace = 2;
+     string nodeFieldSelector = 3;
+     string message = 4;
 }
 
 message WorkflowSuspendRequest {
diff --git a/pkg/apiclient/workflow/workflow.swagger.json b/pkg/apiclient/workflow/workflow.swagger.json
index 84b1309e0..9b946c004 100644
--- a/pkg/apiclient/workflow/workflow.swagger.json
+++ b/pkg/apiclient/workflow/workflow.swagger.json
@@ -4903,6 +4903,9 @@
         },
         "namespace": {
           "type": "string"
+        },
+        "nodeFieldSelector": {
+          "type": "string"
         }
       }
     },
@@ -4925,6 +4928,12 @@
         },
         "namespace": {
           "type": "string"
+        },
+        "nodeFieldSelector": {
+          "type": "string"
+        },
+        "message": {
+          "type": "string"
         }
       }
     },
diff --git a/server/workflow/workflow_server.go b/server/workflow/workflow_server.go
index 08df3e3bc..11de2fd64 100644
--- a/server/workflow/workflow_server.go
+++ b/server/workflow/workflow_server.go
@@ -256,7 +256,7 @@ func (s *workflowServer) ResumeWorkflow(ctx context.Context, req *workflowpkg.Wo
 		return nil, err
 	}
 
-	err = util.ResumeWorkflow(wfClient.ArgoprojV1alpha1().Workflows(req.Namespace), req.Name)
+	err = util.ResumeWorkflow(wfClient.ArgoprojV1alpha1().Workflows(req.Namespace), req.Name, req.NodeFieldSelector)
 	if err != nil {
 		log.Warnf("Failed to resume %s: %+v", req.Name, err)
 		return nil, err
@@ -313,7 +313,7 @@ func (s *workflowServer) TerminateWorkflow(ctx context.Context, req *workflowpkg
 
 func (s *workflowServer) StopWorkflow(ctx context.Context, req *workflowpkg.WorkflowStopRequest) (*v1alpha1.Workflow, error) {
 	wfClient := auth.GetWfClient(ctx)
-	err := util.StopWorkflow(wfClient.ArgoprojV1alpha1().Workflows(req.Namespace), req.Name)
+	err := util.StopWorkflow(wfClient.ArgoprojV1alpha1().Workflows(req.Namespace), req.Name, req.NodeFieldSelector, req.Message)
 	if err != nil {
 		return nil, err
 	}
diff --git a/workflow/util/util.go b/workflow/util/util.go
index 77a96def2..1cf6e2187 100644
--- a/workflow/util/util.go
+++ b/workflow/util/util.go
@@ -18,6 +18,7 @@ import (
 	apierr "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -337,8 +338,59 @@ func SuspendWorkflow(wfIf v1alpha1.WorkflowInterface, workflowName string) error
 
 // ResumeWorkflow resumes a workflow by setting spec.suspend to nil and any suspended nodes to Successful.
 // Retries conflict errors
-func ResumeWorkflow(wfIf v1alpha1.WorkflowInterface, workflowName string) error {
-	err := wait.ExponentialBackoff(retry.DefaultRetry, func() (bool, error) {
+func ResumeWorkflow(wfIf v1alpha1.WorkflowInterface, workflowName string, nodeFieldSelector string) error {
+	if len(nodeFieldSelector) > 0 {
+		return updateWorkflowNodeByKey(wfIf, workflowName, nodeFieldSelector, wfv1.NodeSucceeded, "")
+	} else {
+		err := wait.ExponentialBackoff(retry.DefaultRetry, func() (bool, error) {
+			wf, err := wfIf.Get(workflowName, metav1.GetOptions{})
+			if err != nil {
+				return false, err
+			}
+
+			err = packer.DecompressWorkflow(wf)
+			if err != nil {
+				log.Fatal(err)
+			}
+
+			workflowUpdated := false
+			if wf.Spec.Suspend != nil && *wf.Spec.Suspend {
+				wf.Spec.Suspend = nil
+				workflowUpdated = true
+			}
+
+			// To resume a workflow with a suspended node we simply mark the node as Successful
+			for nodeID, node := range wf.Status.Nodes {
+				if node.IsActiveSuspendNode() {
+					node.Phase = wfv1.NodeSucceeded
+					node.FinishedAt = metav1.Time{Time: time.Now().UTC()}
+					wf.Status.Nodes[nodeID] = node
+					workflowUpdated = true
+				}
+			}
+
+			if workflowUpdated {
+				_, err = wfIf.Update(wf)
+				if err != nil {
+					if apierr.IsConflict(err) {
+						return false, nil
+					}
+					return false, err
+				}
+			}
+			return true, nil
+		})
+		return err
+	}
+}
+
+func updateWorkflowNodeByKey(wfIf v1alpha1.WorkflowInterface, workflowName string, nodeFieldSelector string, phase wfv1.NodePhase, message string) error {
+	selector, err := fields.ParseSelector(nodeFieldSelector)
+
+	if err != nil {
+		return err
+	}
+	err = wait.ExponentialBackoff(retry.DefaultRetry, func() (bool, error) {
 		wf, err := wfIf.Get(workflowName, metav1.GetOptions{})
 		if err != nil {
 			return false, err
@@ -349,21 +401,30 @@ func ResumeWorkflow(wfIf v1alpha1.WorkflowInterface, workflowName string) error
 			log.Fatal(err)
 		}
 
-		updated := false
-		if wf.Spec.Suspend != nil && *wf.Spec.Suspend {
-			wf.Spec.Suspend = nil
-			updated = true
-		}
-		// To resume a workflow with a suspended node we simply mark the node as Successful
+		nodeUpdated := false
 		for nodeID, node := range wf.Status.Nodes {
 			if node.IsActiveSuspendNode() {
-				node.Phase = wfv1.NodeSucceeded
-				node.FinishedAt = metav1.Time{Time: time.Now().UTC()}
-				wf.Status.Nodes[nodeID] = node
-				updated = true
+				nodeFields := fields.Set{
+					"displayName": node.DisplayName,
+				}
+				if node.Inputs != nil {
+					for _, inParam := range node.Inputs.Parameters {
+						nodeFields[fmt.Sprintf("inputs.parameters.%s.value", inParam.Name)] = *inParam.Value
+					}
+				}
+
+				if selector.Matches(nodeFields) {
+					node.Phase = phase
+					node.FinishedAt = metav1.Time{Time: time.Now().UTC()}
+					if len(message) > 0 {
+						node.Message = message
+					}
+					wf.Status.Nodes[nodeID] = node
+					nodeUpdated = true
+				}
 			}
 		}
-		if updated {
+		if nodeUpdated {
 			_, err = wfIf.Update(wf)
 			if err != nil {
 				if apierr.IsConflict(err) {
@@ -371,6 +432,8 @@ func ResumeWorkflow(wfIf v1alpha1.WorkflowInterface, workflowName string) error
 				}
 				return false, err
 			}
+		} else {
+			return true, fmt.Errorf("No nodes matching nodeFieldSelector: %s", nodeFieldSelector)
 		}
 		return true, nil
 	})
@@ -620,29 +683,34 @@ func TerminateWorkflow(wfClient v1alpha1.WorkflowInterface, name string) error {
 }
 
 // StopWorkflow terminates a workflow by setting its spec.shutdown to ShutdownStrategyStop
-func StopWorkflow(wfClient v1alpha1.WorkflowInterface, name string) error {
-	patchObj := map[string]interface{}{
-		"spec": map[string]interface{}{
-			"shutdown": wfv1.ShutdownStrategyStop,
-		},
-	}
-	var err error
-	patch, err := json.Marshal(patchObj)
-	if err != nil {
-		return errors.InternalWrapError(err)
-	}
-	for attempt := 0; attempt < 10; attempt++ {
-		_, err = wfClient.Patch(name, types.MergePatchType, patch)
+// Or terminates a single resume step referenced by nodeFieldSelector
+func StopWorkflow(wfClient v1alpha1.WorkflowInterface, name string, nodeFieldSelector string, message string) error {
+	if len(nodeFieldSelector) > 0 {
+		return updateWorkflowNodeByKey(wfClient, name, nodeFieldSelector, wfv1.NodeFailed, message)
+	} else {
+		patchObj := map[string]interface{}{
+			"spec": map[string]interface{}{
+				"shutdown": wfv1.ShutdownStrategyStop,
+			},
+		}
+		var err error
+		patch, err := json.Marshal(patchObj)
 		if err != nil {
-			if !apierr.IsConflict(err) {
-				return err
+			return errors.InternalWrapError(err)
+		}
+		for attempt := 0; attempt < 10; attempt++ {
+			_, err = wfClient.Patch(name, types.MergePatchType, patch)
+			if err != nil {
+				if !apierr.IsConflict(err) {
+					return err
+				}
+			} else {
+				break
 			}
-		} else {
-			break
+			time.Sleep(100 * time.Millisecond)
 		}
-		time.Sleep(100 * time.Millisecond)
+		return err
 	}
-	return err
 }
 
 // Reads from stdin


Test patch:
diff --git a/test/e2e/cli_test.go b/test/e2e/cli_test.go
index fadba53a7..d9c62d5c0 100644
--- a/test/e2e/cli_test.go
+++ b/test/e2e/cli_test.go
@@ -277,6 +277,41 @@ func (s *CLISuite) TestWorkflowSuspendResume() {
 		})
 }
 
+func (s *CLISuite) TestNodeSuspendResume() {
+	s.Given().
+		Workflow("@testdata/node-suspend.yaml").
+		When().
+		SubmitWorkflow().
+		WaitForWorkflowCondition(func(wf *wfv1.Workflow) bool {
+			return wf.Status.AnyActiveSuspendNode()
+		}, "suspended node", 20*time.Second).
+		RunCli([]string{"resume", "node-suspend", "--node-selector", "inputs.parameters.tag.value=suspend1-tag1"}, func(t *testing.T, output string, err error) {
+			if assert.NoError(t, err) {
+				assert.Contains(t, output, "workflow node-suspend resumed")
+			}
+		}).
+		WaitForWorkflowCondition(func(wf *wfv1.Workflow) bool {
+			return wf.Status.AnyActiveSuspendNode()
+		}, "suspended node", 10*time.Second).
+		RunCli([]string{"stop", "node-suspend", "--node-selector", "inputs.parameters.tag.value=suspend2-tag1", "--message", "because"}, func(t *testing.T, output string, err error) {
+			if assert.NoError(t, err) {
+				assert.Contains(t, output, "workflow node-suspend stopped")
+			}
+		}).
+		WaitForWorkflowCondition(func(wf *wfv1.Workflow) bool {
+			return wf.Status.Phase == wfv1.NodeFailed
+		}, "suspended node", 10*time.Second).
+		Then().
+		ExpectWorkflow(func(t *testing.T, _ *corev1.ObjectMeta, status *wfv1.WorkflowStatus) {
+			if assert.Equal(t, wfv1.NodeFailed, status.Phase) {
+				r := regexp.MustCompile(`child '(node-suspend-[0-9]+)' failed`)
+				res := r.FindStringSubmatch(status.Message)
+				assert.Equal(t, len(res), 2)
+				assert.Equal(t, status.Nodes[res[1]].Message, "because")
+			}
+		})
+}
+
 func (s *CLISuite) TestWorkflowDelete() {
 	s.Run("DeleteByName", func() {
 		s.Given().
diff --git a/test/e2e/testdata/node-suspend.yaml b/test/e2e/testdata/node-suspend.yaml
new file mode 100644
index 000000000..ba5d1446e
--- /dev/null
+++ b/test/e2e/testdata/node-suspend.yaml
@@ -0,0 +1,37 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  name: node-suspend
+  labels:
+    argo-e2e: true
+spec:
+  entrypoint: node-suspend
+  templates:
+    - name: node-suspend
+      steps:
+      - - name: step1
+          template: whalesay
+      - - name: suspend1
+          template: suspend
+          arguments:
+            parameters:
+              - name: "tag"
+                value: "suspend1-{{steps.step1.outputs.result}}"
+      - - name: suspend2
+          template: suspend
+          arguments:
+            parameters:
+              - name: "tag"
+                value: "suspend2-{{steps.step1.outputs.result}}"
+
+    - name: whalesay
+      script:
+        image: python:alpine3.6
+        command: [sh]
+        source: echo tag1
+
+    - name: suspend
+      inputs:
+        parameters:
+          - name: tag
+      suspend: {}
\ No newline at end of file
diff --git a/test/e2e/testdata/workflow-template-nested-template.yaml b/test/e2e/testdata/workflow-template-nested-template.yaml
index ae16c23d1..60b0556ad 100644
--- a/test/e2e/testdata/workflow-template-nested-template.yaml
+++ b/test/e2e/testdata/workflow-template-nested-template.yaml
@@ -17,4 +17,4 @@ spec:
       template: whalesay-inner-template
       inputs:
         parameters:
-          - name: message
+          - name: message
\ No newline at end of file
diff --git a/workflow/controller/operator_test.go b/workflow/controller/operator_test.go
index 70a2a063d..6670c3fdb 100644
--- a/workflow/controller/operator_test.go
+++ b/workflow/controller/operator_test.go
@@ -847,7 +847,7 @@ func TestSuspendResume(t *testing.T) {
 	assert.Equal(t, 0, len(pods.Items))
 
 	// resume the workflow and operate again. two pods should be able to be scheduled
-	err = util.ResumeWorkflow(wfcset, wf.ObjectMeta.Name)
+	err = util.ResumeWorkflow(wfcset, wf.ObjectMeta.Name, "")
 	assert.NoError(t, err)
 	wf, err = wfcset.Get(wf.ObjectMeta.Name, metav1.GetOptions{})
 	assert.NoError(t, err)
@@ -1124,10 +1124,17 @@ spec:
     steps:
     - - name: approve
         template: approve
+        arguments:
+          parameters:
+          - name: param1
+            value: value1
     - - name: release
         template: whalesay
 
   - name: approve
+    inputs:
+      parameters:
+      - name: param1
     suspend: {}
 
   - name: whalesay
@@ -1159,7 +1166,92 @@ func TestSuspendTemplate(t *testing.T) {
 	assert.Equal(t, 0, len(pods.Items))
 
 	// resume the workflow. verify resume workflow edits nodestatus correctly
-	err = util.ResumeWorkflow(wfcset, wf.ObjectMeta.Name)
+	err = util.ResumeWorkflow(wfcset, wf.ObjectMeta.Name, "")
+	assert.NoError(t, err)
+	wf, err = wfcset.Get(wf.ObjectMeta.Name, metav1.GetOptions{})
+	assert.NoError(t, err)
+	assert.False(t, util.IsWorkflowSuspended(wf))
+
+	// operate the workflow. it should reach the second step
+	woc = newWorkflowOperationCtx(wf, controller)
+	woc.operate()
+	pods, err = controller.kubeclientset.CoreV1().Pods("").List(metav1.ListOptions{})
+	assert.NoError(t, err)
+	assert.Equal(t, 1, len(pods.Items))
+}
+
+func TestSuspendTemplateWithFailedResume(t *testing.T) {
+	controller := newController()
+	wfcset := controller.wfclientset.ArgoprojV1alpha1().Workflows("")
+
+	// operate the workflow. it should become in a suspended state after
+	wf := unmarshalWF(suspendTemplate)
+	wf, err := wfcset.Create(wf)
+	assert.NoError(t, err)
+	woc := newWorkflowOperationCtx(wf, controller)
+	woc.operate()
+	wf, err = wfcset.Get(wf.ObjectMeta.Name, metav1.GetOptions{})
+	assert.NoError(t, err)
+	assert.True(t, util.IsWorkflowSuspended(wf))
+
+	// operate again and verify no pods were scheduled
+	woc = newWorkflowOperationCtx(wf, controller)
+	woc.operate()
+	pods, err := controller.kubeclientset.CoreV1().Pods("").List(metav1.ListOptions{})
+	assert.NoError(t, err)
+	assert.Equal(t, 0, len(pods.Items))
+
+	// resume the workflow. verify resume workflow edits nodestatus correctly
+	err = util.StopWorkflow(wfcset, wf.ObjectMeta.Name, "inputs.parameters.param1.value=value1", "Step failed!")
+	assert.NoError(t, err)
+	wf, err = wfcset.Get(wf.ObjectMeta.Name, metav1.GetOptions{})
+	assert.NoError(t, err)
+	assert.False(t, util.IsWorkflowSuspended(wf))
+
+	// operate the workflow. it should be failed and not reach the second step
+	woc = newWorkflowOperationCtx(wf, controller)
+	woc.operate()
+	assert.Equal(t, wfv1.NodeFailed, woc.wf.Status.Phase)
+	pods, err = controller.kubeclientset.CoreV1().Pods("").List(metav1.ListOptions{})
+	assert.NoError(t, err)
+	assert.Equal(t, 0, len(pods.Items))
+}
+
+func TestSuspendTemplateWithFilteredResume(t *testing.T) {
+	controller := newController()
+	wfcset := controller.wfclientset.ArgoprojV1alpha1().Workflows("")
+
+	// operate the workflow. it should become in a suspended state after
+	wf := unmarshalWF(suspendTemplate)
+	wf, err := wfcset.Create(wf)
+	assert.NoError(t, err)
+	woc := newWorkflowOperationCtx(wf, controller)
+	woc.operate()
+	wf, err = wfcset.Get(wf.ObjectMeta.Name, metav1.GetOptions{})
+	assert.NoError(t, err)
+	assert.True(t, util.IsWorkflowSuspended(wf))
+
+	// operate again and verify no pods were scheduled
+	woc = newWorkflowOperationCtx(wf, controller)
+	woc.operate()
+	pods, err := controller.kubeclientset.CoreV1().Pods("").List(metav1.ListOptions{})
+	assert.NoError(t, err)
+	assert.Equal(t, 0, len(pods.Items))
+
+	// resume the workflow, but with non-matching selector
+	err = util.ResumeWorkflow(wfcset, wf.ObjectMeta.Name, "inputs.paramaters.param1.value=value2")
+	assert.Error(t, err)
+
+	// operate the workflow. nothing should have happened
+	woc = newWorkflowOperationCtx(wf, controller)
+	woc.operate()
+	pods, err = controller.kubeclientset.CoreV1().Pods("").List(metav1.ListOptions{})
+	assert.NoError(t, err)
+	assert.Equal(t, 0, len(pods.Items))
+	assert.True(t, util.IsWorkflowSuspended(wf))
+
+	// resume the workflow, but with matching selector
+	err = util.ResumeWorkflow(wfcset, wf.ObjectMeta.Name, "inputs.parameters.param1.value=value1")
 	assert.NoError(t, err)
 	wf, err = wfcset.Get(wf.ObjectMeta.Name, metav1.GetOptions{})
 	assert.NoError(t, err)