diff --git a/hack/generate-proto.sh b/hack/generate-proto.sh
index e70c6128b272..55cd4168ccbc 100755
--- a/hack/generate-proto.sh
+++ b/hack/generate-proto.sh
@@ -7,7 +7,8 @@ ${GOPATH}/bin/go-to-protobuf \
   --go-header-file=./hack/custom-boilerplate.go.txt \
   --packages=github.com/argoproj/argo/pkg/apis/workflow/v1alpha1 \
   --apimachinery-packages=+k8s.io/apimachinery/pkg/util/intstr,+k8s.io/apimachinery/pkg/api/resource,k8s.io/apimachinery/pkg/runtime/schema,+k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/api/core/v1,k8s.io/api/policy/v1beta1 \
-  --proto-import ./vendor
+  --proto-import ./vendor 2>&1 |
+  grep -v 'warning: Import .* is unused'
 
 for f in $(find pkg -name '*.proto'); do
   protoc \
@@ -20,7 +21,8 @@ for f in $(find pkg -name '*.proto'); do
     --gogofast_out=plugins=grpc:${GOPATH}/src \
     --grpc-gateway_out=logtostderr=true:${GOPATH}/src \
     --swagger_out=logtostderr=true,fqn_for_swagger_name=true:. \
-    $f
+    $f 2>&1 |
+    grep -v 'warning: Import .* is unused'
 done
 
-rm -Rf vendor
\ No newline at end of file
+rm -Rf vendor
diff --git a/pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.pb.go b/pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.pb.go
index ad168e52ea82..2768dca81944 100644
--- a/pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.pb.go
+++ b/pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.pb.go
@@ -11,7 +11,6 @@ import (
 	context "context"
 	fmt "fmt"
 	v1alpha1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
@@ -412,50 +411,49 @@ func init() {
 }
 
 var fileDescriptor_688d96b5f613e598 = []byte{
-	// 675 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0xc1, 0x6f, 0xd3, 0x3e,
-	0x14, 0x96, 0xab, 0x9f, 0x7e, 0x02, 0x4f, 0xbb, 0xf8, 0x00, 0x53, 0xd8, 0x2a, 0xb0, 0x86, 0x06,
-	0x85, 0x3a, 0xa4, 0xdb, 0x01, 0x15, 0xb1, 0xc3, 0x3a, 0xd4, 0x4b, 0x25, 0xa6, 0x0c, 0x84, 0xc6,
-	0xcd, 0x4d, 0xbd, 0x34, 0x34, 0x8d, 0x43, 0xe2, 0x76, 0x9a, 0x10, 0x17, 0x6e, 0x9c, 0x11, 0xff,
-	0x03, 0x7f, 0x0a, 0x27, 0x04, 0xe2, 0x84, 0xe0, 0x80, 0x2a, 0x2e, 0x88, 0x7f, 0x02, 0xc5, 0x49,
-	0x9a, 0x54, 0xe0, 0x35, 0xad, 0xb2, 0x0b, 0x37, 0xa7, 0xf6, 0xfb, 0xde, 0xf7, 0xbd, 0xf7, 0xfc,
-	0xd5, 0xf0, 0x81, 0x3f, 0xb0, 0x75, 0xea, 0x3b, 0x96, 0xeb, 0x30, 0x4f, 0xe8, 0x96, 0x3b, 0x0a,
-	0x05, 0x0b, 0x4e, 0x78, 0x30, 0x38, 0x76, 0xf9, 0x89, 0x60, 0x43, 0xdf, 0xa5, 0x82, 0xa5, 0xbf,
-	0xd7, 0xd3, 0x8d, 0x7a, 0xba, 0x43, 0xfc, 0x80, 0x0b, 0x8e, 0x2e, 0x2b, 0x02, 0xb5, 0xba, 0xed,
-	0x88, 0xfe, 0xa8, 0x4b, 0x2c, 0x3e, 0xd4, 0x6d, 0x6e, 0x73, 0x5d, 0x9e, 0xef, 0x8e, 0x8e, 0xe5,
-	0x97, 0xfc, 0x90, 0xab, 0x18, 0x47, 0x5b, 0xb7, 0x39, 0xb7, 0x5d, 0x16, 0x31, 0xd2, 0xa9, 0xe7,
-	0x71, 0x41, 0x85, 0xc3, 0xbd, 0x30, 0xd9, 0xdd, 0x19, 0xdc, 0x0d, 0x89, 0xc3, 0xa3, 0xdd, 0x21,
-	0xb5, 0xfa, 0x8e, 0xc7, 0x82, 0x53, 0x3d, 0x11, 0x10, 0xea, 0x43, 0x26, 0xa8, 0x3e, 0x36, 0x74,
-	0x9b, 0x79, 0x2c, 0xa0, 0x82, 0xf5, 0x92, 0xa8, 0x56, 0x8e, 0x02, 0x0d, 0x64, 0xd2, 0x67, 0x72,
-	0x91, 0x85, 0xa6, 0xb4, 0xf5, 0xb1, 0x41, 0x5d, 0xbf, 0x4f, 0xff, 0x00, 0xc1, 0xbf, 0x00, 0xdc,
-	0x6c, 0xc5, 0x1a, 0x9f, 0x24, 0x87, 0x1f, 0x25, 0x1a, 0x5b, 0x01, 0xa3, 0x82, 0x99, 0xec, 0xf9,
-	0x88, 0x85, 0x02, 0xf5, 0xe1, 0x85, 0x54, 0xfc, 0x1a, 0xb8, 0x0a, 0x6e, 0xac, 0x34, 0x3a, 0x24,
-	0x23, 0x40, 0x52, 0x02, 0x72, 0x41, 0xfc, 0x81, 0x4d, 0x22, 0x02, 0x24, 0x25, 0x40, 0x52, 0x02,
-	0x44, 0x91, 0xcc, 0x9c, 0xa2, 0xa3, 0x23, 0xb8, 0x6a, 0xc9, 0xd4, 0x0f, 0x7d, 0x59, 0xa4, 0xb5,
-	0x8a, 0x4c, 0xb7, 0x4d, 0xe2, 0x2a, 0x91, 0x7c, 0x95, 0xb2, 0x4c, 0x51, 0x95, 0xc8, 0xd8, 0x20,
-	0xad, 0x7c, 0xa8, 0x39, 0x8b, 0x84, 0x5f, 0x03, 0x78, 0x4d, 0x41, 0xa0, 0xcd, 0x44, 0x2a, 0x15,
-	0xc1, 0xff, 0x3c, 0x3a, 0x8c, 0x65, 0x5e, 0x34, 0xe5, 0x1a, 0x1d, 0x40, 0x68, 0x33, 0x31, 0xcb,
-	0xe8, 0x4e, 0x31, 0x46, 0xed, 0x69, 0x9c, 0x99, 0xc3, 0xc0, 0xa7, 0x10, 0x2b, 0xa8, 0x74, 0x9c,
-	0x70, 0xca, 0xe5, 0x10, 0xae, 0xb8, 0x4e, 0x38, 0x4d, 0x1c, 0x57, 0xde, 0x28, 0x96, 0xb8, 0x93,
-	0x05, 0x9a, 0x79, 0x14, 0xfc, 0x4e, 0xdd, 0xf4, 0xc7, 0x7e, 0x2f, 0xd7, 0xf4, 0x4b, 0xf9, 0x4a,
-	0xec, 0x55, 0xd6, 0x40, 0x52, 0x8d, 0xfc, 0x30, 0x54, 0xce, 0x73, 0x18, 0xf0, 0x5b, 0x35, 0xd5,
-	0x7d, 0xe6, 0xb2, 0x8c, 0xea, 0xdf, 0x9a, 0x76, 0x04, 0x57, 0x7b, 0xf2, 0xd0, 0x52, 0x93, 0xb4,
-	0x9f, 0x0f, 0x35, 0x67, 0x91, 0xf0, 0x16, 0xbc, 0x3e, 0x87, 0x56, 0xe8, 0x73, 0x2f, 0x64, 0xf8,
-	0x27, 0x38, 0xa3, 0xcf, 0x9e, 0xf8, 0x97, 0xae, 0x57, 0xe3, 0x03, 0x84, 0x55, 0x05, 0x81, 0x43,
-	0x16, 0x8c, 0x1d, 0x8b, 0xa1, 0xaf, 0x00, 0x6e, 0xc4, 0x18, 0x8a, 0x83, 0xe8, 0x3e, 0x51, 0x78,
-	0x2e, 0x29, 0xe2, 0x53, 0x5a, 0xa9, 0x65, 0xc3, 0xf5, 0x57, 0x9f, 0x7f, 0xbc, 0xa9, 0x6c, 0x61,
-	0x2c, 0x9d, 0x7b, 0x6c, 0xa8, 0xff, 0x30, 0xc2, 0x26, 0xa8, 0xa1, 0x2f, 0x00, 0x6a, 0x6d, 0x26,
-	0x54, 0xd2, 0x9a, 0x8b, 0x4a, 0xcb, 0x4c, 0xa9, 0x64, 0x5d, 0x86, 0xd4, 0x75, 0x0b, 0xdd, 0x9c,
-	0xaf, 0x4b, 0x7f, 0x11, 0xdd, 0xa5, 0x97, 0x91, 0xb6, 0xf5, 0xc8, 0x51, 0x14, 0x90, 0x21, 0xba,
-	0xb7, 0xa8, 0xba, 0x9c, 0xcf, 0x69, 0x07, 0x65, 0xca, 0x8b, 0x80, 0x71, 0x4d, 0x4a, 0xdc, 0x44,
-	0x05, 0x5a, 0x87, 0x26, 0x00, 0x6e, 0xc4, 0xce, 0x57, 0xda, 0x54, 0xce, 0x18, 0x69, 0xc9, 0xdd,
-	0xdb, 0x91, 0xd2, 0x88, 0x56, 0xbc, 0x7b, 0xd1, 0x70, 0x7e, 0x02, 0x70, 0x23, 0x36, 0xa7, 0xd2,
-	0x44, 0xce, 0x58, 0xb0, 0xb6, 0xbb, 0x6c, 0x78, 0x62, 0x95, 0xc9, 0x50, 0xd6, 0x16, 0x18, 0xca,
-	0x6f, 0x00, 0x5e, 0x89, 0x6c, 0x54, 0xa5, 0x68, 0x89, 0x99, 0xf4, 0xce, 0xe9, 0xca, 0x35, 0xa4,
-	0xba, 0xdb, 0x78, 0xab, 0x80, 0x3a, 0xd7, 0xf1, 0x44, 0x13, 0xd4, 0xf6, 0x3a, 0xef, 0x27, 0x55,
-	0xf0, 0x71, 0x52, 0x05, 0xdf, 0x27, 0x55, 0xf0, 0x74, 0x77, 0xde, 0x83, 0xef, 0xec, 0xc7, 0x6e,
-	0xf7, 0x7f, 0xf9, 0xe4, 0xdb, 0xfe, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x9c, 0xf2, 0x18, 0xa3, 0x1c,
-	0x0b, 0x00, 0x00,
+	// 657 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0x41, 0x6f, 0xd3, 0x30,
+	0x14, 0x96, 0x2b, 0x84, 0xc0, 0xd3, 0x2e, 0x3e, 0xc0, 0x14, 0xb6, 0x0a, 0xac, 0xa1, 0x42, 0xa1,
+	0x0e, 0xe9, 0x76, 0x40, 0x45, 0xec, 0xb0, 0x0e, 0xf5, 0x52, 0x89, 0x29, 0x03, 0xa1, 0x71, 0xf3,
+	0x52, 0x93, 0x86, 0xa6, 0x71, 0x48, 0xdc, 0x4e, 0x13, 0xe2, 0xc2, 0x8d, 0x33, 0xe2, 0x3f, 0xf0,
+	0x53, 0x38, 0x21, 0x10, 0x27, 0x04, 0x07, 0x54, 0x71, 0x41, 0xfc, 0x09, 0x14, 0x27, 0x69, 0x52,
+	0x81, 0xd7, 0xb4, 0xca, 0x2e, 0xdc, 0xac, 0xd8, 0xef, 0x7b, 0xdf, 0xf7, 0xde, 0xf3, 0x17, 0xc3,
+	0x07, 0xfe, 0xc0, 0xd6, 0xa9, 0xef, 0x58, 0xae, 0xc3, 0x3c, 0xa1, 0x5b, 0xee, 0x28, 0x14, 0x2c,
+	0x38, 0xe6, 0xc1, 0xe0, 0x99, 0xcb, 0x8f, 0x05, 0x1b, 0xfa, 0x2e, 0x15, 0x2c, 0xfd, 0xde, 0x48,
+	0x37, 0x1a, 0xe9, 0x0e, 0xf1, 0x03, 0x2e, 0x38, 0xba, 0xac, 0x08, 0xd4, 0xd6, 0x6d, 0xce, 0x6d,
+	0x97, 0x45, 0x29, 0x74, 0xea, 0x79, 0x5c, 0x50, 0xe1, 0x70, 0x2f, 0x8c, 0xc3, 0xb4, 0xed, 0xc1,
+	0xdd, 0x90, 0x38, 0x3c, 0xda, 0x1d, 0x52, 0xab, 0xef, 0x78, 0x2c, 0x38, 0xd1, 0x13, 0x46, 0xa1,
+	0x3e, 0x64, 0x82, 0xea, 0x63, 0x43, 0xb7, 0x99, 0xc7, 0x02, 0x2a, 0x58, 0x2f, 0x89, 0x6a, 0xdb,
+	0x8e, 0xe8, 0x8f, 0x8e, 0x88, 0xc5, 0x87, 0x3a, 0x0d, 0x6c, 0xee, 0x07, 0xfc, 0xb9, 0x5c, 0x64,
+	0xa1, 0x29, 0x0f, 0x7d, 0x6c, 0x50, 0xd7, 0xef, 0xd3, 0xbf, 0x40, 0xf0, 0x6f, 0x00, 0x37, 0xdb,
+	0x31, 0xe9, 0x27, 0xc9, 0xe1, 0x47, 0x09, 0xe9, 0x76, 0xc0, 0xa8, 0x60, 0x26, 0x7b, 0x31, 0x62,
+	0xa1, 0x40, 0x7d, 0x78, 0x21, 0x55, 0xb3, 0x06, 0xae, 0x82, 0x1b, 0x2b, 0xcd, 0x2e, 0xc9, 0x08,
+	0x90, 0x94, 0x80, 0x5c, 0x10, 0x7f, 0x60, 0x93, 0x88, 0x00, 0x49, 0x09, 0x90, 0x94, 0x00, 0x51,
+	0x24, 0x33, 0xa7, 0xe8, 0xe8, 0x10, 0xae, 0x5a, 0x32, 0xf5, 0x43, 0x5f, 0x16, 0x69, 0xad, 0x22,
+	0xd3, 0x6d, 0x91, 0xb8, 0x4a, 0x24, 0x5f, 0xa5, 0x2c, 0x53, 0x54, 0x25, 0x32, 0x36, 0x48, 0x3b,
+	0x1f, 0x6a, 0xce, 0x22, 0xe1, 0x37, 0x00, 0x5e, 0x53, 0x10, 0xe8, 0x30, 0x91, 0x4a, 0x45, 0xf0,
+	0x9c, 0x47, 0x87, 0xb1, 0xcc, 0x8b, 0xa6, 0x5c, 0xa3, 0x7d, 0x08, 0x6d, 0x26, 0x66, 0x19, 0xdd,
+	0x29, 0xc6, 0xa8, 0x33, 0x8d, 0x33, 0x73, 0x18, 0xf8, 0x04, 0x62, 0x05, 0x95, 0xae, 0x13, 0x4e,
+	0xb9, 0x1c, 0xc0, 0x15, 0xd7, 0x09, 0xa7, 0x89, 0xe3, 0xca, 0x1b, 0xc5, 0x12, 0x77, 0xb3, 0x40,
+	0x33, 0x8f, 0x82, 0xdf, 0xab, 0x9b, 0xfe, 0xd8, 0xef, 0xe5, 0x9a, 0x7e, 0x29, 0x5f, 0x89, 0xdd,
+	0xca, 0x1a, 0x48, 0xaa, 0x91, 0x1f, 0x86, 0xca, 0x59, 0x0e, 0x03, 0x7e, 0xa7, 0xa6, 0xba, 0xc7,
+	0x5c, 0x96, 0x51, 0xfd, 0x57, 0xd3, 0x0e, 0xe1, 0x6a, 0x4f, 0x1e, 0x5a, 0x6a, 0x92, 0xf6, 0xf2,
+	0xa1, 0xe6, 0x2c, 0x12, 0xae, 0xc1, 0xeb, 0x73, 0x68, 0x85, 0x3e, 0xf7, 0x42, 0x86, 0x7f, 0x81,
+	0x53, 0xfa, 0xec, 0x89, 0xff, 0xe9, 0x7a, 0x35, 0x3f, 0x42, 0x58, 0x55, 0x10, 0x38, 0x60, 0xc1,
+	0xd8, 0xb1, 0x18, 0xfa, 0x06, 0xe0, 0x46, 0x8c, 0xa1, 0x38, 0x88, 0xee, 0x13, 0x85, 0x89, 0x92,
+	0x22, 0x3e, 0xa5, 0x95, 0x5a, 0x36, 0xdc, 0x78, 0xfd, 0xe5, 0xe7, 0xdb, 0x4a, 0x0d, 0x63, 0xe9,
+	0xdc, 0x63, 0x43, 0xfd, 0x07, 0x08, 0x5b, 0xa0, 0x8e, 0xbe, 0x02, 0xa8, 0x75, 0x98, 0x50, 0x49,
+	0x6b, 0x2d, 0x2a, 0x2d, 0x33, 0xa5, 0x92, 0x75, 0x19, 0x52, 0xd7, 0x2d, 0x74, 0x73, 0xbe, 0x2e,
+	0xfd, 0x65, 0x74, 0x97, 0x5e, 0x45, 0xda, 0xd6, 0x23, 0x47, 0x51, 0x40, 0x86, 0xe8, 0xde, 0xa2,
+	0xea, 0x72, 0x3e, 0xa7, 0xed, 0x97, 0x29, 0x2f, 0x02, 0xc6, 0x75, 0x29, 0x71, 0x13, 0x15, 0x68,
+	0x1d, 0x9a, 0x00, 0xb8, 0x11, 0x3b, 0x5f, 0x69, 0x53, 0x39, 0x63, 0xa4, 0x25, 0x77, 0x6f, 0x5b,
+	0x4a, 0x23, 0x5a, 0xf1, 0xee, 0x45, 0xc3, 0xf9, 0x19, 0xc0, 0x8d, 0xd8, 0x9c, 0x4a, 0x13, 0x39,
+	0x63, 0xc1, 0xda, 0xce, 0xb2, 0xe1, 0x89, 0x55, 0x26, 0x43, 0x59, 0x5f, 0x60, 0x28, 0xbf, 0x03,
+	0x78, 0x25, 0xb2, 0x51, 0x95, 0xa2, 0x25, 0x66, 0xd2, 0x3b, 0xa3, 0x2b, 0xd7, 0x94, 0xea, 0x6e,
+	0xe3, 0x5a, 0x01, 0x75, 0xae, 0xe3, 0x89, 0x16, 0xa8, 0xef, 0x76, 0x3f, 0x4c, 0xaa, 0xe0, 0xd3,
+	0xa4, 0x0a, 0x7e, 0x4c, 0xaa, 0xe0, 0xe9, 0xce, 0xbc, 0x07, 0xdf, 0xe9, 0xaf, 0xd7, 0xa3, 0xf3,
+	0xf2, 0xc9, 0xb7, 0xf5, 0x27, 0x00, 0x00, 0xff, 0xff, 0x4c, 0xe9, 0x8c, 0x8f, 0xed, 0x0a, 0x00,
+	0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.proto b/pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.proto
index e9e6c00763ff..75dd9743eb25 100644
--- a/pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.proto
+++ b/pkg/apiclient/clusterworkflowtemplate/cluster-workflow-template.proto
@@ -1,7 +1,6 @@
 syntax = "proto3";
 option go_package = "github.com/argoproj/argo/pkg/apiclient/clusterworkflowtemplate";
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1/generated.proto";
diff --git a/pkg/apiclient/cronworkflow/cron-workflow.pb.go b/pkg/apiclient/cronworkflow/cron-workflow.pb.go
index 9f1ad394e09f..54c30bb9d1b4 100644
--- a/pkg/apiclient/cronworkflow/cron-workflow.pb.go
+++ b/pkg/apiclient/cronworkflow/cron-workflow.pb.go
@@ -7,14 +7,12 @@ import (
 	context "context"
 	fmt "fmt"
 	v1alpha1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	io "io"
-	_ "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	math "math"
 	math_bits "math/bits"
@@ -449,51 +447,49 @@ func init() {
 }
 
 var fileDescriptor_257f310938c448f8 = []byte{
-	// 692 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x96, 0xcb, 0x6e, 0x13, 0x3d,
-	0x14, 0xc7, 0xe5, 0xf4, 0xd3, 0x27, 0xea, 0x52, 0x01, 0x46, 0x2a, 0xe9, 0x50, 0xaa, 0xca, 0x2a,
-	0xf4, 0x02, 0xb5, 0x49, 0xdb, 0x05, 0x62, 0xd7, 0x0b, 0xea, 0xa6, 0x12, 0x68, 0x2a, 0x84, 0xca,
-	0xce, 0x9d, 0xb8, 0x93, 0x21, 0x13, 0x7b, 0x98, 0x71, 0x52, 0x21, 0xd4, 0x0d, 0x7b, 0x56, 0x2c,
-	0x41, 0xac, 0xd9, 0x70, 0x11, 0x0b, 0xc4, 0x23, 0xb0, 0x44, 0xe2, 0x05, 0x50, 0xc4, 0x5b, 0xb0,
-	0x41, 0xe3, 0x64, 0x32, 0x97, 0xcc, 0xa8, 0x03, 0x0d, 0x12, 0x3b, 0x3b, 0xe3, 0x73, 0xce, 0xcf,
-	0xff, 0x73, 0xf4, 0x8f, 0x21, 0xf1, 0x9a, 0x36, 0x65, 0x9e, 0x63, 0xb9, 0x0e, 0x17, 0x8a, 0x5a,
-	0xbe, 0x14, 0x47, 0xd2, 0x6f, 0x1e, 0xba, 0xf2, 0x48, 0x6f, 0x56, 0xa2, 0x1d, 0xf1, 0x7c, 0xa9,
-	0x24, 0x3a, 0x9b, 0x3c, 0x61, 0xac, 0xd8, 0x8e, 0x6a, 0xb4, 0x0f, 0x88, 0x25, 0x5b, 0xd4, 0x96,
-	0xb6, 0xa4, 0xfa, 0xd0, 0x41, 0xfb, 0x50, 0xef, 0xf4, 0x46, 0xaf, 0x7a, 0xc1, 0xc6, 0x8c, 0x2d,
-	0xa5, 0xed, 0xf2, 0xb0, 0x1e, 0x65, 0x42, 0x48, 0xc5, 0x94, 0x23, 0x45, 0xd0, 0xff, 0xba, 0xde,
-	0xbc, 0x15, 0x10, 0x47, 0x86, 0x5f, 0x5b, 0xcc, 0x6a, 0x38, 0x82, 0xfb, 0x4f, 0x68, 0x1f, 0x2f,
-	0xa0, 0x2d, 0xae, 0x18, 0xed, 0xd4, 0xa8, 0xcd, 0x05, 0xf7, 0x99, 0xe2, 0xf5, 0x7e, 0xd4, 0x56,
-	0x02, 0x81, 0xf9, 0xba, 0xe8, 0x23, 0xbd, 0x88, 0x43, 0x07, 0x17, 0xea, 0xd4, 0x98, 0xeb, 0x35,
-	0xd8, 0x70, 0x12, 0x1c, 0x97, 0xa6, 0x96, 0xf4, 0x79, 0x4e, 0x21, 0xfc, 0x1a, 0xc0, 0x4b, 0xbb,
-	0x8e, 0x50, 0x5b, 0xbe, 0x14, 0x0f, 0xfa, 0x19, 0x4d, 0xfe, 0xb8, 0xcd, 0x03, 0x85, 0x66, 0xe0,
-	0xb8, 0x60, 0x2d, 0x1e, 0x78, 0xcc, 0xe2, 0x55, 0x30, 0x07, 0x16, 0xc7, 0xcd, 0xf8, 0x07, 0xc4,
-	0xa1, 0x56, 0x2d, 0x0a, 0xaa, 0x56, 0xe6, 0xc0, 0xe2, 0xc4, 0xea, 0x06, 0x89, 0xc9, 0x49, 0x44,
-	0xae, 0x17, 0x61, 0x4f, 0x48, 0x48, 0x4e, 0x06, 0xe2, 0x47, 0xe4, 0x24, 0x55, 0x3d, 0x95, 0x16,
-	0xff, 0x04, 0x70, 0x7a, 0xcb, 0xe7, 0x4c, 0xf1, 0x7f, 0x15, 0x11, 0xed, 0xc3, 0x49, 0x4b, 0x13,
-	0xde, 0xf5, 0x74, 0xe7, 0xab, 0x63, 0xba, 0xce, 0x1a, 0xe9, 0xe9, 0x4f, 0x92, 0xad, 0x8f, 0x4b,
-	0x84, 0xad, 0x27, 0x9d, 0x30, 0x71, 0x22, 0xd4, 0x4c, 0x67, 0xc2, 0xcf, 0x01, 0xac, 0xee, 0x3a,
-	0x41, 0xaa, 0x3d, 0x41, 0xb9, 0xcb, 0xef, 0xc1, 0x09, 0xd7, 0x09, 0x54, 0xc4, 0xd4, 0xbb, 0x7b,
-	0xad, 0x1c, 0xd3, 0x6e, 0x1c, 0x68, 0x26, 0xb3, 0xe0, 0x57, 0x00, 0x4e, 0xed, 0xf0, 0xdc, 0x69,
-	0x41, 0xf0, 0xbf, 0xb0, 0x78, 0x1f, 0x44, 0xaf, 0xd3, 0x84, 0x95, 0x2c, 0xe1, 0x3d, 0x08, 0x6d,
-	0xae, 0xd2, 0xa2, 0xdd, 0x2c, 0x07, 0xb8, 0x33, 0x88, 0x33, 0x13, 0x39, 0xf0, 0x67, 0x00, 0xa7,
-	0xef, 0x7b, 0xf5, 0x82, 0x61, 0x99, 0x4a, 0x12, 0x6e, 0x56, 0xaa, 0xa0, 0x14, 0x65, 0x76, 0x88,
-	0xc6, 0xfe, 0xce, 0x9c, 0xbf, 0x01, 0x70, 0x7a, 0x9b, 0xbb, 0x3c, 0x1f, 0xfd, 0xf7, 0xc5, 0xdd,
-	0x87, 0x93, 0x75, 0x9d, 0xee, 0x8f, 0x86, 0x72, 0x3b, 0x19, 0x6a, 0xa6, 0x33, 0xe1, 0x2b, 0xf0,
-	0x72, 0x92, 0xb1, 0x77, 0xb6, 0x6e, 0xf2, 0xc0, 0x93, 0x22, 0xe0, 0xab, 0x1f, 0xcf, 0xc0, 0x8b,
-	0xc9, 0xef, 0x7b, 0xdc, 0xef, 0x38, 0x16, 0x47, 0x1f, 0x00, 0x3c, 0x9f, 0xb5, 0x1a, 0x74, 0x95,
-	0x24, 0xad, 0x97, 0x14, 0x58, 0x91, 0x71, 0x7a, 0xb9, 0xf1, 0xea, 0xb3, 0x6f, 0x3f, 0x5e, 0x54,
-	0x6e, 0xe0, 0x05, 0xed, 0x87, 0x9d, 0x5a, 0xfa, 0x8f, 0x20, 0xa0, 0x4f, 0x07, 0xda, 0x1d, 0x53,
-	0xd7, 0x11, 0xea, 0x36, 0x58, 0x46, 0xef, 0x01, 0x44, 0xc3, 0xe6, 0x83, 0x16, 0xd2, 0xd0, 0x85,
-	0xf6, 0x34, 0x0a, 0xec, 0x15, 0x8d, 0xbd, 0x80, 0xf1, 0xc9, 0xd8, 0x21, 0xf1, 0x3b, 0x00, 0x2f,
-	0x0c, 0x19, 0x06, 0xba, 0x96, 0x55, 0x39, 0xdf, 0x51, 0x8c, 0x3b, 0xa7, 0xe6, 0x0d, 0x53, 0xe3,
-	0x65, 0xcd, 0x3c, 0x8f, 0x4a, 0x30, 0xa3, 0xb7, 0x00, 0x9e, 0xcb, 0x38, 0x0a, 0x9a, 0x4f, 0xe3,
-	0xe6, 0x1b, 0xce, 0x28, 0xc4, 0xad, 0x69, 0xd0, 0xeb, 0x68, 0xa9, 0xc4, 0x4c, 0xe8, 0xf5, 0x31,
-	0xfa, 0x04, 0x20, 0x1a, 0xb6, 0x98, 0xec, 0x48, 0x14, 0x9a, 0xd0, 0x28, 0xa8, 0xd7, 0x35, 0x35,
-	0x31, 0xca, 0x53, 0x87, 0x93, 0xf1, 0x12, 0x40, 0x34, 0x6c, 0x30, 0x59, 0xf0, 0x42, 0x0b, 0x32,
-	0x96, 0xb2, 0x43, 0x5f, 0xe8, 0x00, 0x91, 0xac, 0xcb, 0xe5, 0x01, 0x37, 0x37, 0xbe, 0x74, 0x67,
-	0xc1, 0xd7, 0xee, 0x2c, 0xf8, 0xde, 0x9d, 0x05, 0x0f, 0xd7, 0x4e, 0x7a, 0xfe, 0xe4, 0x3c, 0xec,
-	0x0e, 0xfe, 0xd7, 0x2f, 0x9a, 0xb5, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x20, 0x02, 0xb7,
-	0xfd, 0x09, 0x00, 0x00,
+	// 666 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x96, 0xbf, 0x6f, 0xd3, 0x40,
+	0x14, 0xc7, 0x75, 0x29, 0x42, 0xf4, 0x95, 0x0a, 0x38, 0xa4, 0x92, 0x9a, 0x52, 0x55, 0x56, 0xa1,
+	0x6d, 0xa0, 0x67, 0x92, 0x74, 0x40, 0x6c, 0x6d, 0x8a, 0xba, 0x44, 0x02, 0xb9, 0x42, 0xa8, 0x6c,
+	0x57, 0xe7, 0x70, 0x4c, 0x9c, 0x3b, 0x63, 0x5f, 0x53, 0x21, 0xd4, 0x85, 0x9d, 0x89, 0x11, 0xc4,
+	0xcc, 0xc2, 0x0f, 0x31, 0x20, 0xfe, 0x04, 0x46, 0x24, 0xfe, 0x01, 0x14, 0xf1, 0x5f, 0xb0, 0x20,
+	0x5f, 0xe2, 0xc4, 0x76, 0x62, 0xd5, 0xd0, 0x20, 0xb1, 0x9d, 0x7d, 0xf7, 0xbe, 0xef, 0x73, 0xef,
+	0x3d, 0x7d, 0x75, 0x40, 0xbc, 0x96, 0x6d, 0x50, 0xcf, 0xb1, 0x5c, 0x87, 0x71, 0x69, 0x58, 0xbe,
+	0xe0, 0x87, 0xc2, 0x6f, 0x3d, 0x72, 0xc5, 0xa1, 0xfa, 0x58, 0x8f, 0xbe, 0x88, 0xe7, 0x0b, 0x29,
+	0xf0, 0xd9, 0xf8, 0x09, 0x6d, 0xc1, 0x16, 0xc2, 0x76, 0x59, 0x28, 0x60, 0x50, 0xce, 0x85, 0xa4,
+	0xd2, 0x11, 0x3c, 0xe8, 0x9d, 0xd5, 0x36, 0x5a, 0xb7, 0x02, 0xe2, 0x88, 0x70, 0xb7, 0x4d, 0xad,
+	0xa6, 0xc3, 0x99, 0xff, 0xd4, 0xe8, 0xe7, 0x0b, 0x8c, 0x36, 0x93, 0xd4, 0xe8, 0x94, 0x0d, 0x9b,
+	0x71, 0xe6, 0x53, 0xc9, 0x1a, 0xfd, 0xa8, 0x9a, 0xed, 0xc8, 0xe6, 0xc1, 0x3e, 0xb1, 0x44, 0xdb,
+	0xa0, 0xbe, 0x2d, 0x3c, 0x5f, 0x3c, 0x56, 0x8b, 0x61, 0xe8, 0x80, 0xb0, 0x53, 0xa6, 0xae, 0xd7,
+	0xa4, 0x23, 0x22, 0xfa, 0x1b, 0x04, 0x97, 0xea, 0x0e, 0x97, 0x35, 0x5f, 0xf0, 0x07, 0xfd, 0xd3,
+	0x26, 0x7b, 0x72, 0xc0, 0x02, 0x89, 0x17, 0x60, 0x9a, 0xd3, 0x36, 0x0b, 0x3c, 0x6a, 0xb1, 0x22,
+	0x5a, 0x42, 0xab, 0xd3, 0xe6, 0xf0, 0x07, 0x66, 0xa0, 0xae, 0x18, 0x05, 0x15, 0x0b, 0x4b, 0x68,
+	0x75, 0xa6, 0xb2, 0x49, 0x86, 0x54, 0x24, 0xa2, 0x52, 0x8b, 0xb0, 0x80, 0x24, 0xa4, 0x22, 0x83,
+	0x4a, 0x45, 0x54, 0x24, 0x91, 0x3d, 0x21, 0xab, 0xff, 0x42, 0x30, 0x5f, 0xf3, 0x19, 0x95, 0xec,
+	0x7f, 0x45, 0xc4, 0x7b, 0x30, 0x6b, 0x29, 0xc2, 0xbb, 0x9e, 0xea, 0x6a, 0x71, 0x4a, 0xe5, 0xa9,
+	0x92, 0x5e, 0x5b, 0x49, 0xbc, 0xad, 0xc3, 0x14, 0x61, 0x5b, 0x49, 0x27, 0x14, 0x8e, 0x85, 0x9a,
+	0x49, 0x25, 0xfd, 0x05, 0x82, 0x62, 0xdd, 0x09, 0x12, 0xed, 0x09, 0xf2, 0x5d, 0x7e, 0x17, 0x66,
+	0x5c, 0x27, 0x90, 0x11, 0x53, 0xef, 0xee, 0xe5, 0x7c, 0x4c, 0xf5, 0x61, 0xa0, 0x19, 0x57, 0xd1,
+	0x5f, 0x23, 0x98, 0xdb, 0x61, 0x63, 0xa7, 0x05, 0xc3, 0xa9, 0x30, 0x79, 0x1f, 0x44, 0xad, 0x93,
+	0x84, 0x85, 0x34, 0xe1, 0x3d, 0x00, 0x9b, 0xc9, 0x64, 0xd1, 0x6e, 0xe6, 0x03, 0xdc, 0x19, 0xc4,
+	0x99, 0x31, 0x0d, 0xfd, 0x0b, 0x82, 0xf9, 0xfb, 0x5e, 0x23, 0x63, 0x58, 0xe6, 0xe2, 0x84, 0x5b,
+	0x85, 0x22, 0xca, 0x45, 0x99, 0x1e, 0xa2, 0xa9, 0x7f, 0x33, 0xe7, 0x6f, 0x11, 0xcc, 0x6f, 0x33,
+	0x97, 0x8d, 0x47, 0xff, 0xf3, 0xe2, 0xee, 0xc1, 0x6c, 0x43, 0xc9, 0xfd, 0xd5, 0x50, 0x6e, 0xc7,
+	0x43, 0xcd, 0xa4, 0x92, 0x7e, 0x05, 0x2e, 0xc7, 0x19, 0x7b, 0x67, 0x1b, 0x26, 0x0b, 0x3c, 0xc1,
+	0x03, 0x56, 0xf9, 0x74, 0x06, 0x2e, 0xc6, 0xf7, 0x77, 0x99, 0xdf, 0x71, 0x2c, 0x86, 0x3f, 0x22,
+	0x38, 0x9f, 0xb6, 0x1a, 0x7c, 0x95, 0xc4, 0x7d, 0x92, 0x64, 0x58, 0x91, 0x76, 0xf2, 0x72, 0xeb,
+	0x95, 0xe7, 0xdf, 0x7f, 0xbe, 0x2c, 0xdc, 0xd0, 0x57, 0x94, 0x09, 0x77, 0xca, 0x49, 0xd7, 0x0e,
+	0x8c, 0x67, 0x83, 0xda, 0x1d, 0x19, 0xae, 0xc3, 0xe5, 0x6d, 0x54, 0xc2, 0x1f, 0x10, 0xe0, 0x51,
+	0xf3, 0xc1, 0x2b, 0x49, 0xe8, 0x4c, 0x7b, 0x9a, 0x04, 0xf6, 0xba, 0xc2, 0x5e, 0xd1, 0xf5, 0xe3,
+	0xb1, 0x43, 0xe2, 0xf7, 0x08, 0x2e, 0x8c, 0x18, 0x06, 0xbe, 0x96, 0xae, 0xf2, 0x78, 0x47, 0xd1,
+	0xee, 0x9c, 0x98, 0x37, 0x94, 0xd6, 0x4b, 0x8a, 0x79, 0x19, 0xe7, 0x60, 0xc6, 0xef, 0x10, 0x9c,
+	0x4b, 0x39, 0x0a, 0x5e, 0x4e, 0xe2, 0x8e, 0x37, 0x9c, 0x49, 0x14, 0xb7, 0xac, 0x40, 0xaf, 0xe3,
+	0xb5, 0x1c, 0x33, 0xa1, 0xd6, 0x47, 0xf8, 0x33, 0x02, 0x3c, 0x6a, 0x31, 0xe9, 0x91, 0xc8, 0x34,
+	0xa1, 0x49, 0x50, 0x6f, 0x28, 0x6a, 0xa2, 0xe5, 0xa7, 0x0e, 0x27, 0xe3, 0x15, 0x02, 0x3c, 0x6a,
+	0x30, 0x69, 0xf0, 0x4c, 0x0b, 0xd2, 0xd6, 0xd2, 0x43, 0x9f, 0xe9, 0x00, 0x51, 0x59, 0x4b, 0xf9,
+	0x01, 0xb7, 0x36, 0xbf, 0x76, 0x17, 0xd1, 0xb7, 0xee, 0x22, 0xfa, 0xd1, 0x5d, 0x44, 0x0f, 0xab,
+	0xc7, 0x3d, 0x6d, 0xc6, 0xbc, 0xc2, 0xf6, 0x4f, 0xab, 0x17, 0x4d, 0xf5, 0x77, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x8b, 0x9e, 0x82, 0xdc, 0xaa, 0x09, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/pkg/apiclient/cronworkflow/cron-workflow.proto b/pkg/apiclient/cronworkflow/cron-workflow.proto
index 5f86f50742da..b0a6b5b6026f 100644
--- a/pkg/apiclient/cronworkflow/cron-workflow.proto
+++ b/pkg/apiclient/cronworkflow/cron-workflow.proto
@@ -1,11 +1,9 @@
 syntax = "proto3";
 option go_package = "github.com/argoproj/argo/pkg/apiclient/cronworkflow";
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1/generated.proto";
-import "k8s.io/api/core/v1/generated.proto";
 
 package cronworkflow;
 
diff --git a/pkg/apiclient/event/event.pb.go b/pkg/apiclient/event/event.pb.go
index 1d936adb226e..2f29528980fe 100644
--- a/pkg/apiclient/event/event.pb.go
+++ b/pkg/apiclient/event/event.pb.go
@@ -7,14 +7,12 @@ import (
 	context "context"
 	fmt "fmt"
 	v1alpha1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	io "io"
-	_ "k8s.io/apimachinery/pkg/apis/meta/v1"
 	math "math"
 	math_bits "math/bits"
 )
@@ -148,32 +146,29 @@ func init() {
 func init() { proto.RegisterFile("pkg/apiclient/event/event.proto", fileDescriptor_d80a0d2509a47d1c) }
 
 var fileDescriptor_d80a0d2509a47d1c = []byte{
-	// 388 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0x4b, 0xe3, 0x40,
-	0x18, 0xc6, 0x49, 0x97, 0xdd, 0xa5, 0xd9, 0x96, 0x85, 0xec, 0x1e, 0x4a, 0x29, 0xdd, 0x12, 0xf6,
-	0x50, 0x96, 0x75, 0x86, 0x56, 0x05, 0xad, 0x37, 0xc5, 0x83, 0xd7, 0xf4, 0xe6, 0x6d, 0x9a, 0xbe,
-	0x9d, 0x8e, 0x49, 0x66, 0xc6, 0x99, 0x69, 0x4a, 0x29, 0xbd, 0x78, 0xf0, 0x0b, 0xf8, 0x21, 0xfc,
-	0x2a, 0x1e, 0x05, 0xbf, 0x80, 0x14, 0x3f, 0x88, 0x64, 0x92, 0xf4, 0x0f, 0x1e, 0xbc, 0x84, 0xf7,
-	0x4f, 0xde, 0x27, 0xbf, 0x87, 0x27, 0xee, 0x1f, 0x19, 0x51, 0x4c, 0x24, 0x0b, 0x63, 0x06, 0xdc,
-	0x60, 0x48, 0x37, 0x4f, 0x24, 0x95, 0x30, 0xc2, 0xfb, 0x6a, 0x9b, 0xe6, 0x01, 0x65, 0x66, 0x3a,
-	0x1b, 0xa1, 0x50, 0x24, 0x98, 0x0a, 0x2a, 0xb0, 0xdd, 0x8e, 0x66, 0x13, 0xdb, 0xd9, 0xc6, 0x56,
-	0xf9, 0x55, 0xb3, 0x45, 0x85, 0xa0, 0x31, 0x64, 0xca, 0x98, 0x70, 0x2e, 0x0c, 0x31, 0x4c, 0x70,
-	0x5d, 0x6c, 0x8f, 0xa2, 0x13, 0x8d, 0x98, 0xc8, 0xb6, 0x09, 0x09, 0xa7, 0x8c, 0x83, 0x5a, 0xe0,
-	0x02, 0x44, 0xe3, 0x04, 0x0c, 0xc1, 0x69, 0x0f, 0x53, 0xe0, 0xa0, 0x88, 0x81, 0x71, 0x71, 0x75,
-	0xb1, 0x83, 0x40, 0x94, 0xfd, 0xe8, 0x8d, 0x2d, 0xb6, 0xa7, 0x73, 0xa1, 0xa2, 0x49, 0x2c, 0xe6,
-	0x38, 0xed, 0x91, 0x58, 0x4e, 0xc9, 0x07, 0x11, 0xff, 0xd1, 0x71, 0x6b, 0x97, 0x99, 0xa3, 0x00,
-	0x6e, 0x67, 0xa0, 0x8d, 0xd7, 0x72, 0xab, 0x9c, 0x24, 0xa0, 0x25, 0x09, 0xa1, 0xe1, 0x74, 0x9c,
-	0x6e, 0x35, 0xd8, 0x0e, 0xbc, 0xbf, 0x6e, 0x7d, 0xcc, 0x74, 0xa8, 0x58, 0xc2, 0x38, 0x31, 0x42,
-	0x35, 0x2a, 0xf6, 0x8d, 0xfd, 0xa1, 0x37, 0x74, 0xbf, 0x4b, 0xb2, 0x88, 0x05, 0x19, 0x37, 0xbe,
-	0x74, 0x9c, 0xee, 0x8f, 0xfe, 0x29, 0xda, 0xb2, 0xa2, 0x92, 0xd5, 0x16, 0x48, 0x46, 0x14, 0x65,
-	0xac, 0xa8, 0x64, 0x45, 0x25, 0x2b, 0xba, 0x32, 0x90, 0x04, 0xa5, 0x92, 0xff, 0xd3, 0xad, 0x17,
-	0xa0, 0x5a, 0x0a, 0xae, 0xa1, 0x7f, 0x5f, 0xa2, 0x0f, 0x41, 0xa5, 0x2c, 0x04, 0x2f, 0x75, 0x6b,
-	0x01, 0x84, 0xc0, 0x52, 0xb0, 0x63, 0xef, 0x17, 0xca, 0x83, 0xdb, 0xf5, 0xd7, 0xfc, 0xbd, 0x3f,
-	0xcc, 0xb5, 0xfc, 0xb3, 0xbb, 0x97, 0xb7, 0x87, 0xca, 0xb1, 0xff, 0xcf, 0x26, 0x94, 0xf6, 0xf2,
-	0xc8, 0x35, 0x5e, 0x6e, 0xac, 0xaf, 0xf0, 0x72, 0xcf, 0xe4, 0x6a, 0x50, 0x92, 0x9d, 0x0f, 0x9e,
-	0xd6, 0x6d, 0xe7, 0x79, 0xdd, 0x76, 0x5e, 0xd7, 0x6d, 0xe7, 0xfa, 0xff, 0x67, 0xb1, 0xec, 0xfe,
-	0x5a, 0xa3, 0x6f, 0x36, 0x86, 0xc3, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa4, 0xb9, 0x2c, 0xe3,
-	0x78, 0x02, 0x00, 0x00,
+	// 347 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xbf, 0x4a, 0x2b, 0x41,
+	0x14, 0xc6, 0xd9, 0x5c, 0xee, 0xbd, 0x64, 0x4d, 0x10, 0x56, 0x8b, 0x10, 0x42, 0x0c, 0x8b, 0x45,
+	0x10, 0x99, 0x21, 0x11, 0x0b, 0x63, 0xa7, 0x58, 0xd8, 0x6e, 0x3a, 0xbb, 0xc9, 0xe6, 0x38, 0x19,
+	0xb3, 0x3b, 0x67, 0x9c, 0x99, 0x6c, 0x90, 0x90, 0xc6, 0xc2, 0x17, 0xf0, 0x21, 0x7c, 0x15, 0x4b,
+	0xc1, 0x17, 0x90, 0xe0, 0x83, 0x48, 0x66, 0xb3, 0xf9, 0x53, 0xd9, 0x2c, 0x67, 0x3f, 0x0e, 0xdf,
+	0xfc, 0xbe, 0xf3, 0xf9, 0x47, 0x6a, 0xcc, 0x29, 0x53, 0x22, 0x4e, 0x04, 0x48, 0x4b, 0x21, 0x5b,
+	0x7f, 0x89, 0xd2, 0x68, 0x31, 0xf8, 0xeb, 0x7e, 0xea, 0x0d, 0x8e, 0xc8, 0x13, 0x58, 0xae, 0x52,
+	0x26, 0x25, 0x5a, 0x66, 0x05, 0x4a, 0x93, 0x2f, 0xd5, 0xaf, 0xb9, 0xb0, 0xa3, 0xc9, 0x80, 0xc4,
+	0x98, 0x52, 0xa6, 0x39, 0x2a, 0x8d, 0x0f, 0x6e, 0xa0, 0x2b, 0x7b, 0x43, 0xa7, 0xa8, 0xc7, 0xf7,
+	0x09, 0x4e, 0x69, 0xd6, 0x61, 0x89, 0x1a, 0xb1, 0x0e, 0xe5, 0x20, 0x41, 0x33, 0x0b, 0xc3, 0xdc,
+	0x24, 0x7c, 0xf3, 0xfc, 0xca, 0xcd, 0xf2, 0xb1, 0x08, 0x1e, 0x27, 0x60, 0x6c, 0xd0, 0xf0, 0xcb,
+	0x92, 0xa5, 0x60, 0x14, 0x8b, 0xa1, 0xe6, 0xb5, 0xbc, 0x76, 0x39, 0xda, 0x08, 0xc1, 0xb1, 0x5f,
+	0x1d, 0x0a, 0x13, 0x6b, 0x91, 0x0a, 0xc9, 0x2c, 0xea, 0x5a, 0xc9, 0x6d, 0xec, 0x8a, 0x41, 0xdf,
+	0xff, 0xaf, 0xd8, 0x53, 0x82, 0x6c, 0x58, 0xfb, 0xd3, 0xf2, 0xda, 0x7b, 0xdd, 0x0b, 0xb2, 0x61,
+	0x25, 0x05, 0xab, 0x1b, 0x88, 0x1a, 0x73, 0xb2, 0x64, 0x25, 0x05, 0x2b, 0x29, 0x58, 0xc9, 0xad,
+	0x85, 0x34, 0x2a, 0x9c, 0xc2, 0x7d, 0xbf, 0xba, 0x02, 0x35, 0x0a, 0xa5, 0x81, 0xee, 0x4b, 0x81,
+	0xde, 0x07, 0x9d, 0x89, 0x18, 0x82, 0xcc, 0xaf, 0x44, 0x10, 0x83, 0xc8, 0xc0, 0xc9, 0xc1, 0x01,
+	0xc9, 0x6f, 0xba, 0x9d, 0xaf, 0x7e, 0xb8, 0x2b, 0xe6, 0x5e, 0xe1, 0xe5, 0xf3, 0xe7, 0xf7, 0x6b,
+	0xe9, 0x3c, 0x3c, 0x71, 0xb7, 0xce, 0x3a, 0x79, 0x1b, 0x86, 0xce, 0xd6, 0xd1, 0xe7, 0x74, 0xb6,
+	0x13, 0x72, 0xde, 0x2b, 0xc8, 0xae, 0x7a, 0xef, 0x8b, 0xa6, 0xf7, 0xb1, 0x68, 0x7a, 0x5f, 0x8b,
+	0xa6, 0x77, 0x77, 0xfa, 0x5b, 0x2d, 0xdb, 0xad, 0x0f, 0xfe, 0xb9, 0x1a, 0xce, 0x7e, 0x02, 0x00,
+	0x00, 0xff, 0xff, 0xab, 0x58, 0x8b, 0x7b, 0x13, 0x02, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/pkg/apiclient/event/event.proto b/pkg/apiclient/event/event.proto
index 77abce354911..ef229bbc3c6c 100644
--- a/pkg/apiclient/event/event.proto
+++ b/pkg/apiclient/event/event.proto
@@ -1,9 +1,7 @@
 syntax = "proto3";
 option go_package = "github.com/argoproj/argo/pkg/apiclient/event";
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "google/api/annotations.proto";
-import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1/generated.proto";
 
 package event;
diff --git a/pkg/apiclient/info/info.pb.go b/pkg/apiclient/info/info.pb.go
index 0694bff16f4a..b72c546f3d4f 100644
--- a/pkg/apiclient/info/info.pb.go
+++ b/pkg/apiclient/info/info.pb.go
@@ -7,15 +7,12 @@ import (
 	context "context"
 	fmt "fmt"
 	v1alpha1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	io "io"
-	_ "k8s.io/api/core/v1"
-	_ "k8s.io/apimachinery/pkg/apis/meta/v1"
 	math "math"
 	math_bits "math/bits"
 )
@@ -269,37 +266,35 @@ func init() {
 func init() { proto.RegisterFile("pkg/apiclient/info/info.proto", fileDescriptor_96940c93018255fa) }
 
 var fileDescriptor_96940c93018255fa = []byte{
-	// 480 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x4f, 0x6b, 0x13, 0x41,
-	0x14, 0x67, 0xa3, 0xb6, 0x38, 0x29, 0x35, 0x9d, 0x06, 0xbb, 0x2e, 0x1a, 0xca, 0x9e, 0x8a, 0xe2,
-	0x0c, 0xa9, 0x1e, 0x2c, 0x78, 0xd2, 0x43, 0x28, 0x88, 0x42, 0x44, 0x0f, 0xe2, 0x65, 0xb2, 0x7d,
-	0x99, 0x4c, 0x77, 0x77, 0x66, 0x9d, 0x99, 0xdd, 0x22, 0x78, 0xf2, 0xea, 0xd1, 0xaf, 0xe2, 0x87,
-	0xf0, 0x28, 0xf8, 0x05, 0x24, 0xf8, 0x41, 0x64, 0x27, 0xb3, 0xdd, 0x8d, 0x0d, 0x08, 0x5e, 0xc2,
-	0x7b, 0xf3, 0xf2, 0x7e, 0xff, 0x78, 0x8b, 0xee, 0x15, 0x29, 0xa7, 0xac, 0x10, 0x49, 0x26, 0x40,
-	0x5a, 0x2a, 0xe4, 0x5c, 0xb9, 0x1f, 0x52, 0x68, 0x65, 0x15, 0xbe, 0x5e, 0xd7, 0xd1, 0x43, 0x2e,
-	0xec, 0xa2, 0x9c, 0x91, 0x44, 0xe5, 0x94, 0x2b, 0xae, 0xa8, 0x1b, 0xce, 0xca, 0xb9, 0xeb, 0x5c,
-	0xe3, 0xaa, 0xd5, 0x52, 0x74, 0x97, 0x2b, 0xc5, 0x33, 0xa8, 0x61, 0x29, 0x93, 0x52, 0x59, 0x66,
-	0x85, 0x92, 0xc6, 0x4f, 0x1f, 0xa7, 0x4f, 0x0c, 0x11, 0xaa, 0x9e, 0xe6, 0x2c, 0x59, 0x08, 0x09,
-	0xfa, 0x23, 0xf5, 0x2a, 0x0c, 0xcd, 0xc1, 0x32, 0x5a, 0x8d, 0x29, 0x07, 0x09, 0x9a, 0x59, 0x38,
-	0xf3, 0x5b, 0xcf, 0x3b, 0x12, 0x98, 0x76, 0xa4, 0xe7, 0xae, 0x68, 0x57, 0x2f, 0x94, 0x4e, 0xe7,
-	0x99, 0xba, 0xa0, 0xd5, 0x98, 0x65, 0xc5, 0x82, 0x5d, 0x05, 0x89, 0x5b, 0x6a, 0x9a, 0x28, 0x0d,
-	0x1b, 0x88, 0xe2, 0x01, 0xda, 0x9d, 0x80, 0x3d, 0x95, 0x73, 0x35, 0x85, 0x0f, 0x25, 0x18, 0x1b,
-	0x7f, 0x09, 0xd0, 0xce, 0xaa, 0x37, 0x85, 0x92, 0x06, 0xf0, 0x7d, 0x34, 0xc8, 0x99, 0x64, 0x1c,
-	0xce, 0x5e, 0xb2, 0x1c, 0x4c, 0xc1, 0x12, 0x08, 0x83, 0xc3, 0xe0, 0xe8, 0xe6, 0xf4, 0xca, 0x3b,
-	0x7e, 0x85, 0x6e, 0x64, 0x42, 0xa6, 0x26, 0xec, 0x1d, 0x5e, 0x3b, 0xea, 0x1f, 0x9f, 0x90, 0xd6,
-	0x07, 0x69, 0x7c, 0xb8, 0x82, 0x14, 0x29, 0x27, 0xb5, 0x0f, 0xd2, 0xf8, 0x20, 0x8d, 0x0f, 0xf2,
-	0x42, 0xc8, 0x74, 0xba, 0xc2, 0x89, 0xf7, 0xd1, 0xde, 0x04, 0xec, 0x5b, 0xd0, 0x46, 0x28, 0xd9,
-	0x48, 0x1c, 0x22, 0x3c, 0x01, 0xfb, 0xc6, 0x80, 0xee, 0x0a, 0x9f, 0xa0, 0xfd, 0xb5, 0x57, 0x2f,
-	0xff, 0x36, 0xda, 0x12, 0xc6, 0x94, 0xa0, 0xbd, 0x68, 0xdf, 0xe1, 0x10, 0x6d, 0x9b, 0x72, 0x76,
-	0x0e, 0x89, 0x0d, 0x7b, 0x6e, 0xd0, 0xb4, 0xc7, 0xdf, 0x7a, 0xa8, 0x5f, 0x43, 0xbc, 0x06, 0x5d,
-	0x89, 0x04, 0xf0, 0x29, 0xda, 0xf6, 0x19, 0xe1, 0x21, 0x71, 0xd7, 0xb2, 0x1e, 0x59, 0x84, 0x57,
-	0xaf, 0x5d, 0xda, 0x78, 0xf8, 0xf9, 0xe7, 0xef, 0xaf, 0xbd, 0x5d, 0xbc, 0xe3, 0xe2, 0xaf, 0xc6,
-	0xee, 0xcc, 0xf0, 0x27, 0x84, 0x5a, 0x3b, 0xf8, 0xe0, 0x12, 0x6d, 0xdd, 0x60, 0xf4, 0xf4, 0xbf,
-	0x72, 0xf3, 0x20, 0xf1, 0x81, 0xa3, 0xde, 0xc3, 0xb7, 0x1a, 0xea, 0xca, 0xf3, 0xbd, 0x47, 0xfd,
-	0x4e, 0x42, 0x38, 0xbc, 0xa4, 0xff, 0x2b, 0xca, 0xe8, 0xce, 0x86, 0x89, 0xf7, 0x15, 0x3a, 0x70,
-	0x8c, 0x07, 0x0d, 0x78, 0x69, 0x40, 0xd7, 0xff, 0x7e, 0x76, 0xf2, 0x7d, 0x39, 0x0a, 0x7e, 0x2c,
-	0x47, 0xc1, 0xaf, 0xe5, 0x28, 0x78, 0xf7, 0xe0, 0x5f, 0x17, 0xdc, 0xf9, 0x04, 0x67, 0x5b, 0xee,
-	0x18, 0x1f, 0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, 0x23, 0x33, 0x1a, 0x8d, 0x9f, 0x03, 0x00, 0x00,
+	// 435 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x41, 0x6b, 0x14, 0x31,
+	0x14, 0x66, 0x46, 0x6d, 0x31, 0x5b, 0xea, 0x36, 0x5d, 0xec, 0x38, 0xe8, 0x52, 0xe6, 0x54, 0x14,
+	0x12, 0xb6, 0x9e, 0x0a, 0x9e, 0xf4, 0x30, 0x14, 0x44, 0x61, 0x45, 0x0f, 0xe2, 0x25, 0x3b, 0x7d,
+	0x9b, 0xa6, 0x33, 0x9b, 0xc4, 0x24, 0x33, 0xbd, 0x78, 0xf2, 0xea, 0xd1, 0xbf, 0xe2, 0x8f, 0xf0,
+	0x28, 0xf8, 0x07, 0x64, 0xf1, 0x87, 0xc8, 0x64, 0x32, 0xed, 0xac, 0x0a, 0x82, 0x97, 0xf0, 0xde,
+	0xcb, 0xe3, 0xfb, 0xbe, 0xf7, 0xbd, 0x87, 0x1e, 0xe8, 0x92, 0x53, 0xa6, 0x45, 0x51, 0x09, 0x90,
+	0x8e, 0x0a, 0xb9, 0x54, 0xfe, 0x21, 0xda, 0x28, 0xa7, 0xf0, 0xcd, 0x36, 0x4e, 0xef, 0x73, 0xa5,
+	0x78, 0x05, 0x6d, 0x1f, 0x65, 0x52, 0x2a, 0xc7, 0x9c, 0x50, 0xd2, 0x76, 0x3d, 0xe9, 0x33, 0x2e,
+	0xdc, 0x79, 0xbd, 0x20, 0x85, 0x5a, 0x51, 0x66, 0xb8, 0xd2, 0x46, 0x5d, 0xf8, 0x80, 0x06, 0x6c,
+	0x4b, 0x2f, 0x95, 0x29, 0x97, 0x95, 0xba, 0xa4, 0xcd, 0x8c, 0x55, 0xfa, 0x9c, 0xcd, 0x28, 0x07,
+	0x09, 0x86, 0x39, 0x38, 0xeb, 0x40, 0xb2, 0x31, 0xda, 0xcd, 0xc1, 0x9d, 0xca, 0xa5, 0x9a, 0xc3,
+	0xfb, 0x1a, 0xac, 0xcb, 0x3e, 0x45, 0x68, 0xa7, 0xcb, 0xad, 0x56, 0xd2, 0x02, 0x7e, 0x88, 0xc6,
+	0x2b, 0x26, 0x19, 0x87, 0xb3, 0x17, 0x6c, 0x05, 0x56, 0xb3, 0x02, 0x92, 0xe8, 0x30, 0x3a, 0xba,
+	0x3d, 0xff, 0xa3, 0x8e, 0x5f, 0xa2, 0x5b, 0x95, 0x90, 0xa5, 0x4d, 0xe2, 0xc3, 0x1b, 0x47, 0xa3,
+	0xe3, 0x13, 0x72, 0xad, 0x91, 0xf4, 0x1a, 0x7d, 0x40, 0x74, 0xc9, 0x49, 0xab, 0x91, 0xf4, 0x1a,
+	0x49, 0xaf, 0x91, 0x3c, 0x17, 0xb2, 0x9c, 0x77, 0x38, 0xd9, 0x3e, 0xda, 0xcb, 0xc1, 0xbd, 0x01,
+	0x63, 0x85, 0x92, 0xbd, 0xc4, 0x09, 0xc2, 0x39, 0xb8, 0xd7, 0x16, 0xcc, 0x50, 0x78, 0x8e, 0xf6,
+	0x37, 0xaa, 0x41, 0xfe, 0x5d, 0xb4, 0x25, 0xac, 0xad, 0xc1, 0x04, 0xd1, 0x21, 0xc3, 0x09, 0xda,
+	0xb6, 0xf5, 0xe2, 0x02, 0x0a, 0x97, 0xc4, 0xfe, 0xa3, 0x4f, 0x8f, 0xbf, 0xc4, 0x68, 0xd4, 0x42,
+	0xbc, 0x02, 0xd3, 0x88, 0x02, 0xf0, 0x29, 0xda, 0x0e, 0x1e, 0xe1, 0x09, 0xf1, 0x4b, 0xda, 0xb4,
+	0x2c, 0xc5, 0x5d, 0x75, 0x48, 0x9b, 0x4d, 0x3e, 0x7e, 0xff, 0xf9, 0x39, 0xde, 0xc5, 0x3b, 0x7e,
+	0x7b, 0xcd, 0xcc, 0x6f, 0x17, 0x7f, 0x40, 0xe8, 0x7a, 0x1c, 0x7c, 0x70, 0x85, 0xb6, 0x39, 0x60,
+	0xfa, 0xe4, 0xbf, 0x7c, 0x0b, 0x20, 0xd9, 0x81, 0xa7, 0xde, 0xc3, 0x77, 0x7a, 0xea, 0x26, 0xf0,
+	0xbd, 0x43, 0xa3, 0x81, 0x43, 0x38, 0xb9, 0xa2, 0xff, 0xcd, 0xca, 0xf4, 0xde, 0x5f, 0x7e, 0xc2,
+	0x5c, 0x89, 0x07, 0xc7, 0x78, 0xdc, 0x83, 0xd7, 0x16, 0x4c, 0xdb, 0xfd, 0xf4, 0xe4, 0xeb, 0x7a,
+	0x1a, 0x7d, 0x5b, 0x4f, 0xa3, 0x1f, 0xeb, 0x69, 0xf4, 0xf6, 0xd1, 0xbf, 0xae, 0x73, 0x70, 0xf9,
+	0x8b, 0x2d, 0x7f, 0x8c, 0x8f, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x27, 0xe1, 0x44, 0x16,
+	0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/pkg/apiclient/info/info.proto b/pkg/apiclient/info/info.proto
index e18085008a78..fb2d7531907b 100644
--- a/pkg/apiclient/info/info.proto
+++ b/pkg/apiclient/info/info.proto
@@ -1,11 +1,8 @@
 syntax = "proto3";
 option go_package = "github.com/argoproj/argo/pkg/apiclient/info";
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "google/api/annotations.proto";
-import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1/generated.proto";
-import "k8s.io/api/core/v1/generated.proto";
 
 package info;
 
diff --git a/pkg/apiclient/workflow/workflow.pb.go b/pkg/apiclient/workflow/workflow.pb.go
index 886db5a04524..99b8289f7d1f 100644
--- a/pkg/apiclient/workflow/workflow.pb.go
+++ b/pkg/apiclient/workflow/workflow.pb.go
@@ -11,7 +11,6 @@ import (
 	context "context"
 	fmt "fmt"
 	v1alpha1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
@@ -1209,91 +1208,90 @@ func init() {
 }
 
 var fileDescriptor_1f6bb75f9e833cb6 = []byte{
-	// 1331 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x98, 0xdd, 0x6e, 0xdc, 0x44,
-	0x14, 0xc7, 0x35, 0x49, 0x9b, 0x26, 0x93, 0x8f, 0xb6, 0x43, 0x29, 0x2b, 0xab, 0x4d, 0xd3, 0x81,
-	0x42, 0x9a, 0x36, 0x76, 0x3e, 0x0a, 0x94, 0x4a, 0x05, 0xb5, 0x4d, 0xa9, 0x80, 0x08, 0x2a, 0x2f,
-	0x08, 0x95, 0x3b, 0xc7, 0x7b, 0xe2, 0xb8, 0x59, 0x7b, 0x8c, 0x67, 0x76, 0xab, 0xa5, 0x2a, 0x08,
-	0x2e, 0xb9, 0x80, 0x0b, 0x6e, 0x10, 0x5c, 0xf0, 0x2d, 0x21, 0x21, 0x21, 0x10, 0x2f, 0xc1, 0x65,
-	0x05, 0x2f, 0x80, 0xa2, 0x3e, 0x08, 0x9a, 0xb1, 0x3d, 0xb6, 0xb3, 0xdb, 0xad, 0x89, 0x23, 0x7a,
-	0x37, 0xe3, 0x99, 0x39, 0xe7, 0x37, 0xff, 0x33, 0x73, 0xe6, 0xec, 0xe2, 0x33, 0xd1, 0xb6, 0x67,
-	0x39, 0x91, 0xef, 0xb6, 0x7d, 0x08, 0x85, 0x75, 0x87, 0xc5, 0xdb, 0x9b, 0x6d, 0x76, 0x47, 0x37,
-	0xcc, 0x28, 0x66, 0x82, 0x91, 0xf1, 0xac, 0x6f, 0x2c, 0x7a, 0xbe, 0xd8, 0xea, 0x6c, 0x98, 0x2e,
-	0x0b, 0x2c, 0x8f, 0x79, 0xcc, 0x52, 0x13, 0x36, 0x3a, 0x9b, 0xaa, 0xa7, 0x3a, 0xaa, 0x95, 0x2c,
-	0x34, 0x4e, 0x78, 0x8c, 0x79, 0x6d, 0x90, 0x2e, 0x2c, 0x27, 0x0c, 0x99, 0x70, 0x84, 0xcf, 0x42,
-	0x9e, 0x8e, 0x5e, 0xd8, 0xbe, 0xc8, 0x4d, 0x9f, 0xc9, 0xd1, 0xc0, 0x71, 0xb7, 0xfc, 0x10, 0xe2,
-	0x9e, 0x95, 0x12, 0x71, 0x2b, 0x00, 0xe1, 0x58, 0xdd, 0x65, 0xcb, 0x83, 0x10, 0x62, 0x47, 0x40,
-	0x2b, 0x5d, 0x75, 0xad, 0x80, 0xe0, 0xc4, 0xca, 0xe9, 0x6d, 0xd5, 0xc8, 0x97, 0xea, 0x7d, 0x74,
-	0x97, 0x9d, 0x76, 0xb4, 0xe5, 0xf4, 0x1b, 0xa1, 0xb9, 0x6b, 0xcb, 0x65, 0x31, 0x0c, 0x70, 0x44,
-	0xff, 0x18, 0xc1, 0x4f, 0xbe, 0x9b, 0x5a, 0xba, 0x16, 0x83, 0x23, 0xc0, 0x86, 0xf7, 0x3b, 0xc0,
-	0x05, 0x39, 0x81, 0x27, 0x42, 0x27, 0x00, 0x1e, 0x39, 0x2e, 0x34, 0xd0, 0x1c, 0x9a, 0x9f, 0xb0,
-	0xf3, 0x0f, 0xe4, 0x16, 0xd6, 0x7a, 0x35, 0x46, 0xe6, 0xd0, 0xfc, 0xe4, 0xca, 0x65, 0x33, 0x67,
-	0x36, 0x33, 0x66, 0xd5, 0x30, 0xa3, 0x6d, 0xcf, 0x94, 0xcc, 0xa6, 0x96, 0x3c, 0x63, 0x36, 0x33,
-	0xdf, 0xb6, 0x36, 0x47, 0x28, 0xc6, 0x7e, 0xc8, 0x85, 0x13, 0xba, 0xf0, 0xda, 0x5a, 0x63, 0x54,
-	0x7a, 0xbe, 0x3a, 0xd2, 0x40, 0x76, 0xe1, 0x2b, 0xa1, 0x78, 0x8a, 0x43, 0xdc, 0x85, 0x78, 0x2d,
-	0xee, 0xd9, 0x9d, 0xb0, 0x71, 0x60, 0x0e, 0xcd, 0x8f, 0xdb, 0xa5, 0x6f, 0xe4, 0x16, 0x9e, 0x76,
-	0xd5, 0x8e, 0xde, 0x8a, 0x54, 0x40, 0x1a, 0x07, 0x15, 0xe7, 0xaa, 0x99, 0xc8, 0x62, 0x16, 0x23,
-	0x92, 0x23, 0xca, 0x88, 0x98, 0xdd, 0x65, 0xf3, 0x5a, 0x71, 0xa9, 0x5d, 0xb6, 0x44, 0x7f, 0x43,
-	0x98, 0x64, 0xe4, 0x37, 0x40, 0x64, 0x92, 0x11, 0x7c, 0x40, 0x2a, 0x94, 0xaa, 0xa5, 0xda, 0x65,
-	0x19, 0x47, 0x76, 0xcb, 0x78, 0x13, 0x63, 0x0f, 0x44, 0x06, 0x38, 0xaa, 0x00, 0x97, 0xaa, 0x01,
-	0xde, 0xd0, 0xeb, 0xec, 0x82, 0x0d, 0x72, 0x1c, 0x8f, 0x6d, 0xfa, 0xd0, 0x6e, 0x71, 0xa5, 0xc9,
-	0x84, 0x9d, 0xf6, 0xe8, 0xb7, 0x08, 0x3f, 0x91, 0x21, 0xaf, 0xfb, 0x5c, 0x54, 0x0b, 0x73, 0x13,
-	0x4f, 0xb6, 0x7d, 0xae, 0x01, 0x93, 0x48, 0x2f, 0x57, 0x03, 0x5c, 0xcf, 0x17, 0xda, 0x45, 0x2b,
-	0x05, 0xc4, 0xd1, 0x12, 0xa2, 0x87, 0x9f, 0xd2, 0xc7, 0x01, 0x78, 0x67, 0x23, 0xf0, 0x6b, 0x28,
-	0x6b, 0xe0, 0xf1, 0x00, 0x02, 0xe6, 0x7f, 0x00, 0x2d, 0xe5, 0x66, 0xdc, 0xd6, 0x7d, 0xfa, 0x23,
-	0xc2, 0xc7, 0x72, 0x4f, 0x22, 0xee, 0xed, 0xdd, 0xcd, 0x79, 0x7c, 0x34, 0x06, 0x2e, 0x9c, 0x58,
-	0x34, 0x3b, 0xae, 0x0b, 0x9c, 0x6f, 0x76, 0xda, 0xa9, 0xbf, 0xfe, 0x01, 0x39, 0x3b, 0x64, 0x2d,
-	0x78, 0x55, 0xee, 0xb7, 0x09, 0x6d, 0x70, 0x05, 0x8b, 0xd3, 0x38, 0xf5, 0x0f, 0xd0, 0x3b, 0xf9,
-	0xd5, 0x94, 0x7a, 0x04, 0x50, 0x0b, 0xb3, 0xdf, 0xf1, 0xe8, 0xc3, 0x1c, 0xaf, 0xe3, 0x46, 0xe6,
-	0xf8, 0x6d, 0x88, 0x03, 0x3f, 0x2c, 0xa4, 0x85, 0xff, 0xec, 0x9b, 0x7e, 0x5e, 0x38, 0x79, 0x4d,
-	0xc1, 0xa2, 0xff, 0x69, 0x17, 0xa4, 0x81, 0x0f, 0x05, 0xc0, 0xb9, 0xe3, 0x41, 0x2a, 0x71, 0xd6,
-	0xa5, 0xf7, 0x0b, 0xd7, 0xb7, 0x59, 0xe7, 0xfa, 0xee, 0x13, 0x10, 0x39, 0x86, 0x0f, 0x46, 0x5b,
-	0x0e, 0x07, 0x95, 0xa2, 0x26, 0xec, 0xa4, 0x43, 0x16, 0xf0, 0x11, 0xd6, 0x11, 0x51, 0x47, 0xdc,
-	0x74, 0x62, 0x27, 0x00, 0x01, 0x31, 0x6f, 0x8c, 0xa9, 0x09, 0x7d, 0xdf, 0xe9, 0xeb, 0xf8, 0xb8,
-	0xde, 0x51, 0x87, 0x47, 0x10, 0xb6, 0xf6, 0x1e, 0xb0, 0x1f, 0x0a, 0xf2, 0xac, 0x33, 0x6f, 0xef,
-	0xf2, 0x34, 0xf0, 0xa1, 0x88, 0xb5, 0xde, 0x94, 0x8b, 0x12, 0x51, 0xb2, 0x2e, 0xb9, 0x82, 0x71,
-	0x9b, 0x79, 0x59, 0x5a, 0x39, 0xa0, 0xd2, 0xca, 0xe9, 0x42, 0x5a, 0x31, 0xe5, 0x7b, 0x25, 0x93,
-	0xc8, 0x4d, 0xd6, 0x5a, 0xd7, 0x13, 0xed, 0xc2, 0x22, 0x79, 0x89, 0xf5, 0xf5, 0x58, 0x83, 0x36,
-	0xd4, 0x38, 0xa2, 0xf2, 0xa9, 0x68, 0x29, 0x13, 0xe5, 0x4c, 0x5c, 0xf1, 0xa9, 0x58, 0x2b, 0x2e,
-	0xb5, 0xcb, 0x96, 0x68, 0x23, 0x0f, 0x4c, 0x46, 0xc9, 0x23, 0x16, 0x72, 0xa0, 0x9f, 0xca, 0x0d,
-	0x38, 0xc2, 0xdd, 0xca, 0xc6, 0xf9, 0xe3, 0xcb, 0xc9, 0xf4, 0xa3, 0x3c, 0xe4, 0x8a, 0xe9, 0x7a,
-	0x17, 0x42, 0xa5, 0xa4, 0xe8, 0x45, 0x5a, 0x49, 0xd9, 0x26, 0xef, 0xe0, 0x31, 0xb6, 0x71, 0x1b,
-	0x5c, 0xb1, 0x3f, 0xef, 0x7e, 0x6a, 0x8c, 0xbe, 0x8c, 0xc7, 0xd7, 0x99, 0x77, 0x3d, 0x14, 0x71,
-	0x4f, 0x9e, 0x1b, 0x97, 0x85, 0x02, 0x42, 0x91, 0x7a, 0xce, 0xba, 0xc5, 0x13, 0x35, 0x52, 0x3a,
-	0x51, 0xf4, 0xb3, 0xd2, 0xfb, 0x16, 0x8a, 0xc7, 0x5d, 0xc6, 0xd0, 0x07, 0x85, 0xf3, 0xd9, 0x2c,
-	0x3d, 0x66, 0xc3, 0x91, 0x28, 0x9e, 0x8a, 0x81, 0xb3, 0x4e, 0xec, 0xc2, 0x1b, 0x7e, 0xd8, 0x4a,
-	0xf7, 0x59, 0xfa, 0x56, 0x9c, 0x53, 0xb8, 0x5d, 0xa5, 0x6f, 0x04, 0xf0, 0x74, 0xf2, 0x86, 0x96,
-	0x6f, 0xd9, 0x2b, 0x7b, 0xda, 0x5f, 0x33, 0xb3, 0xc4, 0xed, 0xb2, 0xd5, 0x95, 0xbf, 0x08, 0x3e,
-	0x9c, 0xe7, 0xd2, 0xb8, 0xeb, 0xbb, 0x40, 0xbe, 0x42, 0x78, 0x26, 0xa9, 0x9f, 0xb2, 0x11, 0x72,
-	0x2a, 0x37, 0x3a, 0xb0, 0xdc, 0x34, 0xea, 0xe9, 0x4e, 0xe7, 0x3f, 0xf9, 0xfb, 0xc1, 0x17, 0x23,
-	0x94, 0x9e, 0x54, 0xd5, 0x6e, 0x77, 0x59, 0x97, 0xc7, 0xdc, 0xba, 0xab, 0xb5, 0xbd, 0x77, 0x09,
-	0x2d, 0x90, 0x2f, 0x11, 0x9e, 0xbc, 0x01, 0x42, 0x93, 0x9d, 0xe8, 0x27, 0xcb, 0x4b, 0xba, 0xba,
-	0x58, 0xe7, 0x15, 0xd6, 0xb3, 0xe4, 0x99, 0xa1, 0x58, 0x49, 0xfb, 0x9e, 0x44, 0x9b, 0x96, 0x37,
-	0x54, 0x27, 0x04, 0x72, 0xb2, 0x1f, 0xae, 0x50, 0xbc, 0x19, 0x57, 0x6a, 0xd1, 0x49, 0x4b, 0xf4,
-	0x8c, 0x22, 0x3c, 0x45, 0x86, 0x0b, 0x47, 0x3e, 0xc4, 0x33, 0xe5, 0x5c, 0x55, 0x8a, 0xe8, 0xa0,
-	0x2c, 0x66, 0x0c, 0x10, 0x36, 0x4f, 0x2d, 0xf4, 0x9c, 0xf2, 0x7b, 0x86, 0x3c, 0xbd, 0xdb, 0xef,
-	0x22, 0xc8, 0xf1, 0x92, 0xf7, 0x25, 0x44, 0x3e, 0x46, 0x78, 0x26, 0xc9, 0x9f, 0xc3, 0x8e, 0x54,
-	0xe9, 0x1d, 0x30, 0xe6, 0x1e, 0x3e, 0x21, 0x4d, 0xc1, 0x69, 0x78, 0x16, 0xaa, 0x85, 0xe7, 0x27,
-	0x84, 0xa7, 0x55, 0xb9, 0xa8, 0x11, 0x66, 0xfb, 0x3d, 0x14, 0xeb, 0xc9, 0xba, 0xa7, 0xe7, 0x79,
-	0x85, 0x67, 0x19, 0x0b, 0x55, 0xf0, 0xac, 0x58, 0x7a, 0x96, 0x27, 0xfc, 0x57, 0x84, 0x8f, 0x64,
-	0x05, 0xb4, 0x46, 0x3d, 0x3d, 0x08, 0xb5, 0x54, 0x64, 0xd7, 0xa5, 0xbd, 0xa8, 0x68, 0x57, 0x8c,
-	0xc5, 0x8a, 0xb4, 0x89, 0x73, 0x09, 0xfc, 0x33, 0xc2, 0x33, 0x49, 0x85, 0x3b, 0x2c, 0xb8, 0xa5,
-	0x1a, 0xb8, 0x2e, 0xec, 0x0b, 0x0a, 0x76, 0xc9, 0x38, 0x57, 0x19, 0x36, 0x00, 0x89, 0xfa, 0x0b,
-	0xc2, 0x87, 0xd3, 0x02, 0x4b, 0xb3, 0x0e, 0x38, 0x67, 0xe5, 0x1a, 0xac, 0x2e, 0xec, 0x8b, 0x0a,
-	0x76, 0xd9, 0x38, 0x5f, 0x09, 0x96, 0x27, 0xbe, 0x25, 0xed, 0xef, 0x08, 0x1f, 0xd5, 0x15, 0xbc,
-	0xe6, 0xa5, 0xfd, 0xbc, 0xbb, 0xcb, 0xfc, 0xba, 0xc4, 0x2f, 0x29, 0xe2, 0x55, 0xc3, 0xac, 0x44,
-	0x2c, 0x32, 0xef, 0x92, 0xf9, 0x7b, 0x84, 0xa7, 0xe4, 0xcf, 0x04, 0x8d, 0x3b, 0x20, 0x07, 0x16,
-	0x7e, 0x46, 0xd4, 0x25, 0xbd, 0xa0, 0x48, 0x4d, 0xe3, 0x6c, 0x35, 0x6d, 0x05, 0x8b, 0x24, 0xe4,
-	0x37, 0x08, 0x4f, 0x36, 0x87, 0x3f, 0x22, 0xcd, 0x7d, 0x7b, 0x44, 0x56, 0x15, 0xe2, 0xa2, 0x31,
-	0x5f, 0x0d, 0x11, 0xd4, 0x9d, 0xfa, 0x1a, 0xe1, 0x29, 0x59, 0x07, 0x0d, 0x93, 0xb1, 0x50, 0x27,
-	0xd5, 0x65, 0x5c, 0x54, 0x8c, 0xcf, 0x51, 0x3a, 0x9c, 0xb1, 0xed, 0x87, 0x8a, 0xae, 0x87, 0x0f,
-	0x25, 0x95, 0x3d, 0x1f, 0x24, 0x5d, 0xfe, 0xa3, 0xc3, 0x20, 0xf9, 0x68, 0x56, 0x1e, 0xd2, 0x4b,
-	0xca, 0xd7, 0x05, 0xb2, 0x52, 0x49, 0x8f, 0xbb, 0x69, 0x85, 0x78, 0xcf, 0x6a, 0x33, 0x6f, 0x09,
-	0x91, 0xef, 0x10, 0x9e, 0x69, 0x96, 0x73, 0xe3, 0xa9, 0x41, 0x17, 0x78, 0x1f, 0x33, 0xa3, 0xa5,
-	0x80, 0xcf, 0xd2, 0x47, 0x3c, 0x33, 0x3a, 0x21, 0x5e, 0xbd, 0xfc, 0xe7, 0xce, 0x2c, 0xba, 0xbf,
-	0x33, 0x8b, 0xfe, 0xd9, 0x99, 0x45, 0xef, 0x59, 0x8f, 0xfa, 0x33, 0x70, 0xd7, 0x3f, 0x9b, 0x1b,
-	0x63, 0xea, 0xbf, 0xbd, 0xd5, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x9f, 0x66, 0xf9, 0xd2, 0xfa,
-	0x14, 0x00, 0x00,
+	// 1314 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x98, 0x5b, 0x6f, 0xdc, 0x44,
+	0x14, 0xc7, 0x35, 0x49, 0x9b, 0x26, 0x93, 0x4b, 0xdb, 0xa1, 0x94, 0x95, 0xd5, 0xa6, 0xe9, 0x40,
+	0x21, 0x4d, 0x1b, 0x3b, 0x97, 0x02, 0xa5, 0x52, 0x41, 0x6d, 0x53, 0x2a, 0x20, 0x82, 0xca, 0x0b,
+	0x42, 0xe5, 0xcd, 0xf1, 0x9e, 0x3a, 0x6e, 0x6c, 0x8f, 0xf1, 0xcc, 0x6e, 0x15, 0xaa, 0x82, 0xe0,
+	0x91, 0x07, 0x78, 0xe0, 0x05, 0xc1, 0x03, 0x77, 0x09, 0x09, 0x09, 0x81, 0xf8, 0x12, 0x3c, 0x56,
+	0xf0, 0x05, 0x50, 0xd5, 0x0f, 0x82, 0x66, 0x6c, 0x8f, 0xed, 0xec, 0x76, 0x6b, 0xe2, 0x88, 0xbe,
+	0x79, 0x6e, 0xe7, 0xfc, 0xe6, 0x7f, 0x66, 0xce, 0x9c, 0x5d, 0x7c, 0x2a, 0xde, 0xf2, 0x2c, 0x27,
+	0xf6, 0xdd, 0xc0, 0x87, 0x48, 0x58, 0xb7, 0x59, 0xb2, 0x75, 0x33, 0x60, 0xb7, 0xf5, 0x87, 0x19,
+	0x27, 0x4c, 0x30, 0x32, 0x9e, 0xb7, 0x8d, 0x63, 0x1e, 0x63, 0x5e, 0x00, 0x72, 0x8d, 0xe5, 0x44,
+	0x11, 0x13, 0x8e, 0xf0, 0x59, 0xc4, 0xd3, 0x79, 0xc6, 0xb9, 0xad, 0xf3, 0xdc, 0xf4, 0x99, 0x1c,
+	0x0d, 0x1d, 0x77, 0xd3, 0x8f, 0x20, 0xd9, 0xb6, 0x32, 0x17, 0xdc, 0x0a, 0x41, 0x38, 0x56, 0x6f,
+	0xd9, 0xf2, 0x20, 0x82, 0xc4, 0x11, 0xd0, 0xc9, 0x56, 0x5d, 0xf1, 0x7c, 0xb1, 0xd9, 0xdd, 0x30,
+	0x5d, 0x16, 0x5a, 0x4e, 0xe2, 0xb1, 0x38, 0x61, 0xb7, 0xd4, 0x47, 0xb1, 0x54, 0x83, 0xf5, 0x96,
+	0x9d, 0x20, 0xde, 0x74, 0xfa, 0x8d, 0xd0, 0xc2, 0xb5, 0xe5, 0xb2, 0x04, 0x06, 0x38, 0xa2, 0x7f,
+	0x8c, 0xe0, 0x27, 0xdf, 0xcd, 0x2c, 0x5d, 0x49, 0xc0, 0x11, 0x60, 0xc3, 0xfb, 0x5d, 0xe0, 0x82,
+	0x1c, 0xc3, 0x13, 0x91, 0x13, 0x02, 0x8f, 0x1d, 0x17, 0x5a, 0x68, 0x0e, 0xcd, 0x4f, 0xd8, 0x45,
+	0x07, 0xb9, 0x81, 0xb5, 0x00, 0xad, 0x91, 0x39, 0x34, 0x3f, 0xb9, 0x72, 0xd1, 0x2c, 0x98, 0xcd,
+	0x9c, 0x59, 0x7d, 0x98, 0xf1, 0x96, 0x67, 0x4a, 0x66, 0x53, 0x6b, 0x98, 0x33, 0x9b, 0xb9, 0x6f,
+	0x5b, 0x9b, 0x23, 0x14, 0x63, 0x3f, 0xe2, 0xc2, 0x89, 0x5c, 0x78, 0x6d, 0xad, 0x35, 0x2a, 0x3d,
+	0x5f, 0x1e, 0x69, 0x21, 0xbb, 0xd4, 0x4b, 0x28, 0x9e, 0xe2, 0x90, 0xf4, 0x20, 0x59, 0x4b, 0xb6,
+	0xed, 0x6e, 0xd4, 0xda, 0x37, 0x87, 0xe6, 0xc7, 0xed, 0x4a, 0x1f, 0xb9, 0x81, 0xa7, 0x5d, 0xb5,
+	0xa3, 0xb7, 0x62, 0x15, 0x90, 0xd6, 0x7e, 0xc5, 0xb9, 0x6a, 0xa6, 0xb2, 0x98, 0xe5, 0x88, 0x14,
+	0x88, 0x32, 0x22, 0x66, 0x6f, 0xd9, 0xbc, 0x52, 0x5e, 0x6a, 0x57, 0x2d, 0xd1, 0xdf, 0x10, 0x26,
+	0x39, 0xf9, 0x35, 0x10, 0xb9, 0x64, 0x04, 0xef, 0x93, 0x0a, 0x65, 0x6a, 0xa9, 0xef, 0xaa, 0x8c,
+	0x23, 0x3b, 0x65, 0xbc, 0x8e, 0xb1, 0x07, 0x22, 0x07, 0x1c, 0x55, 0x80, 0x4b, 0xf5, 0x00, 0xaf,
+	0xe9, 0x75, 0x76, 0xc9, 0x06, 0x39, 0x8a, 0xc7, 0x6e, 0xfa, 0x10, 0x74, 0xb8, 0xd2, 0x64, 0xc2,
+	0xce, 0x5a, 0xf4, 0x5b, 0x84, 0x9f, 0xc8, 0x91, 0xd7, 0x7d, 0x2e, 0xea, 0x85, 0xb9, 0x8d, 0x27,
+	0x03, 0x9f, 0x6b, 0xc0, 0x34, 0xd2, 0xcb, 0xf5, 0x00, 0xd7, 0x8b, 0x85, 0x76, 0xd9, 0x4a, 0x09,
+	0x71, 0xb4, 0x82, 0xe8, 0xe1, 0xa7, 0xf4, 0x71, 0x00, 0xde, 0xdd, 0x08, 0xfd, 0x06, 0xca, 0x1a,
+	0x78, 0x3c, 0x84, 0x90, 0xf9, 0x1f, 0x40, 0x47, 0xb9, 0x19, 0xb7, 0x75, 0x9b, 0xfe, 0x88, 0xf0,
+	0x91, 0xc2, 0x93, 0x48, 0xb6, 0x77, 0xef, 0xe6, 0x2c, 0x3e, 0x9c, 0x00, 0x17, 0x4e, 0x22, 0xda,
+	0x5d, 0xd7, 0x05, 0xce, 0x6f, 0x76, 0x83, 0xcc, 0x5f, 0xff, 0x80, 0x9c, 0x1d, 0xb1, 0x0e, 0xbc,
+	0x2a, 0xf7, 0xdb, 0x86, 0x00, 0x5c, 0xc1, 0x92, 0x2c, 0x4e, 0xfd, 0x03, 0xf4, 0x76, 0x71, 0x35,
+	0xa5, 0x1e, 0x21, 0x34, 0xc2, 0xec, 0x77, 0x3c, 0xfa, 0x30, 0xc7, 0xeb, 0xb8, 0x95, 0x3b, 0x7e,
+	0x1b, 0x92, 0xd0, 0x8f, 0x4a, 0x69, 0xe1, 0x3f, 0xfb, 0xa6, 0x9f, 0x97, 0x4e, 0x5e, 0x5b, 0xb0,
+	0xf8, 0x7f, 0xda, 0x05, 0x69, 0xe1, 0x03, 0x21, 0x70, 0xee, 0x78, 0x90, 0x49, 0x9c, 0x37, 0xe9,
+	0xbd, 0xd2, 0xf5, 0x6d, 0x37, 0xb9, 0xbe, 0x7b, 0x04, 0x44, 0x8e, 0xe0, 0xfd, 0xf1, 0xa6, 0xc3,
+	0x41, 0xa5, 0xa8, 0x09, 0x3b, 0x6d, 0x90, 0x05, 0x7c, 0x88, 0x75, 0x45, 0xdc, 0x15, 0xd7, 0x9d,
+	0xc4, 0x09, 0x41, 0x40, 0xc2, 0x5b, 0x63, 0x6a, 0x42, 0x5f, 0x3f, 0x7d, 0x1d, 0x1f, 0xd5, 0x3b,
+	0xea, 0xf2, 0x18, 0xa2, 0xce, 0xee, 0x03, 0xf6, 0x43, 0x49, 0x9e, 0x75, 0xe6, 0xed, 0x5e, 0x9e,
+	0x16, 0x3e, 0x10, 0xb3, 0xce, 0x9b, 0x72, 0x51, 0x2a, 0x4a, 0xde, 0x24, 0x97, 0x30, 0x0e, 0x98,
+	0x97, 0xa7, 0x95, 0x7d, 0x2a, 0xad, 0x9c, 0x2c, 0xa5, 0x15, 0x53, 0xbe, 0x57, 0x32, 0x89, 0x5c,
+	0x67, 0x9d, 0x75, 0x3d, 0xd1, 0x2e, 0x2d, 0x92, 0x97, 0x58, 0x5f, 0x8f, 0x35, 0x08, 0xa0, 0xc1,
+	0x11, 0x95, 0x4f, 0x45, 0x47, 0x99, 0xa8, 0x66, 0xe2, 0x9a, 0x4f, 0xc5, 0x5a, 0x79, 0xa9, 0x5d,
+	0xb5, 0x44, 0x5b, 0x45, 0x60, 0x72, 0x4a, 0x1e, 0xb3, 0x88, 0x03, 0xfd, 0x54, 0x6e, 0xc0, 0x11,
+	0xee, 0x66, 0x3e, 0xce, 0x1f, 0x5f, 0x4e, 0xa6, 0x1f, 0x15, 0x21, 0x57, 0x4c, 0x57, 0x7b, 0x10,
+	0x29, 0x25, 0xc5, 0x76, 0xac, 0x95, 0x94, 0xdf, 0xe4, 0x1d, 0x3c, 0xc6, 0x36, 0x6e, 0x81, 0x2b,
+	0xf6, 0xe6, 0xdd, 0xcf, 0x8c, 0xd1, 0x97, 0xf1, 0xf8, 0x3a, 0xf3, 0xae, 0x46, 0x22, 0xd9, 0x96,
+	0xe7, 0xc6, 0x65, 0x91, 0x80, 0x48, 0x64, 0x9e, 0xf3, 0x66, 0xf9, 0x44, 0x8d, 0x54, 0x4e, 0x14,
+	0xfd, 0xac, 0xf2, 0xbe, 0x45, 0xe2, 0x71, 0x97, 0x31, 0xf4, 0x41, 0xe9, 0x7c, 0xb6, 0x2b, 0x8f,
+	0xd9, 0x70, 0x24, 0x8a, 0xa7, 0x12, 0xe0, 0xac, 0x9b, 0xb8, 0xf0, 0x86, 0x1f, 0x75, 0xb2, 0x7d,
+	0x56, 0xfa, 0xca, 0x73, 0x4a, 0xb7, 0xab, 0xd2, 0x47, 0x00, 0x4f, 0xa7, 0x6f, 0x68, 0xf5, 0x96,
+	0xbd, 0xb2, 0xab, 0xfd, 0xb5, 0x73, 0x4b, 0xdc, 0xae, 0x5a, 0x5d, 0xf9, 0x8b, 0xe0, 0x83, 0x45,
+	0x2e, 0x4d, 0x7a, 0xbe, 0x0b, 0xe4, 0x2b, 0x84, 0x67, 0xd2, 0xfa, 0x29, 0x1f, 0x21, 0x27, 0x0a,
+	0xa3, 0x03, 0xcb, 0x4d, 0xa3, 0x99, 0xee, 0x74, 0xfe, 0x93, 0xbf, 0x1f, 0x7c, 0x31, 0x42, 0xe9,
+	0x71, 0x55, 0xed, 0xf6, 0x96, 0x75, 0x79, 0xcc, 0xad, 0x3b, 0x5a, 0xdb, 0xbb, 0x17, 0xd0, 0x02,
+	0xf9, 0x12, 0xe1, 0xc9, 0x6b, 0x20, 0x34, 0xd9, 0xb1, 0x7e, 0xb2, 0xa2, 0xa4, 0x6b, 0x8a, 0x75,
+	0x56, 0x61, 0x3d, 0x4b, 0x9e, 0x19, 0x8a, 0x95, 0x7e, 0xdf, 0x95, 0x68, 0xd3, 0xf2, 0x86, 0xea,
+	0x84, 0x40, 0x8e, 0xf7, 0xc3, 0x95, 0x8a, 0x37, 0xe3, 0x52, 0x23, 0x3a, 0x69, 0x89, 0x9e, 0x52,
+	0x84, 0x27, 0xc8, 0x70, 0xe1, 0xc8, 0x87, 0x78, 0xa6, 0x9a, 0xab, 0x2a, 0x11, 0x1d, 0x94, 0xc5,
+	0x8c, 0x01, 0xc2, 0x16, 0xa9, 0x85, 0x9e, 0x51, 0x7e, 0x4f, 0x91, 0xa7, 0x77, 0xfa, 0x5d, 0x04,
+	0x39, 0x5e, 0xf1, 0xbe, 0x84, 0xc8, 0xc7, 0x08, 0xcf, 0xa4, 0xf9, 0x73, 0xd8, 0x91, 0xaa, 0xbc,
+	0x03, 0xc6, 0xdc, 0xc3, 0x27, 0x64, 0x29, 0x38, 0x0b, 0xcf, 0x42, 0xbd, 0xf0, 0xfc, 0x84, 0xf0,
+	0xb4, 0x2a, 0x17, 0x35, 0xc2, 0x6c, 0xbf, 0x87, 0x72, 0x3d, 0xd9, 0xf4, 0xf4, 0x3c, 0xaf, 0xf0,
+	0x2c, 0x63, 0xa1, 0x0e, 0x9e, 0x95, 0x48, 0xcf, 0xf2, 0x84, 0xff, 0x8a, 0xf0, 0xa1, 0xbc, 0x80,
+	0xd6, 0xa8, 0x27, 0x07, 0xa1, 0x56, 0x8a, 0xec, 0xa6, 0xb4, 0xe7, 0x15, 0xed, 0x8a, 0xb1, 0x58,
+	0x93, 0x36, 0x75, 0x2e, 0x81, 0x7f, 0x46, 0x78, 0x26, 0xad, 0x70, 0x87, 0x05, 0xb7, 0x52, 0x03,
+	0x37, 0x85, 0x7d, 0x41, 0xc1, 0x2e, 0x19, 0x67, 0x6a, 0xc3, 0x86, 0x20, 0x51, 0x7f, 0x41, 0xf8,
+	0x60, 0x56, 0x60, 0x69, 0xd6, 0x01, 0xe7, 0xac, 0x5a, 0x83, 0x35, 0x85, 0x7d, 0x51, 0xc1, 0x2e,
+	0x1b, 0x67, 0x6b, 0xc1, 0xf2, 0xd4, 0xb7, 0xa4, 0xfd, 0x1d, 0xe1, 0xc3, 0xba, 0x82, 0xd7, 0xbc,
+	0xb4, 0x9f, 0x77, 0x67, 0x99, 0xdf, 0x94, 0xf8, 0x25, 0x45, 0xbc, 0x6a, 0x98, 0xb5, 0x88, 0x45,
+	0xee, 0x5d, 0x32, 0x7f, 0x8f, 0xf0, 0x94, 0xfc, 0x99, 0xa0, 0x71, 0x07, 0xe4, 0xc0, 0xd2, 0xcf,
+	0x88, 0xa6, 0xa4, 0xe7, 0x14, 0xa9, 0x69, 0x9c, 0xae, 0xa7, 0xad, 0x60, 0xb1, 0x84, 0xfc, 0x06,
+	0xe1, 0xc9, 0xf6, 0xf0, 0x47, 0xa4, 0xbd, 0x67, 0x8f, 0xc8, 0xaa, 0x42, 0x5c, 0x34, 0xe6, 0xeb,
+	0x21, 0x82, 0xba, 0x53, 0x5f, 0x23, 0x3c, 0x25, 0xeb, 0xa0, 0x61, 0x32, 0x96, 0xea, 0xa4, 0xa6,
+	0x8c, 0x8b, 0x8a, 0xf1, 0x39, 0x4a, 0x87, 0x33, 0x06, 0x7e, 0xa4, 0xe8, 0xb6, 0xf1, 0x81, 0xb4,
+	0xb2, 0xe7, 0x83, 0xa4, 0x2b, 0x7e, 0x74, 0x18, 0xa4, 0x18, 0xcd, 0xcb, 0x43, 0x7a, 0x41, 0xf9,
+	0x3a, 0x47, 0x56, 0x6a, 0xe9, 0x71, 0x27, 0xab, 0x10, 0xef, 0x5a, 0x01, 0xf3, 0x96, 0x10, 0xf9,
+	0x0e, 0xe1, 0x99, 0x76, 0x35, 0x37, 0x9e, 0x18, 0x74, 0x81, 0xf7, 0x30, 0x33, 0x5a, 0x0a, 0xf8,
+	0x34, 0x7d, 0xc4, 0x33, 0xa3, 0x13, 0xe2, 0xe5, 0x8b, 0x7f, 0xde, 0x9f, 0x45, 0xf7, 0xee, 0xcf,
+	0xa2, 0x7f, 0xee, 0xcf, 0xa2, 0xf7, 0xac, 0x47, 0xfd, 0x19, 0xb8, 0xe3, 0xaf, 0xca, 0x8d, 0x31,
+	0xf5, 0xdf, 0xde, 0xea, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x76, 0xeb, 0xb3, 0xcb, 0x14,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/pkg/apiclient/workflow/workflow.proto b/pkg/apiclient/workflow/workflow.proto
index 581de3eee5b6..77ff33f0cef0 100644
--- a/pkg/apiclient/workflow/workflow.proto
+++ b/pkg/apiclient/workflow/workflow.proto
@@ -1,7 +1,6 @@
 syntax = "proto3";
 option go_package = "github.com/argoproj/argo/pkg/apiclient/workflow";
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1/generated.proto";
diff --git a/pkg/apiclient/workflowarchive/workflow-archive.pb.go b/pkg/apiclient/workflowarchive/workflow-archive.pb.go
index 769dc854ec2e..77a93bf2fe60 100644
--- a/pkg/apiclient/workflowarchive/workflow-archive.pb.go
+++ b/pkg/apiclient/workflowarchive/workflow-archive.pb.go
@@ -7,14 +7,12 @@ import (
 	context "context"
 	fmt "fmt"
 	v1alpha1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	io "io"
-	_ "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	math "math"
 	math_bits "math/bits"
@@ -223,37 +221,36 @@ func init() {
 }
 
 var fileDescriptor_95ca9a2d33e8bb19 = []byte{
-	// 475 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcd, 0x8a, 0xd4, 0x40,
-	0x10, 0x26, 0x2a, 0x82, 0xbd, 0x07, 0xa5, 0xc5, 0x1f, 0xc2, 0x38, 0xae, 0x39, 0x2d, 0xca, 0x54,
-	0x9b, 0x75, 0x11, 0x2f, 0x1e, 0x56, 0x17, 0xbc, 0x2c, 0x08, 0xb3, 0x07, 0xc1, 0x5b, 0x4f, 0x52,
-	0xdb, 0xd3, 0x4e, 0x26, 0x1d, 0xbb, 0x3b, 0x19, 0x44, 0xbc, 0xf8, 0x0a, 0xde, 0x3d, 0x79, 0x13,
-	0xdf, 0xc3, 0xa3, 0xe0, 0x0b, 0xc8, 0xe0, 0x83, 0x48, 0x7a, 0x92, 0xcd, 0x90, 0x64, 0x67, 0x84,
-	0xbd, 0x55, 0x75, 0x57, 0x7d, 0xdf, 0x57, 0xf5, 0xa5, 0x43, 0x0e, 0xb2, 0x99, 0x60, 0x3c, 0x93,
-	0x51, 0x22, 0x31, 0xb5, 0x6c, 0xa1, 0xf4, 0xec, 0x34, 0x51, 0x0b, 0xae, 0xa3, 0xa9, 0x2c, 0xf0,
-	0x2c, 0x1f, 0x55, 0x07, 0x90, 0x69, 0x65, 0x15, 0xbd, 0xde, 0xaa, 0xf3, 0x47, 0x42, 0xda, 0x69,
-	0x3e, 0x81, 0x48, 0xcd, 0x99, 0x50, 0x42, 0x31, 0x57, 0x37, 0xc9, 0x4f, 0x5d, 0xe6, 0x12, 0x17,
-	0xad, 0xfa, 0xfd, 0x81, 0x50, 0x4a, 0x24, 0x58, 0x12, 0x33, 0x9e, 0xa6, 0xca, 0x72, 0x2b, 0x55,
-	0x6a, 0xaa, 0xdb, 0x83, 0xd9, 0x33, 0x03, 0x52, 0x95, 0xb7, 0x73, 0x1e, 0x4d, 0x65, 0x8a, 0xfa,
-	0x03, 0xab, 0x74, 0x1a, 0x36, 0x47, 0xcb, 0x59, 0x11, 0x32, 0x81, 0x29, 0x6a, 0x6e, 0x31, 0xae,
-	0xba, 0x5e, 0xae, 0x49, 0xe0, 0xda, 0x91, 0xbe, 0x73, 0x41, 0xd3, 0x5a, 0xab, 0x66, 0x45, 0xc8,
-	0x93, 0x6c, 0xca, 0xbb, 0x20, 0x41, 0x43, 0xcd, 0x22, 0xa5, 0xb1, 0x87, 0x28, 0x30, 0x64, 0x70,
-	0x2c, 0x8d, 0x3d, 0x5c, 0x8d, 0x1e, 0xbf, 0xa9, 0x40, 0xcd, 0x18, 0xdf, 0xe7, 0x68, 0x2c, 0x3d,
-	0x21, 0x3b, 0x89, 0x34, 0xf6, 0x75, 0xe6, 0x66, 0xba, 0xeb, 0xed, 0x7a, 0x7b, 0x3b, 0xfb, 0x21,
-	0xac, 0x90, 0x61, 0x7d, 0x28, 0xc8, 0x66, 0xa2, 0x3c, 0x30, 0x50, 0x0e, 0x05, 0x45, 0x08, 0xc7,
-	0x4d, 0xe3, 0x78, 0x1d, 0x25, 0x00, 0xe2, 0xbf, 0xc2, 0x0e, 0x67, 0x4d, 0x79, 0x83, 0x5c, 0xce,
-	0x65, 0xec, 0xa8, 0xae, 0x8d, 0xcb, 0x30, 0x08, 0xc9, 0xbd, 0x23, 0x4c, 0xd0, 0xe2, 0xff, 0xb7,
-	0x3c, 0x20, 0xf7, 0xdb, 0xc5, 0x2b, 0x88, 0x78, 0x8c, 0x26, 0x53, 0xa9, 0xc1, 0xfd, 0xaf, 0x57,
-	0xc8, 0x9d, 0x76, 0xcd, 0x09, 0xea, 0x42, 0x46, 0x48, 0x7f, 0x78, 0xe4, 0x56, 0xef, 0x5e, 0xe8,
-	0x08, 0x5a, 0x9f, 0x0b, 0x6c, 0xda, 0x9f, 0x7f, 0x08, 0x8d, 0x93, 0x50, 0x3b, 0xe9, 0x82, 0x66,
-	0x5f, 0x35, 0x20, 0xd4, 0x4e, 0x42, 0x0d, 0x53, 0x42, 0x07, 0xc1, 0xe7, 0xdf, 0x7f, 0xbf, 0x5c,
-	0x1a, 0x50, 0xdf, 0x19, 0x59, 0x84, 0xac, 0x22, 0x8e, 0x47, 0x8b, 0x33, 0x55, 0xdf, 0x3d, 0x72,
-	0xb3, 0x67, 0xa5, 0xf4, 0x51, 0x47, 0xed, 0xf9, 0x8b, 0xf7, 0x9f, 0x5f, 0x48, 0x6b, 0xb0, 0xe7,
-	0x74, 0x06, 0x74, 0xf7, 0x7c, 0x9d, 0xec, 0x63, 0x2e, 0xe3, 0x4f, 0xf4, 0x9b, 0x47, 0x6e, 0xf7,
-	0x1b, 0x4a, 0xa1, 0x23, 0x78, 0xa3, 0xf3, 0xfe, 0xe3, 0x4e, 0xfd, 0x16, 0xdb, 0x6b, 0x99, 0x0f,
-	0xb7, 0xca, 0x7c, 0x71, 0xf4, 0x73, 0x39, 0xf4, 0x7e, 0x2d, 0x87, 0xde, 0x9f, 0xe5, 0xd0, 0x7b,
-	0xfb, 0x74, 0xdb, 0x93, 0xec, 0xff, 0xeb, 0x4c, 0xae, 0xba, 0x87, 0xf6, 0xe4, 0x5f, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0x61, 0x99, 0xcf, 0x20, 0x9d, 0x04, 0x00, 0x00,
+	// 450 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xcf, 0x8a, 0xd4, 0x40,
+	0x10, 0xc6, 0x69, 0x15, 0xc1, 0xde, 0x83, 0xd2, 0xe2, 0x1f, 0xc2, 0x38, 0xae, 0x39, 0x2d, 0xca,
+	0x54, 0x9b, 0x75, 0x11, 0x2f, 0x1e, 0x56, 0x17, 0xbc, 0x2c, 0x08, 0xb3, 0x07, 0xc1, 0x5b, 0x6f,
+	0x52, 0x66, 0xda, 0x64, 0xd2, 0x6d, 0x77, 0x27, 0x83, 0x88, 0x17, 0x5f, 0xc1, 0xbb, 0x27, 0x6f,
+	0xe2, 0x7b, 0x78, 0x14, 0x7c, 0x01, 0x19, 0x7c, 0x10, 0xc9, 0xbf, 0xcd, 0x92, 0x64, 0x77, 0x04,
+	0x6f, 0x95, 0x4e, 0xd5, 0x57, 0x3f, 0xbe, 0x2f, 0x1d, 0xba, 0xa7, 0x93, 0x98, 0x0b, 0x2d, 0xc3,
+	0x54, 0x62, 0xe6, 0xf8, 0x4a, 0x99, 0xe4, 0x4d, 0xaa, 0x56, 0xc2, 0x84, 0x0b, 0x59, 0xe0, 0xc9,
+	0xf3, 0xac, 0x39, 0x00, 0x6d, 0x94, 0x53, 0xec, 0x6a, 0xaf, 0xcf, 0x9b, 0xc4, 0x4a, 0xc5, 0x29,
+	0x96, 0x4a, 0x5c, 0x64, 0x99, 0x72, 0xc2, 0x49, 0x95, 0xd9, 0xba, 0xdd, 0xdb, 0x4b, 0x9e, 0x58,
+	0x90, 0xaa, 0x7c, 0xbb, 0x14, 0xe1, 0x42, 0x66, 0x68, 0xde, 0xf3, 0x66, 0xb1, 0xe5, 0x4b, 0x74,
+	0x82, 0x17, 0x01, 0x8f, 0x31, 0x43, 0x23, 0x1c, 0x46, 0xcd, 0xd4, 0xf3, 0x58, 0xba, 0x45, 0x7e,
+	0x0c, 0xa1, 0x5a, 0x72, 0x61, 0x62, 0xa5, 0x8d, 0x7a, 0x5b, 0x15, 0xdd, 0x68, 0x8b, 0xc1, 0x8b,
+	0x40, 0xa4, 0x7a, 0x21, 0x06, 0x22, 0xbe, 0xa5, 0x93, 0x43, 0x69, 0xdd, 0x7e, 0xcd, 0x19, 0xbd,
+	0x6a, 0x06, 0xec, 0x1c, 0xdf, 0xe5, 0x68, 0x1d, 0x3b, 0xa2, 0x5b, 0xa9, 0xb4, 0xee, 0xa5, 0xae,
+	0x78, 0x6f, 0x93, 0x6d, 0xb2, 0xb3, 0xb5, 0x1b, 0x40, 0x0d, 0x0c, 0xa7, 0x81, 0x41, 0x27, 0x71,
+	0x79, 0x60, 0xa1, 0x04, 0x86, 0x22, 0x80, 0xc3, 0x6e, 0x70, 0x7e, 0x5a, 0xc5, 0x07, 0xea, 0xbd,
+	0xc0, 0xc1, 0xce, 0x76, 0xe5, 0x35, 0x7a, 0x31, 0x97, 0x51, 0xb5, 0xea, 0xca, 0xbc, 0x2c, 0xfd,
+	0x80, 0xde, 0x39, 0xc0, 0x14, 0x1d, 0xfe, 0xfb, 0xc8, 0x3d, 0x7a, 0xb7, 0xdf, 0x5c, 0x4b, 0x44,
+	0x73, 0xb4, 0x5a, 0x65, 0x16, 0x77, 0xbf, 0x5c, 0xa2, 0xb7, 0xfa, 0x3d, 0x47, 0x68, 0x0a, 0x19,
+	0x22, 0xfb, 0x4e, 0xe8, 0x8d, 0x51, 0x5f, 0xd8, 0x0c, 0x7a, 0xd9, 0xc2, 0x79, 0xfe, 0x79, 0xfb,
+	0xd0, 0xa5, 0x04, 0x6d, 0x4a, 0x55, 0xd1, 0xf9, 0xd5, 0x0a, 0x42, 0x9b, 0x12, 0xb4, 0x32, 0xa5,
+	0xb4, 0xef, 0x7f, 0xfa, 0xf5, 0xe7, 0xf3, 0x85, 0x09, 0xf3, 0xaa, 0xaf, 0xa7, 0x08, 0x78, 0xb3,
+	0x38, 0x9a, 0xad, 0x4e, 0xa8, 0xbe, 0x11, 0x7a, 0x7d, 0xc4, 0x52, 0xf6, 0x60, 0x40, 0x7b, 0xb6,
+	0xf1, 0xde, 0xd3, 0xff, 0x62, 0xf5, 0x77, 0x2a, 0x4e, 0x9f, 0x6d, 0x9f, 0xcd, 0xc9, 0x3f, 0xe4,
+	0x32, 0xfa, 0xc8, 0xbe, 0x12, 0x7a, 0x73, 0x3c, 0x50, 0x06, 0x03, 0xe0, 0x73, 0x93, 0xf7, 0x1e,
+	0x0e, 0xfa, 0x37, 0xc4, 0xde, 0x62, 0xde, 0xdf, 0x88, 0xf9, 0xec, 0xe0, 0xc7, 0x7a, 0x4a, 0x7e,
+	0xae, 0xa7, 0xe4, 0xf7, 0x7a, 0x4a, 0x5e, 0x3f, 0xde, 0x74, 0xdd, 0xc6, 0x7f, 0x11, 0xc7, 0x97,
+	0xab, 0x8b, 0xf6, 0xe8, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x60, 0x01, 0x7f, 0x4a, 0x04,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/pkg/apiclient/workflowarchive/workflow-archive.proto b/pkg/apiclient/workflowarchive/workflow-archive.proto
index 226819108d7f..d9ab14026156 100644
--- a/pkg/apiclient/workflowarchive/workflow-archive.proto
+++ b/pkg/apiclient/workflowarchive/workflow-archive.proto
@@ -1,11 +1,9 @@
 syntax = "proto3";
 option go_package = "github.com/argoproj/argo/pkg/apiclient/workflowarchive";
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1/generated.proto";
-import "k8s.io/api/core/v1/generated.proto";
 
 package workflowarchive;
 
diff --git a/pkg/apiclient/workflowtemplate/workflow-template.pb.go b/pkg/apiclient/workflowtemplate/workflow-template.pb.go
index d800c75fcbed..0197951ee031 100644
--- a/pkg/apiclient/workflowtemplate/workflow-template.pb.go
+++ b/pkg/apiclient/workflowtemplate/workflow-template.pb.go
@@ -11,7 +11,6 @@ import (
 	context "context"
 	fmt "fmt"
 	v1alpha1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
@@ -460,51 +459,50 @@ func init() {
 }
 
 var fileDescriptor_215375a0ab97a62a = []byte{
-	// 698 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x96, 0xcf, 0x6e, 0xd3, 0x4e,
-	0x10, 0xc7, 0xb5, 0xe9, 0x4f, 0x3f, 0xd1, 0xad, 0x2a, 0xa1, 0x05, 0x42, 0x64, 0x4a, 0x54, 0xf9,
-	0x80, 0xaa, 0x96, 0xec, 0xd6, 0x2d, 0x94, 0xaa, 0xc7, 0xfe, 0x51, 0x84, 0x54, 0x09, 0xe4, 0x82,
-	0x50, 0xb9, 0x6d, 0x9c, 0xad, 0x63, 0xe2, 0x78, 0x8d, 0xbd, 0x49, 0x85, 0x50, 0x2f, 0x3c, 0x01,
-	0x12, 0x2f, 0xc0, 0x03, 0x70, 0x40, 0x9c, 0xb8, 0x22, 0x38, 0x20, 0x4e, 0x48, 0xbc, 0x00, 0x8a,
-	0x78, 0x09, 0xc4, 0x05, 0x79, 0x6d, 0xc7, 0x7f, 0x92, 0x12, 0x27, 0x0a, 0x27, 0x6e, 0xeb, 0xf5,
-	0xce, 0xcc, 0xe7, 0x3b, 0x33, 0x1e, 0x2f, 0xdc, 0x72, 0xdb, 0x26, 0xa1, 0xae, 0x65, 0xd8, 0x16,
-	0x73, 0x04, 0x39, 0xe5, 0x5e, 0xfb, 0xc4, 0xe6, 0xa7, 0x82, 0x75, 0x5c, 0x9b, 0x0a, 0x36, 0xd8,
-	0xa8, 0xc5, 0x3b, 0xd8, 0xf5, 0xb8, 0xe0, 0xe8, 0x62, 0xfe, 0xa4, 0x52, 0x33, 0x2d, 0xd1, 0xea,
-	0x36, 0xb0, 0xc1, 0x3b, 0xc4, 0xe4, 0x26, 0x27, 0xf2, 0x60, 0xa3, 0x7b, 0x22, 0x9f, 0xe4, 0x83,
-	0x5c, 0x85, 0x0e, 0x94, 0x25, 0x93, 0x73, 0xd3, 0x66, 0x41, 0x6c, 0x42, 0x1d, 0x87, 0x0b, 0x2a,
-	0x2c, 0xee, 0xf8, 0xd1, 0xdb, 0x5b, 0xed, 0x6d, 0x1f, 0x5b, 0x3c, 0x78, 0xdb, 0xa1, 0x46, 0xcb,
-	0x72, 0x98, 0xf7, 0x8c, 0x44, 0xa8, 0x3e, 0xe9, 0x30, 0x41, 0x49, 0x4f, 0x23, 0x26, 0x73, 0x98,
-	0x47, 0x05, 0x6b, 0x46, 0x56, 0x7b, 0x29, 0x04, 0xea, 0xc9, 0xa0, 0x4f, 0xe4, 0x22, 0x31, 0x8d,
-	0xb1, 0x49, 0x4f, 0xa3, 0xb6, 0xdb, 0xa2, 0x43, 0x4e, 0xd4, 0x5f, 0x00, 0x5e, 0x7f, 0x14, 0x9d,
-	0x7a, 0x10, 0x89, 0xdb, 0xf3, 0x18, 0x15, 0x4c, 0x67, 0x4f, 0xbb, 0xcc, 0x17, 0x68, 0x09, 0xce,
-	0x3b, 0xb4, 0xc3, 0x7c, 0x97, 0x1a, 0xac, 0x02, 0x96, 0xc1, 0xca, 0xbc, 0x9e, 0x6c, 0x20, 0x0a,
-	0x2f, 0xc4, 0x39, 0xa9, 0x94, 0x96, 0xc1, 0xca, 0xc2, 0xc6, 0x01, 0x4e, 0xb8, 0x70, 0xcc, 0x25,
-	0x17, 0xd8, 0x6d, 0x9b, 0x38, 0xe0, 0xc2, 0x31, 0x17, 0x8e, 0xb9, 0x70, 0x9e, 0x41, 0x1f, 0xb8,
-	0x45, 0xc7, 0x70, 0xd1, 0x90, 0x44, 0xf7, 0x5c, 0x99, 0xb4, 0xca, 0x9c, 0x8c, 0xb3, 0x89, 0xc3,
-	0xac, 0xe1, 0x74, 0xd6, 0x92, 0x10, 0x41, 0xd6, 0x70, 0x4f, 0xc3, 0x7b, 0x69, 0x53, 0x3d, 0xeb,
-	0x49, 0x7d, 0x0d, 0xa0, 0x92, 0x8f, 0x5c, 0x67, 0x22, 0x96, 0x8e, 0xe0, 0x7f, 0x81, 0xd2, 0x48,
-	0xb5, 0x5c, 0x67, 0xd3, 0x51, 0xca, 0xa7, 0xe3, 0x3e, 0x84, 0x26, 0x13, 0x59, 0xd0, 0xf5, 0x62,
-	0xa0, 0xf5, 0x81, 0x9d, 0x9e, 0xf2, 0xa1, 0xbe, 0x04, 0xf0, 0x5a, 0x1e, 0xf1, 0xd0, 0xf2, 0x45,
-	0xb1, 0xf2, 0x1c, 0xc1, 0x05, 0xdb, 0xf2, 0x07, 0x40, 0x61, 0x85, 0xb4, 0x62, 0x40, 0x87, 0x89,
-	0xa1, 0x9e, 0xf6, 0xa2, 0xbe, 0x1f, 0xd1, 0x33, 0x0f, 0xdd, 0x66, 0xaa, 0x67, 0xca, 0xe9, 0xc4,
-	0xed, 0x96, 0x2a, 0xa0, 0x50, 0xf2, 0xd2, 0xbd, 0x34, 0xf7, 0x57, 0x7a, 0x49, 0x7d, 0x33, 0x02,
-	0x7d, 0x9f, 0xd9, 0x2c, 0x41, 0x9f, 0xbc, 0xe6, 0xc7, 0x70, 0xb1, 0x29, 0x5d, 0x4c, 0xd5, 0x9f,
-	0xfb, 0x69, 0x53, 0x3d, 0xeb, 0x49, 0x5d, 0x86, 0xd5, 0xf3, 0x68, 0x7d, 0x97, 0x3b, 0x3e, 0x53,
-	0x7f, 0x8e, 0x6c, 0x0f, 0x47, 0xfc, 0x03, 0x5f, 0xef, 0xc6, 0xdb, 0x79, 0x78, 0x35, 0x1f, 0xf9,
-	0x88, 0x79, 0x3d, 0xcb, 0x60, 0xe8, 0x23, 0x80, 0xe5, 0xd0, 0x38, 0x7f, 0x02, 0x11, 0x9c, 0x9f,
-	0xe6, 0xf8, 0x8f, 0x13, 0x50, 0x99, 0x4d, 0x4e, 0x54, 0xed, 0xc5, 0xb7, 0x1f, 0xaf, 0x4a, 0x6b,
-	0xea, 0x0d, 0xf9, 0x17, 0xe8, 0x69, 0xc3, 0x7f, 0x1b, 0x9f, 0x3c, 0x1f, 0xd4, 0xe6, 0x6c, 0x07,
-	0xac, 0xa2, 0x0f, 0x00, 0x5e, 0xaa, 0x33, 0x31, 0x24, 0xe1, 0xe6, 0x78, 0x09, 0xc9, 0x18, 0x9b,
-	0x15, 0xff, 0x6d, 0xc9, 0x4f, 0x50, 0xad, 0x18, 0x7f, 0xb8, 0x3e, 0x0b, 0x34, 0x5c, 0x09, 0x46,
-	0x49, 0xde, 0x9f, 0x8f, 0x6a, 0xe3, 0x55, 0xa4, 0x26, 0x9d, 0x72, 0x77, 0x26, 0x32, 0x02, 0x8f,
-	0x2a, 0x96, 0x52, 0x56, 0x50, 0xc1, 0x52, 0xa0, 0x2f, 0x00, 0x96, 0xc3, 0x09, 0x37, 0x4d, 0x37,
-	0x65, 0x66, 0xe3, 0xac, 0xaa, 0xb1, 0x2d, 0x25, 0x6c, 0x28, 0x93, 0x55, 0x23, 0x68, 0xaa, 0x77,
-	0x00, 0x96, 0xc3, 0x29, 0x32, 0x8d, 0x98, 0xcc, 0xb4, 0x54, 0xd6, 0x8b, 0x1b, 0x44, 0x03, 0x2b,
-	0xea, 0xa2, 0xd5, 0x09, 0xbb, 0xe8, 0x13, 0x80, 0x97, 0x83, 0xb9, 0x36, 0x84, 0x5c, 0xa8, 0x89,
-	0x9c, 0x59, 0x7f, 0x0b, 0x5b, 0x52, 0xc5, 0xba, 0xba, 0x56, 0x50, 0x85, 0x6d, 0x39, 0x62, 0x07,
-	0xac, 0xee, 0x1e, 0x7c, 0xee, 0x57, 0xc1, 0xd7, 0x7e, 0x15, 0x7c, 0xef, 0x57, 0xc1, 0xe3, 0x3b,
-	0xe3, 0x6e, 0x70, 0xe7, 0xdc, 0x53, 0x1b, 0xff, 0xcb, 0xcb, 0xdb, 0xe6, 0xef, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0xa4, 0x4a, 0xb9, 0xa1, 0xd0, 0x0a, 0x00, 0x00,
+	// 679 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x96, 0x4f, 0x6b, 0x13, 0x41,
+	0x18, 0xc6, 0x99, 0x54, 0xc4, 0x4e, 0x29, 0xc8, 0xa8, 0x31, 0xac, 0x35, 0x94, 0x3d, 0x48, 0x69,
+	0xed, 0x4c, 0x36, 0xd5, 0x5a, 0x7a, 0x6c, 0x5a, 0x82, 0x50, 0x50, 0xb6, 0x8a, 0xd4, 0xdb, 0x74,
+	0x33, 0x6e, 0xd6, 0x6c, 0x76, 0xd6, 0xdd, 0x69, 0x8a, 0x48, 0x2f, 0x7e, 0x02, 0xc1, 0x2f, 0xe0,
+	0x07, 0xf0, 0x20, 0x9e, 0xbc, 0x8a, 0x1e, 0xc4, 0x93, 0xe0, 0x17, 0x90, 0xe0, 0x97, 0x10, 0x2f,
+	0xb2, 0xb3, 0xbb, 0xd9, 0x3f, 0x49, 0xcd, 0x26, 0xc4, 0x93, 0xb7, 0x61, 0x32, 0xef, 0x3b, 0xbf,
+	0xe7, 0x7d, 0xdf, 0x3c, 0x3b, 0x70, 0xd3, 0xed, 0x98, 0x84, 0xba, 0x96, 0x61, 0x5b, 0xcc, 0x11,
+	0xe4, 0x84, 0x7b, 0x9d, 0x27, 0x36, 0x3f, 0x11, 0xac, 0xeb, 0xda, 0x54, 0xb0, 0xc1, 0xc6, 0x7a,
+	0xbc, 0x83, 0x5d, 0x8f, 0x0b, 0x8e, 0x2e, 0xe6, 0x4f, 0x2a, 0x4b, 0x26, 0xe7, 0xa6, 0xcd, 0x82,
+	0x64, 0x84, 0x3a, 0x0e, 0x17, 0x54, 0x58, 0xdc, 0xf1, 0xc3, 0xf3, 0xca, 0xad, 0xce, 0x96, 0x8f,
+	0x2d, 0x1e, 0xfc, 0xda, 0xa5, 0x46, 0xdb, 0x72, 0x98, 0xf7, 0x9c, 0x44, 0x77, 0xfb, 0xa4, 0xcb,
+	0x04, 0x25, 0x3d, 0x8d, 0x98, 0xcc, 0x61, 0x1e, 0x15, 0xac, 0x15, 0x45, 0x35, 0x4c, 0x4b, 0xb4,
+	0x8f, 0x8f, 0xb0, 0xc1, 0xbb, 0x84, 0x7a, 0x26, 0x77, 0x3d, 0xfe, 0x54, 0x2e, 0x92, 0xd0, 0x98,
+	0x83, 0xf4, 0x34, 0x6a, 0xbb, 0x6d, 0x3a, 0x94, 0x44, 0xfd, 0x0d, 0xe0, 0xf5, 0x47, 0xd1, 0xa9,
+	0x07, 0x11, 0x6d, 0xc3, 0x63, 0x54, 0x30, 0x9d, 0x3d, 0x3b, 0x66, 0xbe, 0x40, 0x4b, 0x70, 0xde,
+	0xa1, 0x5d, 0xe6, 0xbb, 0xd4, 0x60, 0x15, 0xb0, 0x0c, 0x56, 0xe6, 0xf5, 0x64, 0x03, 0x51, 0x78,
+	0x21, 0x16, 0x59, 0x29, 0x2d, 0x83, 0x95, 0x85, 0xfa, 0x1e, 0x4e, 0xb8, 0x70, 0xcc, 0x25, 0x17,
+	0xd8, 0xed, 0x98, 0x38, 0xe0, 0xc2, 0x31, 0x17, 0x8e, 0xb9, 0x70, 0x9e, 0x41, 0x1f, 0xa4, 0x45,
+	0x87, 0x70, 0xd1, 0x90, 0x44, 0xf7, 0x5c, 0x59, 0xb4, 0xca, 0x9c, 0xbc, 0x67, 0x03, 0x87, 0x55,
+	0xc3, 0xe9, 0xaa, 0x25, 0x57, 0x04, 0x55, 0xc3, 0x3d, 0x0d, 0x37, 0xd2, 0xa1, 0x7a, 0x36, 0x93,
+	0xfa, 0x06, 0x40, 0x25, 0x7f, 0x73, 0x93, 0x89, 0x58, 0x3a, 0x82, 0xe7, 0x02, 0xa5, 0x91, 0x6a,
+	0xb9, 0xce, 0x96, 0xa3, 0x94, 0x2f, 0xc7, 0x7d, 0x08, 0x4d, 0x26, 0xb2, 0xa0, 0xb5, 0x62, 0xa0,
+	0xcd, 0x41, 0x9c, 0x9e, 0xca, 0xa1, 0xbe, 0x02, 0xf0, 0x5a, 0x1e, 0x71, 0xdf, 0xf2, 0x45, 0xb1,
+	0xf6, 0x1c, 0xc0, 0x05, 0xdb, 0xf2, 0x07, 0x40, 0x61, 0x87, 0xb4, 0x62, 0x40, 0xfb, 0x49, 0xa0,
+	0x9e, 0xce, 0xa2, 0x7e, 0x18, 0x31, 0x33, 0x0f, 0xdd, 0x56, 0x6a, 0x66, 0xca, 0xe9, 0xc2, 0xed,
+	0x94, 0x2a, 0xa0, 0x50, 0xf1, 0xd2, 0xb3, 0x34, 0xf7, 0x4f, 0x66, 0x49, 0x7d, 0x3b, 0x02, 0x7d,
+	0x97, 0xd9, 0x2c, 0x41, 0x9f, 0xbc, 0xe7, 0x87, 0x70, 0xb1, 0x25, 0x53, 0x4c, 0x35, 0x9f, 0xbb,
+	0xe9, 0x50, 0x3d, 0x9b, 0x49, 0x5d, 0x86, 0xd5, 0xb3, 0x68, 0x7d, 0x97, 0x3b, 0x3e, 0x53, 0x7f,
+	0x8d, 0x1c, 0x0f, 0x47, 0xfc, 0x07, 0xff, 0xde, 0xfa, 0xbb, 0x79, 0x78, 0x35, 0x7f, 0xf3, 0x01,
+	0xf3, 0x7a, 0x96, 0xc1, 0xd0, 0x27, 0x00, 0xcb, 0x61, 0x70, 0xfe, 0x04, 0x22, 0x38, 0x6f, 0xcf,
+	0xf8, 0xaf, 0x0e, 0xa8, 0xcc, 0xa6, 0x26, 0xaa, 0xf6, 0xf2, 0xfb, 0xcf, 0xd7, 0xa5, 0x35, 0xf5,
+	0x86, 0xfc, 0x0a, 0xf4, 0xb4, 0xe1, 0xcf, 0x87, 0x4f, 0x5e, 0x0c, 0x7a, 0x73, 0xba, 0x0d, 0x56,
+	0xd1, 0x47, 0x00, 0x2f, 0x35, 0x99, 0x18, 0x92, 0x70, 0x73, 0xbc, 0x84, 0xc4, 0xc6, 0x66, 0xc5,
+	0x7f, 0x5b, 0xf2, 0x13, 0xb4, 0x5e, 0x8c, 0x3f, 0x5c, 0x9f, 0x06, 0x1a, 0xae, 0x04, 0x56, 0x92,
+	0xcf, 0xe7, 0xa3, 0xf5, 0xf1, 0x2a, 0x52, 0x4e, 0xa7, 0xdc, 0x9d, 0x89, 0x8c, 0x20, 0xa3, 0x8a,
+	0xa5, 0x94, 0x15, 0x54, 0xb0, 0x15, 0xe8, 0x2b, 0x80, 0xe5, 0xd0, 0xe1, 0xa6, 0x99, 0xa6, 0x8c,
+	0x37, 0xce, 0xaa, 0x1b, 0x5b, 0x52, 0x42, 0x5d, 0x99, 0xac, 0x1b, 0xc1, 0x50, 0xbd, 0x07, 0xb0,
+	0x1c, 0xba, 0xc8, 0x34, 0x62, 0x32, 0x6e, 0xa9, 0xd4, 0x8a, 0x07, 0x44, 0x86, 0x15, 0x4d, 0xd1,
+	0xea, 0x84, 0x53, 0xf4, 0x19, 0xc0, 0xcb, 0x81, 0xaf, 0x0d, 0x21, 0x17, 0x1a, 0x22, 0x67, 0xd6,
+	0xff, 0x85, 0x4d, 0xa9, 0xa2, 0xa6, 0xae, 0x15, 0x54, 0x61, 0x5b, 0x8e, 0xd8, 0x06, 0xab, 0x3b,
+	0x7b, 0x5f, 0xfa, 0x55, 0xf0, 0xad, 0x5f, 0x05, 0x3f, 0xfa, 0x55, 0xf0, 0xf8, 0xce, 0xb8, 0x17,
+	0xdc, 0x19, 0x0f, 0xcf, 0xa3, 0xf3, 0xf2, 0xf1, 0xb6, 0xf1, 0x27, 0x00, 0x00, 0xff, 0xff, 0x3e,
+	0x67, 0x8c, 0x99, 0xa1, 0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/pkg/apiclient/workflowtemplate/workflow-template.proto b/pkg/apiclient/workflowtemplate/workflow-template.proto
index ef964c733a8c..37f9fbf98891 100644
--- a/pkg/apiclient/workflowtemplate/workflow-template.proto
+++ b/pkg/apiclient/workflowtemplate/workflow-template.proto
@@ -1,7 +1,6 @@
 syntax = "proto3";
 option go_package = "github.com/argoproj/argo/pkg/apiclient/workflowtemplate";
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1/generated.proto";