diff --git a/cmd/skaffold/app/cmd/runner.go b/cmd/skaffold/app/cmd/runner.go
index 4a2ca503391..d68937c2648 100644
--- a/cmd/skaffold/app/cmd/runner.go
+++ b/cmd/skaffold/app/cmd/runner.go
@@ -39,7 +39,7 @@ import (
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/validation"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/update"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 // For tests
diff --git a/docs/content/en/api/skaffold.swagger.json b/docs/content/en/api/skaffold.swagger.json
index 54452dab5f7..94b22c75204 100644
--- a/docs/content/en/api/skaffold.swagger.json
+++ b/docs/content/en/api/skaffold.swagger.json
@@ -35,7 +35,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/protoTriggerState"
+              "$ref": "#/definitions/v1TriggerState"
             }
           }
         ],
@@ -68,7 +68,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/protoTriggerState"
+              "$ref": "#/definitions/v1TriggerState"
             }
           }
         ],
@@ -88,13 +88,13 @@
               "type": "object",
               "properties": {
                 "result": {
-                  "$ref": "#/definitions/protoLogEntry"
+                  "$ref": "#/definitions/v1LogEntry"
                 },
                 "error": {
                   "$ref": "#/definitions/runtimeStreamError"
                 }
               },
-              "description": "Stream result of protoLogEntry"
+              "description": "Stream result of v1LogEntry"
             }
           },
           "default": {
@@ -2519,13 +2519,13 @@
               "type": "object",
               "properties": {
                 "result": {
-                  "$ref": "#/definitions/protoLogEntry"
+                  "$ref": "#/definitions/v1LogEntry"
                 },
                 "error": {
                   "$ref": "#/definitions/runtimeStreamError"
                 }
               },
-              "description": "Stream result of protoLogEntry"
+              "description": "Stream result of v1LogEntry"
             }
           },
           "default": {
@@ -2564,7 +2564,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/protoEvent"
+              "$ref": "#/definitions/v1Event"
             }
           }
         ],
@@ -2597,7 +2597,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/protoIntent"
+              "$ref": "#/definitions/v1Intent"
             }
           }
         ],
@@ -2614,7 +2614,7 @@
           "200": {
             "description": "A successful response.",
             "schema": {
-              "$ref": "#/definitions/protoState"
+              "$ref": "#/definitions/v1State"
             }
           },
           "default": {
@@ -2653,7 +2653,7 @@
             "in": "body",
             "required": true,
             "schema": {
-              "$ref": "#/definitions/protoTriggerState"
+              "$ref": "#/definitions/v1TriggerState"
             }
           }
         ],
@@ -2984,7 +2984,65 @@
       "default": "UNKNOWN_TEST_TYPE",
       "description": "Enum indicating test tools used\n- UNKNOWN_TEST_TYPE: Could not determine Test Type\n - UNIT: Unit tests\n - CONTAINER_STRUCTURE_TEST: Container Structure tests"
     },
-    "protoActionableErr": {
+    "protobufAny": {
+      "type": "object",
+      "properties": {
+        "type_url": {
+          "type": "string"
+        },
+        "value": {
+          "type": "string",
+          "format": "byte"
+        }
+      }
+    },
+    "runtimeError": {
+      "type": "object",
+      "properties": {
+        "error": {
+          "type": "string"
+        },
+        "code": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "message": {
+          "type": "string"
+        },
+        "details": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/protobufAny"
+          }
+        }
+      }
+    },
+    "runtimeStreamError": {
+      "type": "object",
+      "properties": {
+        "grpc_code": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "http_code": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "message": {
+          "type": "string"
+        },
+        "http_status": {
+          "type": "string"
+        },
+        "details": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/protobufAny"
+          }
+        }
+      }
+    },
+    "v1ActionableErr": {
       "type": "object",
       "properties": {
         "errCode": {
@@ -2996,13 +3054,13 @@
         "suggestions": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/protoSuggestion"
+            "$ref": "#/definitions/v1Suggestion"
           }
         }
       },
       "description": "`ActionableErr` defines an error that occurred along with an optional list of suggestions"
     },
-    "protoBuildEvent": {
+    "v1BuildEvent": {
       "type": "object",
       "properties": {
         "artifact": {
@@ -3018,12 +3076,12 @@
           "$ref": "#/definitions/enumsStatusCode"
         },
         "actionableErr": {
-          "$ref": "#/definitions/protoActionableErr"
+          "$ref": "#/definitions/v1ActionableErr"
         }
       },
       "description": "`BuildEvent` describes the build status per artifact, and will be emitted by Skaffold anytime a build starts or finishes, successfully or not.\nIf the build fails, an error will be attached to the event."
     },
-    "protoBuildMetadata": {
+    "v1BuildMetadata": {
       "type": "object",
       "properties": {
         "numberOfArtifacts": {
@@ -3048,7 +3106,7 @@
         }
       }
     },
-    "protoBuildState": {
+    "v1BuildState": {
       "type": "object",
       "properties": {
         "artifacts": {
@@ -3067,7 +3125,7 @@
       },
       "description": "`BuildState` maps Skaffold artifacts to their current build states"
     },
-    "protoDebuggingContainerEvent": {
+    "v1DebuggingContainerEvent": {
       "type": "object",
       "properties": {
         "status": {
@@ -3101,7 +3159,7 @@
       },
       "description": "DebuggingContainerEvent is raised when a debugging container is started or terminated"
     },
-    "protoDeployEvent": {
+    "v1DeployEvent": {
       "type": "object",
       "properties": {
         "status": {
@@ -3114,12 +3172,12 @@
           "$ref": "#/definitions/enumsStatusCode"
         },
         "actionableErr": {
-          "$ref": "#/definitions/protoActionableErr"
+          "$ref": "#/definitions/v1ActionableErr"
         }
       },
       "description": "`DeployEvent` represents the status of a deployment, and is emitted by Skaffold\nanytime a deployment starts or completes, successfully or not."
     },
-    "protoDeployMetadata": {
+    "v1DeployMetadata": {
       "type": "object",
       "properties": {
         "deployers": {
@@ -3133,7 +3191,7 @@
         }
       }
     },
-    "protoDeployState": {
+    "v1DeployState": {
       "type": "object",
       "properties": {
         "status": {
@@ -3148,7 +3206,7 @@
       },
       "description": "`DeployState` describes the status of the current deploy"
     },
-    "protoDevLoopEvent": {
+    "v1DevLoopEvent": {
       "type": "object",
       "properties": {
         "iteration": {
@@ -3159,51 +3217,51 @@
           "type": "string"
         },
         "err": {
-          "$ref": "#/definitions/protoActionableErr"
+          "$ref": "#/definitions/v1ActionableErr"
         }
       },
       "description": "`DevLoopEvent` marks the start and end of a dev loop."
     },
-    "protoEvent": {
+    "v1Event": {
       "type": "object",
       "properties": {
         "metaEvent": {
-          "$ref": "#/definitions/protoMetaEvent"
+          "$ref": "#/definitions/v1MetaEvent"
         },
         "buildEvent": {
-          "$ref": "#/definitions/protoBuildEvent"
+          "$ref": "#/definitions/v1BuildEvent"
         },
         "deployEvent": {
-          "$ref": "#/definitions/protoDeployEvent"
+          "$ref": "#/definitions/v1DeployEvent"
         },
         "portEvent": {
-          "$ref": "#/definitions/protoPortEvent"
+          "$ref": "#/definitions/v1PortEvent"
         },
         "statusCheckEvent": {
-          "$ref": "#/definitions/protoStatusCheckEvent"
+          "$ref": "#/definitions/v1StatusCheckEvent"
         },
         "resourceStatusCheckEvent": {
-          "$ref": "#/definitions/protoResourceStatusCheckEvent"
+          "$ref": "#/definitions/v1ResourceStatusCheckEvent"
         },
         "fileSyncEvent": {
-          "$ref": "#/definitions/protoFileSyncEvent"
+          "$ref": "#/definitions/v1FileSyncEvent"
         },
         "debuggingContainerEvent": {
-          "$ref": "#/definitions/protoDebuggingContainerEvent"
+          "$ref": "#/definitions/v1DebuggingContainerEvent"
         },
         "devLoopEvent": {
-          "$ref": "#/definitions/protoDevLoopEvent"
+          "$ref": "#/definitions/v1DevLoopEvent"
         },
         "terminationEvent": {
-          "$ref": "#/definitions/protoTerminationEvent"
+          "$ref": "#/definitions/v1TerminationEvent"
         },
         "TestEvent": {
-          "$ref": "#/definitions/protoTestEvent"
+          "$ref": "#/definitions/v1TestEvent"
         }
       },
       "description": "`Event` describes an event in the Skaffold process.\nIt is one of MetaEvent, BuildEvent, TestEvent, DeployEvent, PortEvent, StatusCheckEvent, ResourceStatusCheckEvent, FileSyncEvent, or DebuggingContainerEvent."
     },
-    "protoFileSyncEvent": {
+    "v1FileSyncEvent": {
       "type": "object",
       "properties": {
         "fileCount": {
@@ -3223,12 +3281,12 @@
           "$ref": "#/definitions/enumsStatusCode"
         },
         "actionableErr": {
-          "$ref": "#/definitions/protoActionableErr"
+          "$ref": "#/definitions/v1ActionableErr"
         }
       },
       "description": "FileSyncEvent describes the sync status."
     },
-    "protoFileSyncState": {
+    "v1FileSyncState": {
       "type": "object",
       "properties": {
         "status": {
@@ -3240,7 +3298,7 @@
       },
       "description": "`FileSyncState` contains the status of the current file sync"
     },
-    "protoIntOrString": {
+    "v1IntOrString": {
       "type": "object",
       "properties": {
         "type": {
@@ -3257,7 +3315,7 @@
       },
       "description": "IntOrString is a type that can hold an int32 or a string."
     },
-    "protoIntent": {
+    "v1Intent": {
       "type": "object",
       "properties": {
         "build": {
@@ -3272,7 +3330,7 @@
       },
       "description": "Intent represents user intents for a given phase."
     },
-    "protoLogEntry": {
+    "v1LogEntry": {
       "type": "object",
       "properties": {
         "timestamp": {
@@ -3280,7 +3338,7 @@
           "format": "date-time"
         },
         "event": {
-          "$ref": "#/definitions/protoEvent"
+          "$ref": "#/definitions/v1Event"
         },
         "entry": {
           "type": "string"
@@ -3288,7 +3346,7 @@
       },
       "description": "LogEntry describes an event and a string description of the event."
     },
-    "protoMetaEvent": {
+    "v1MetaEvent": {
       "type": "object",
       "properties": {
         "entry": {
@@ -3296,23 +3354,23 @@
           "description": "entry, for example: `\"Starting Skaffold: {Version:v0.39.0-16-g5bb7c9e0 ConfigVersion:skaffold/v1 GitVersion: GitCommit:5bb7c9e078e4d522a5ffc42a2f1274fd17d75902 GitTreeState:dirty BuildDate01:29Z GoVersion:go1.13rc1 Compiler:gc Platform:linux/amd64}\"`"
         },
         "metadata": {
-          "$ref": "#/definitions/protoMetadata",
+          "$ref": "#/definitions/v1Metadata",
           "description": "Metadata describing skaffold pipeline"
         }
       },
       "description": "`MetaEvent` provides general information regarding Skaffold"
     },
-    "protoMetadata": {
+    "v1Metadata": {
       "type": "object",
       "properties": {
         "build": {
-          "$ref": "#/definitions/protoBuildMetadata"
+          "$ref": "#/definitions/v1BuildMetadata"
         },
         "deploy": {
-          "$ref": "#/definitions/protoDeployMetadata"
+          "$ref": "#/definitions/v1DeployMetadata"
         },
         "test": {
-          "$ref": "#/definitions/protoTestMetadata"
+          "$ref": "#/definitions/v1TestMetadata"
         },
         "additional": {
           "type": "object",
@@ -3323,7 +3381,7 @@
         }
       }
     },
-    "protoPortEvent": {
+    "v1PortEvent": {
       "type": "object",
       "properties": {
         "localPort": {
@@ -3356,12 +3414,12 @@
           "type": "string"
         },
         "targetPort": {
-          "$ref": "#/definitions/protoIntOrString"
+          "$ref": "#/definitions/v1IntOrString"
         }
       },
       "description": "PortEvent Event describes each port forwarding event."
     },
-    "protoResourceStatusCheckEvent": {
+    "v1ResourceStatusCheckEvent": {
       "type": "object",
       "properties": {
         "resource": {
@@ -3380,48 +3438,48 @@
           "$ref": "#/definitions/enumsStatusCode"
         },
         "actionableErr": {
-          "$ref": "#/definitions/protoActionableErr"
+          "$ref": "#/definitions/v1ActionableErr"
         }
       },
       "description": "A Resource StatusCheck Event, indicates progress for each kubernetes deployment.\nFor every resource, there will be exactly one event with `status` *Succeeded* or *Failed* event.\nThere can be multiple events with `status` *Pending*.\nSkaffold polls for resource status every 0.5 second. If the resource status changes, an event with `status` “Pending”, “Complete” and “Failed”\nwill be sent with the new status."
     },
-    "protoState": {
+    "v1State": {
       "type": "object",
       "properties": {
         "buildState": {
-          "$ref": "#/definitions/protoBuildState"
+          "$ref": "#/definitions/v1BuildState"
         },
         "deployState": {
-          "$ref": "#/definitions/protoDeployState"
+          "$ref": "#/definitions/v1DeployState"
         },
         "forwardedPorts": {
           "type": "object",
           "additionalProperties": {
-            "$ref": "#/definitions/protoPortEvent"
+            "$ref": "#/definitions/v1PortEvent"
           }
         },
         "statusCheckState": {
-          "$ref": "#/definitions/protoStatusCheckState"
+          "$ref": "#/definitions/v1StatusCheckState"
         },
         "fileSyncState": {
-          "$ref": "#/definitions/protoFileSyncState"
+          "$ref": "#/definitions/v1FileSyncState"
         },
         "debuggingContainers": {
           "type": "array",
           "items": {
-            "$ref": "#/definitions/protoDebuggingContainerEvent"
+            "$ref": "#/definitions/v1DebuggingContainerEvent"
           }
         },
         "metadata": {
-          "$ref": "#/definitions/protoMetadata"
+          "$ref": "#/definitions/v1Metadata"
         },
         "testState": {
-          "$ref": "#/definitions/protoTestState"
+          "$ref": "#/definitions/v1TestState"
         }
       },
       "description": "`State` represents the current state of the Skaffold components"
     },
-    "protoStatusCheckEvent": {
+    "v1StatusCheckEvent": {
       "type": "object",
       "properties": {
         "status": {
@@ -3437,12 +3495,12 @@
           "$ref": "#/definitions/enumsStatusCode"
         },
         "actionableErr": {
-          "$ref": "#/definitions/protoActionableErr"
+          "$ref": "#/definitions/v1ActionableErr"
         }
       },
       "description": "`StatusCheckEvent` describes if the status check for kubernetes rollout has started, is in progress, has succeeded or failed."
     },
-    "protoStatusCheckState": {
+    "v1StatusCheckState": {
       "type": "object",
       "properties": {
         "status": {
@@ -3462,7 +3520,7 @@
       },
       "description": "`StatusCheckState` describes the state of status check of current deployed resources."
     },
-    "protoSuggestion": {
+    "v1Suggestion": {
       "type": "object",
       "properties": {
         "suggestionCode": {
@@ -3474,31 +3532,31 @@
       },
       "description": "Suggestion defines the action a user needs to recover from an error."
     },
-    "protoTerminationEvent": {
+    "v1TerminationEvent": {
       "type": "object",
       "properties": {
         "status": {
           "type": "string"
         },
         "err": {
-          "$ref": "#/definitions/protoActionableErr"
+          "$ref": "#/definitions/v1ActionableErr"
         }
       },
       "description": "`TerminationEvent` marks the end of the skaffold session"
     },
-    "protoTestEvent": {
+    "v1TestEvent": {
       "type": "object",
       "properties": {
         "status": {
           "type": "string"
         },
         "actionableErr": {
-          "$ref": "#/definitions/protoActionableErr"
+          "$ref": "#/definitions/v1ActionableErr"
         }
       },
       "description": "`TestEvent` represents the status of a test, and is emitted by Skaffold\nanytime a test starts or completes, successfully or not."
     },
-    "protoTestMetadata": {
+    "v1TestMetadata": {
       "type": "object",
       "properties": {
         "Testers": {
@@ -3510,7 +3568,7 @@
       },
       "description": "TestMetadata describes the test pipeline"
     },
-    "protoTestState": {
+    "v1TestState": {
       "type": "object",
       "properties": {
         "status": {
@@ -3524,7 +3582,7 @@
       },
       "description": "`TestState` describes the current state of the test"
     },
-    "protoTriggerState": {
+    "v1TriggerState": {
       "type": "object",
       "properties": {
         "enabled": {
@@ -3532,64 +3590,6 @@
         }
       },
       "description": "TriggerState represents trigger state for a given phase."
-    },
-    "protobufAny": {
-      "type": "object",
-      "properties": {
-        "type_url": {
-          "type": "string"
-        },
-        "value": {
-          "type": "string",
-          "format": "byte"
-        }
-      }
-    },
-    "runtimeError": {
-      "type": "object",
-      "properties": {
-        "error": {
-          "type": "string"
-        },
-        "code": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "message": {
-          "type": "string"
-        },
-        "details": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/protobufAny"
-          }
-        }
-      }
-    },
-    "runtimeStreamError": {
-      "type": "object",
-      "properties": {
-        "grpc_code": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "http_code": {
-          "type": "integer",
-          "format": "int32"
-        },
-        "message": {
-          "type": "string"
-        },
-        "http_status": {
-          "type": "string"
-        },
-        "details": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/protobufAny"
-          }
-        }
-      }
     }
   }
 }
diff --git a/docs/content/en/docs/references/api/grpc.md b/docs/content/en/docs/references/api/grpc.md
index d115afab20e..f4994528f3b 100644
--- a/docs/content/en/docs/references/api/grpc.md
+++ b/docs/content/en/docs/references/api/grpc.md
@@ -29,21 +29,21 @@ You can find the source for v1/skaffold.proto [on Github](https://github.com/Goo
 
 ### Services
 
-<a name="proto.SkaffoldService"></a>
+<a name="proto.v1.SkaffoldService"></a>
 
 #### SkaffoldService
 Describes all the methods for the Skaffold API
 
 | Method Name | Request Type | Response Type | Description |
 | ----------- | ------------ | ------------- | ------------|
-| GetState | [.google.protobuf.Empty](#google.protobuf.Empty) | [State](#proto.State) | Returns the state of the current Skaffold execution |
-| EventLog | [LogEntry](#proto.LogEntry) stream | [LogEntry](#proto.LogEntry) stream | DEPRECATED. Events should be used instead. TODO remove (https://github.com/GoogleContainerTools/skaffold/issues/3168) |
-| Events | [.google.protobuf.Empty](#google.protobuf.Empty) | [LogEntry](#proto.LogEntry) stream | Returns all the events of the current Skaffold execution from the start |
-| Execute | [UserIntentRequest](#proto.UserIntentRequest) | [.google.protobuf.Empty](#google.protobuf.Empty) | Allows for a single execution of some or all of the phases (build, sync, deploy) in case autoBuild, autoDeploy or autoSync are disabled. |
-| AutoBuild | [TriggerRequest](#proto.TriggerRequest) | [.google.protobuf.Empty](#google.protobuf.Empty) | Allows for enabling or disabling automatic build trigger |
-| AutoSync | [TriggerRequest](#proto.TriggerRequest) | [.google.protobuf.Empty](#google.protobuf.Empty) | Allows for enabling or disabling automatic sync trigger |
-| AutoDeploy | [TriggerRequest](#proto.TriggerRequest) | [.google.protobuf.Empty](#google.protobuf.Empty) | Allows for enabling or disabling automatic deploy trigger |
-| Handle | [Event](#proto.Event) | [.google.protobuf.Empty](#google.protobuf.Empty) | EXPERIMENTAL. It allows for custom events to be implemented in custom builders for example. |
+| GetState | [.google.protobuf.Empty](#google.protobuf.Empty) | [State](#proto.v1.State) | Returns the state of the current Skaffold execution |
+| EventLog | [LogEntry](#proto.v1.LogEntry) stream | [LogEntry](#proto.v1.LogEntry) stream | DEPRECATED. Events should be used instead. TODO remove (https://github.com/GoogleContainerTools/skaffold/issues/3168) |
+| Events | [.google.protobuf.Empty](#google.protobuf.Empty) | [LogEntry](#proto.v1.LogEntry) stream | Returns all the events of the current Skaffold execution from the start |
+| Execute | [UserIntentRequest](#proto.v1.UserIntentRequest) | [.google.protobuf.Empty](#google.protobuf.Empty) | Allows for a single execution of some or all of the phases (build, sync, deploy) in case autoBuild, autoDeploy or autoSync are disabled. |
+| AutoBuild | [TriggerRequest](#proto.v1.TriggerRequest) | [.google.protobuf.Empty](#google.protobuf.Empty) | Allows for enabling or disabling automatic build trigger |
+| AutoSync | [TriggerRequest](#proto.v1.TriggerRequest) | [.google.protobuf.Empty](#google.protobuf.Empty) | Allows for enabling or disabling automatic sync trigger |
+| AutoDeploy | [TriggerRequest](#proto.v1.TriggerRequest) | [.google.protobuf.Empty](#google.protobuf.Empty) | Allows for enabling or disabling automatic deploy trigger |
+| Handle | [Event](#proto.v1.Event) | [.google.protobuf.Empty](#google.protobuf.Empty) | EXPERIMENTAL. It allows for custom events to be implemented in custom builders for example. |
 
  <!-- end services -->
 
@@ -52,16 +52,16 @@ Describes all the methods for the Skaffold API
 
 
 
-<a name="proto.ActionableErr"></a>
+<a name="proto.v1.ActionableErr"></a>
 #### ActionableErr
 `ActionableErr` defines an error that occurred along with an optional list of suggestions
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| errCode | [enums.StatusCode](#proto.enums.StatusCode) |  | error code representing the error |
+| errCode | [proto.enums.StatusCode](#proto.enums.StatusCode) |  | error code representing the error |
 | message | [string](#string) |  | message describing the error. |
-| suggestions | [Suggestion](#proto.Suggestion) | repeated | list of suggestions |
+| suggestions | [Suggestion](#proto.v1.Suggestion) | repeated | list of suggestions |
 
 
 
@@ -69,7 +69,7 @@ Describes all the methods for the Skaffold API
 
 
 
-<a name="proto.BuildEvent"></a>
+<a name="proto.v1.BuildEvent"></a>
 #### BuildEvent
 `BuildEvent` describes the build status per artifact, and will be emitted by Skaffold anytime a build starts or finishes, successfully or not.
 If the build fails, an error will be attached to the event.
@@ -80,8 +80,8 @@ If the build fails, an error will be attached to the event.
 | artifact | [string](#string) |  | artifact name |
 | status | [string](#string) |  | artifact build status oneof: InProgress, Completed, Failed |
 | err | [string](#string) |  | Deprecated. Use actionableErr.message. error when build status is Failed. |
-| errCode | [enums.StatusCode](#proto.enums.StatusCode) |  | Deprecated. Use actionableErr.errCode. status code representing success or failure |
-| actionableErr | [ActionableErr](#proto.ActionableErr) |  | actionable error message |
+| errCode | [proto.enums.StatusCode](#proto.enums.StatusCode) |  | Deprecated. Use actionableErr.errCode. status code representing success or failure |
+| actionableErr | [ActionableErr](#proto.v1.ActionableErr) |  | actionable error message |
 
 
 
@@ -89,7 +89,7 @@ If the build fails, an error will be attached to the event.
 
 
 
-<a name="proto.BuildMetadata"></a>
+<a name="proto.v1.BuildMetadata"></a>
 #### BuildMetadata
 
 
@@ -97,9 +97,9 @@ If the build fails, an error will be attached to the event.
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | numberOfArtifacts | [int32](#int32) |  |  |
-| builders | [BuildMetadata.ImageBuilder](#proto.BuildMetadata.ImageBuilder) | repeated |  |
-| type | [enums.BuildType](#proto.enums.BuildType) |  |  |
-| additional | [BuildMetadata.AdditionalEntry](#proto.BuildMetadata.AdditionalEntry) | repeated | Additional key value pairs to describe the deploy pipeline |
+| builders | [BuildMetadata.ImageBuilder](#proto.v1.BuildMetadata.ImageBuilder) | repeated |  |
+| type | [proto.enums.BuildType](#proto.enums.BuildType) |  |  |
+| additional | [BuildMetadata.AdditionalEntry](#proto.v1.BuildMetadata.AdditionalEntry) | repeated | Additional key value pairs to describe the deploy pipeline |
 
 
 
@@ -107,7 +107,7 @@ If the build fails, an error will be attached to the event.
 
 
 
-<a name="proto.BuildMetadata.AdditionalEntry"></a>
+<a name="proto.v1.BuildMetadata.AdditionalEntry"></a>
 #### BuildMetadata.AdditionalEntry
 
 
@@ -123,14 +123,14 @@ If the build fails, an error will be attached to the event.
 
 
 
-<a name="proto.BuildMetadata.ImageBuilder"></a>
+<a name="proto.v1.BuildMetadata.ImageBuilder"></a>
 #### BuildMetadata.ImageBuilder
 
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| type | [enums.BuilderType](#proto.enums.BuilderType) |  |  |
+| type | [proto.enums.BuilderType](#proto.enums.BuilderType) |  |  |
 | count | [int32](#int32) |  |  |
 
 
@@ -139,16 +139,16 @@ If the build fails, an error will be attached to the event.
 
 
 
-<a name="proto.BuildState"></a>
+<a name="proto.v1.BuildState"></a>
 #### BuildState
 `BuildState` maps Skaffold artifacts to their current build states
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| artifacts | [BuildState.ArtifactsEntry](#proto.BuildState.ArtifactsEntry) | repeated | A map of `artifact name -> build-state`. Artifact name is defined in the `skaffold.yaml`. The `build-state` can be: <br> - `"Not started"`: not yet started <br> - `"In progress"`: build started <br> - `"Complete"`: build succeeded <br> - `"Failed"`: build failed |
+| artifacts | [BuildState.ArtifactsEntry](#proto.v1.BuildState.ArtifactsEntry) | repeated | A map of `artifact name -> build-state`. Artifact name is defined in the `skaffold.yaml`. The `build-state` can be: <br> - `"Not started"`: not yet started <br> - `"In progress"`: build started <br> - `"Complete"`: build succeeded <br> - `"Failed"`: build failed |
 | autoTrigger | [bool](#bool) |  |  |
-| statusCode | [enums.StatusCode](#proto.enums.StatusCode) |  |  |
+| statusCode | [proto.enums.StatusCode](#proto.enums.StatusCode) |  |  |
 
 
 
@@ -156,7 +156,7 @@ If the build fails, an error will be attached to the event.
 
 
 
-<a name="proto.BuildState.ArtifactsEntry"></a>
+<a name="proto.v1.BuildState.ArtifactsEntry"></a>
 #### BuildState.ArtifactsEntry
 
 
@@ -172,7 +172,7 @@ If the build fails, an error will be attached to the event.
 
 
 
-<a name="proto.DebuggingContainerEvent"></a>
+<a name="proto.v1.DebuggingContainerEvent"></a>
 #### DebuggingContainerEvent
 DebuggingContainerEvent is raised when a debugging container is started or terminated
 
@@ -186,7 +186,7 @@ DebuggingContainerEvent is raised when a debugging container is started or termi
 | artifact | [string](#string) |  | the corresponding artifact's image name |
 | runtime | [string](#string) |  | the detected language runtime |
 | workingDir | [string](#string) |  | the working directory in the container image |
-| debugPorts | [DebuggingContainerEvent.DebugPortsEntry](#proto.DebuggingContainerEvent.DebugPortsEntry) | repeated | the exposed debugging-related ports |
+| debugPorts | [DebuggingContainerEvent.DebugPortsEntry](#proto.v1.DebuggingContainerEvent.DebugPortsEntry) | repeated | the exposed debugging-related ports |
 
 
 
@@ -194,7 +194,7 @@ DebuggingContainerEvent is raised when a debugging container is started or termi
 
 
 
-<a name="proto.DebuggingContainerEvent.DebugPortsEntry"></a>
+<a name="proto.v1.DebuggingContainerEvent.DebugPortsEntry"></a>
 #### DebuggingContainerEvent.DebugPortsEntry
 
 
@@ -210,7 +210,7 @@ DebuggingContainerEvent is raised when a debugging container is started or termi
 
 
 
-<a name="proto.DeployEvent"></a>
+<a name="proto.v1.DeployEvent"></a>
 #### DeployEvent
 `DeployEvent` represents the status of a deployment, and is emitted by Skaffold
 anytime a deployment starts or completes, successfully or not.
@@ -220,8 +220,8 @@ anytime a deployment starts or completes, successfully or not.
 | ----- | ---- | ----- | ----------- |
 | status | [string](#string) |  | deployment status oneof: InProgress, Completed, Failed |
 | err | [string](#string) |  | Deprecated. Use actionableErr.message. error when status is Failed |
-| errCode | [enums.StatusCode](#proto.enums.StatusCode) |  | Deprecated. Use actionableErr.errCode. status code representing success or failure |
-| actionableErr | [ActionableErr](#proto.ActionableErr) |  | actionable error message |
+| errCode | [proto.enums.StatusCode](#proto.enums.StatusCode) |  | Deprecated. Use actionableErr.errCode. status code representing success or failure |
+| actionableErr | [ActionableErr](#proto.v1.ActionableErr) |  | actionable error message |
 
 
 
@@ -229,15 +229,15 @@ anytime a deployment starts or completes, successfully or not.
 
 
 
-<a name="proto.DeployMetadata"></a>
+<a name="proto.v1.DeployMetadata"></a>
 #### DeployMetadata
 
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| deployers | [DeployMetadata.Deployer](#proto.DeployMetadata.Deployer) | repeated |  |
-| cluster | [enums.ClusterType](#proto.enums.ClusterType) |  |  |
+| deployers | [DeployMetadata.Deployer](#proto.v1.DeployMetadata.Deployer) | repeated |  |
+| cluster | [proto.enums.ClusterType](#proto.enums.ClusterType) |  |  |
 
 
 
@@ -245,14 +245,14 @@ anytime a deployment starts or completes, successfully or not.
 
 
 
-<a name="proto.DeployMetadata.Deployer"></a>
+<a name="proto.v1.DeployMetadata.Deployer"></a>
 #### DeployMetadata.Deployer
 
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| type | [enums.DeployerType](#proto.enums.DeployerType) |  |  |
+| type | [proto.enums.DeployerType](#proto.enums.DeployerType) |  |  |
 | count | [int32](#int32) |  |  |
 
 
@@ -261,7 +261,7 @@ anytime a deployment starts or completes, successfully or not.
 
 
 
-<a name="proto.DeployState"></a>
+<a name="proto.v1.DeployState"></a>
 #### DeployState
 `DeployState` describes the status of the current deploy
 
@@ -270,7 +270,7 @@ anytime a deployment starts or completes, successfully or not.
 | ----- | ---- | ----- | ----------- |
 | status | [string](#string) |  |  |
 | autoTrigger | [bool](#bool) |  |  |
-| statusCode | [enums.StatusCode](#proto.enums.StatusCode) |  |  |
+| statusCode | [proto.enums.StatusCode](#proto.enums.StatusCode) |  |  |
 
 
 
@@ -278,7 +278,7 @@ anytime a deployment starts or completes, successfully or not.
 
 
 
-<a name="proto.DevLoopEvent"></a>
+<a name="proto.v1.DevLoopEvent"></a>
 #### DevLoopEvent
 `DevLoopEvent` marks the start and end of a dev loop.
 
@@ -287,7 +287,7 @@ anytime a deployment starts or completes, successfully or not.
 | ----- | ---- | ----- | ----------- |
 | iteration | [int32](#int32) |  | dev loop iteration. 0 represents initialization loop. |
 | status | [string](#string) |  | dev loop status oneof: In Progress, Completed, Failed |
-| err | [ActionableErr](#proto.ActionableErr) |  | actionable error message |
+| err | [ActionableErr](#proto.v1.ActionableErr) |  | actionable error message |
 
 
 
@@ -295,7 +295,7 @@ anytime a deployment starts or completes, successfully or not.
 
 
 
-<a name="proto.Event"></a>
+<a name="proto.v1.Event"></a>
 #### Event
 `Event` describes an event in the Skaffold process.
 It is one of MetaEvent, BuildEvent, TestEvent, DeployEvent, PortEvent, StatusCheckEvent, ResourceStatusCheckEvent, FileSyncEvent, or DebuggingContainerEvent.
@@ -303,17 +303,17 @@ It is one of MetaEvent, BuildEvent, TestEvent, DeployEvent, PortEvent, StatusChe
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| metaEvent | [MetaEvent](#proto.MetaEvent) |  | contains general information regarding Skaffold like version info |
-| buildEvent | [BuildEvent](#proto.BuildEvent) |  | describes if the build status per artifact. Status could be one of "InProgress", "Completed" or "Failed". |
-| deployEvent | [DeployEvent](#proto.DeployEvent) |  | describes if the deployment has started, is in progress or is complete. |
-| portEvent | [PortEvent](#proto.PortEvent) |  | describes each port forwarding event. |
-| statusCheckEvent | [StatusCheckEvent](#proto.StatusCheckEvent) |  | describes if the Status check has started, is in progress, has succeeded or failed. |
-| resourceStatusCheckEvent | [ResourceStatusCheckEvent](#proto.ResourceStatusCheckEvent) |  | indicates progress for each kubernetes deployment. |
-| fileSyncEvent | [FileSyncEvent](#proto.FileSyncEvent) |  | describes the sync status. |
-| debuggingContainerEvent | [DebuggingContainerEvent](#proto.DebuggingContainerEvent) |  | describes the appearance or disappearance of a debugging container |
-| devLoopEvent | [DevLoopEvent](#proto.DevLoopEvent) |  | describes a start and end of a dev loop. |
-| terminationEvent | [TerminationEvent](#proto.TerminationEvent) |  | describes a skaffold termination event |
-| TestEvent | [TestEvent](#proto.TestEvent) |  | describes if the test has started, is in progress or is complete. |
+| metaEvent | [MetaEvent](#proto.v1.MetaEvent) |  | contains general information regarding Skaffold like version info |
+| buildEvent | [BuildEvent](#proto.v1.BuildEvent) |  | describes if the build status per artifact. Status could be one of "InProgress", "Completed" or "Failed". |
+| deployEvent | [DeployEvent](#proto.v1.DeployEvent) |  | describes if the deployment has started, is in progress or is complete. |
+| portEvent | [PortEvent](#proto.v1.PortEvent) |  | describes each port forwarding event. |
+| statusCheckEvent | [StatusCheckEvent](#proto.v1.StatusCheckEvent) |  | describes if the Status check has started, is in progress, has succeeded or failed. |
+| resourceStatusCheckEvent | [ResourceStatusCheckEvent](#proto.v1.ResourceStatusCheckEvent) |  | indicates progress for each kubernetes deployment. |
+| fileSyncEvent | [FileSyncEvent](#proto.v1.FileSyncEvent) |  | describes the sync status. |
+| debuggingContainerEvent | [DebuggingContainerEvent](#proto.v1.DebuggingContainerEvent) |  | describes the appearance or disappearance of a debugging container |
+| devLoopEvent | [DevLoopEvent](#proto.v1.DevLoopEvent) |  | describes a start and end of a dev loop. |
+| terminationEvent | [TerminationEvent](#proto.v1.TerminationEvent) |  | describes a skaffold termination event |
+| TestEvent | [TestEvent](#proto.v1.TestEvent) |  | describes if the test has started, is in progress or is complete. |
 
 
 
@@ -321,7 +321,7 @@ It is one of MetaEvent, BuildEvent, TestEvent, DeployEvent, PortEvent, StatusChe
 
 
 
-<a name="proto.FileSyncEvent"></a>
+<a name="proto.v1.FileSyncEvent"></a>
 #### FileSyncEvent
 FileSyncEvent describes the sync status.
 
@@ -332,8 +332,8 @@ FileSyncEvent describes the sync status.
 | image | [string](#string) |  | the container image to which files are sycned. |
 | status | [string](#string) |  | status of file sync. one of: Not Started, In progress, Succeeded, Failed. |
 | err | [string](#string) |  | Deprecated. Use actionableErr.message. error in case of status failed. |
-| errCode | [enums.StatusCode](#proto.enums.StatusCode) |  | Deprecated. Use actionableErr.errCode. status code representing success or failure |
-| actionableErr | [ActionableErr](#proto.ActionableErr) |  | actionable error message |
+| errCode | [proto.enums.StatusCode](#proto.enums.StatusCode) |  | Deprecated. Use actionableErr.errCode. status code representing success or failure |
+| actionableErr | [ActionableErr](#proto.v1.ActionableErr) |  | actionable error message |
 
 
 
@@ -341,7 +341,7 @@ FileSyncEvent describes the sync status.
 
 
 
-<a name="proto.FileSyncState"></a>
+<a name="proto.v1.FileSyncState"></a>
 #### FileSyncState
 `FileSyncState` contains the status of the current file sync
 
@@ -357,7 +357,7 @@ FileSyncEvent describes the sync status.
 
 
 
-<a name="proto.IntOrString"></a>
+<a name="proto.v1.IntOrString"></a>
 #### IntOrString
 IntOrString is a type that can hold an int32 or a string.
 
@@ -374,7 +374,7 @@ IntOrString is a type that can hold an int32 or a string.
 
 
 
-<a name="proto.Intent"></a>
+<a name="proto.v1.Intent"></a>
 #### Intent
 Intent represents user intents for a given phase.
 
@@ -391,7 +391,7 @@ Intent represents user intents for a given phase.
 
 
 
-<a name="proto.LogEntry"></a>
+<a name="proto.v1.LogEntry"></a>
 #### LogEntry
 LogEntry describes an event and a string description of the event.
 
@@ -399,7 +399,7 @@ LogEntry describes an event and a string description of the event.
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | timestamp | [google.protobuf.Timestamp](#google.protobuf.Timestamp) |  | timestamp of the event. |
-| event | [Event](#proto.Event) |  | the actual event that is one of |
+| event | [Event](#proto.v1.Event) |  | the actual event that is one of |
 | entry | [string](#string) |  | description of the event. |
 
 
@@ -408,7 +408,7 @@ LogEntry describes an event and a string description of the event.
 
 
 
-<a name="proto.MetaEvent"></a>
+<a name="proto.v1.MetaEvent"></a>
 #### MetaEvent
 `MetaEvent` provides general information regarding Skaffold
 
@@ -416,7 +416,7 @@ LogEntry describes an event and a string description of the event.
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | entry | [string](#string) |  | entry, for example: `"Starting Skaffold: {Version:v0.39.0-16-g5bb7c9e0 ConfigVersion:skaffold/v1 GitVersion: GitCommit:5bb7c9e078e4d522a5ffc42a2f1274fd17d75902 GitTreeState:dirty BuildDate01:29Z GoVersion:go1.13rc1 Compiler:gc Platform:linux/amd64}"` |
-| metadata | [Metadata](#proto.Metadata) |  | Metadata describing skaffold pipeline |
+| metadata | [Metadata](#proto.v1.Metadata) |  | Metadata describing skaffold pipeline |
 
 
 
@@ -424,17 +424,17 @@ LogEntry describes an event and a string description of the event.
 
 
 
-<a name="proto.Metadata"></a>
+<a name="proto.v1.Metadata"></a>
 #### Metadata
 
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| build | [BuildMetadata](#proto.BuildMetadata) |  |  |
-| deploy | [DeployMetadata](#proto.DeployMetadata) |  |  |
-| test | [TestMetadata](#proto.TestMetadata) |  |  |
-| additional | [Metadata.AdditionalEntry](#proto.Metadata.AdditionalEntry) | repeated | Additional key value pairs to describe the build pipeline |
+| build | [BuildMetadata](#proto.v1.BuildMetadata) |  |  |
+| deploy | [DeployMetadata](#proto.v1.DeployMetadata) |  |  |
+| test | [TestMetadata](#proto.v1.TestMetadata) |  |  |
+| additional | [Metadata.AdditionalEntry](#proto.v1.Metadata.AdditionalEntry) | repeated | Additional key value pairs to describe the build pipeline |
 
 
 
@@ -442,7 +442,7 @@ LogEntry describes an event and a string description of the event.
 
 
 
-<a name="proto.Metadata.AdditionalEntry"></a>
+<a name="proto.v1.Metadata.AdditionalEntry"></a>
 #### Metadata.AdditionalEntry
 
 
@@ -458,7 +458,7 @@ LogEntry describes an event and a string description of the event.
 
 
 
-<a name="proto.PortEvent"></a>
+<a name="proto.v1.PortEvent"></a>
 #### PortEvent
 PortEvent Event describes each port forwarding event.
 
@@ -474,7 +474,7 @@ PortEvent Event describes each port forwarding event.
 | resourceType | [string](#string) |  | resource type e.g. "pod", "service". |
 | resourceName | [string](#string) |  | name of the resource to forward. |
 | address | [string](#string) |  | address on which to bind |
-| targetPort | [IntOrString](#proto.IntOrString) |  | target port is the resource port that will be forwarded. |
+| targetPort | [IntOrString](#proto.v1.IntOrString) |  | target port is the resource port that will be forwarded. |
 
 
 
@@ -482,7 +482,7 @@ PortEvent Event describes each port forwarding event.
 
 
 
-<a name="proto.Request"></a>
+<a name="proto.v1.Request"></a>
 #### Request
 
 
@@ -497,7 +497,7 @@ PortEvent Event describes each port forwarding event.
 
 
 
-<a name="proto.ResourceStatusCheckEvent"></a>
+<a name="proto.v1.ResourceStatusCheckEvent"></a>
 #### ResourceStatusCheckEvent
 A Resource StatusCheck Event, indicates progress for each kubernetes deployment.
 For every resource, there will be exactly one event with `status` *Succeeded* or *Failed* event.
@@ -512,8 +512,8 @@ will be sent with the new status.
 | status | [string](#string) |  |  |
 | message | [string](#string) |  |  |
 | err | [string](#string) |  | Deprecated. Use actionableErr.message. |
-| statusCode | [enums.StatusCode](#proto.enums.StatusCode) |  |  |
-| actionableErr | [ActionableErr](#proto.ActionableErr) |  | actionable error message |
+| statusCode | [proto.enums.StatusCode](#proto.enums.StatusCode) |  |  |
+| actionableErr | [ActionableErr](#proto.v1.ActionableErr) |  | actionable error message |
 
 
 
@@ -521,7 +521,7 @@ will be sent with the new status.
 
 
 
-<a name="proto.Response"></a>
+<a name="proto.v1.Response"></a>
 #### Response
 
 
@@ -536,21 +536,21 @@ will be sent with the new status.
 
 
 
-<a name="proto.State"></a>
+<a name="proto.v1.State"></a>
 #### State
 `State` represents the current state of the Skaffold components
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| buildState | [BuildState](#proto.BuildState) |  |  |
-| deployState | [DeployState](#proto.DeployState) |  |  |
-| forwardedPorts | [State.ForwardedPortsEntry](#proto.State.ForwardedPortsEntry) | repeated |  |
-| statusCheckState | [StatusCheckState](#proto.StatusCheckState) |  |  |
-| fileSyncState | [FileSyncState](#proto.FileSyncState) |  |  |
-| debuggingContainers | [DebuggingContainerEvent](#proto.DebuggingContainerEvent) | repeated |  |
-| metadata | [Metadata](#proto.Metadata) |  |  |
-| testState | [TestState](#proto.TestState) |  |  |
+| buildState | [BuildState](#proto.v1.BuildState) |  |  |
+| deployState | [DeployState](#proto.v1.DeployState) |  |  |
+| forwardedPorts | [State.ForwardedPortsEntry](#proto.v1.State.ForwardedPortsEntry) | repeated |  |
+| statusCheckState | [StatusCheckState](#proto.v1.StatusCheckState) |  |  |
+| fileSyncState | [FileSyncState](#proto.v1.FileSyncState) |  |  |
+| debuggingContainers | [DebuggingContainerEvent](#proto.v1.DebuggingContainerEvent) | repeated |  |
+| metadata | [Metadata](#proto.v1.Metadata) |  |  |
+| testState | [TestState](#proto.v1.TestState) |  |  |
 
 
 
@@ -558,7 +558,7 @@ will be sent with the new status.
 
 
 
-<a name="proto.State.ForwardedPortsEntry"></a>
+<a name="proto.v1.State.ForwardedPortsEntry"></a>
 #### State.ForwardedPortsEntry
 
 
@@ -566,7 +566,7 @@ will be sent with the new status.
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | key | [int32](#int32) |  |  |
-| value | [PortEvent](#proto.PortEvent) |  |  |
+| value | [PortEvent](#proto.v1.PortEvent) |  |  |
 
 
 
@@ -574,14 +574,14 @@ will be sent with the new status.
 
 
 
-<a name="proto.StateResponse"></a>
+<a name="proto.v1.StateResponse"></a>
 #### StateResponse
 
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| state | [State](#proto.State) |  |  |
+| state | [State](#proto.v1.State) |  |  |
 
 
 
@@ -589,7 +589,7 @@ will be sent with the new status.
 
 
 
-<a name="proto.StatusCheckEvent"></a>
+<a name="proto.v1.StatusCheckEvent"></a>
 #### StatusCheckEvent
 `StatusCheckEvent` describes if the status check for kubernetes rollout has started, is in progress, has succeeded or failed.
 
@@ -599,8 +599,8 @@ will be sent with the new status.
 | status | [string](#string) |  |  |
 | message | [string](#string) |  |  |
 | err | [string](#string) |  | Deprecated. Use actionableErr.message. |
-| errCode | [enums.StatusCode](#proto.enums.StatusCode) |  | Deprecated. Use actionableErr.errCode. status code representing success or failure |
-| actionableErr | [ActionableErr](#proto.ActionableErr) |  | actionable error message |
+| errCode | [proto.enums.StatusCode](#proto.enums.StatusCode) |  | Deprecated. Use actionableErr.errCode. status code representing success or failure |
+| actionableErr | [ActionableErr](#proto.v1.ActionableErr) |  | actionable error message |
 
 
 
@@ -608,7 +608,7 @@ will be sent with the new status.
 
 
 
-<a name="proto.StatusCheckState"></a>
+<a name="proto.v1.StatusCheckState"></a>
 #### StatusCheckState
 `StatusCheckState` describes the state of status check of current deployed resources.
 
@@ -616,8 +616,8 @@ will be sent with the new status.
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | status | [string](#string) |  |  |
-| resources | [StatusCheckState.ResourcesEntry](#proto.StatusCheckState.ResourcesEntry) | repeated | A map of `resource name -> status-check-state`. Where `resource-name` is the kubernetes resource name. The `status-check-state` can be <br> - `"Not started"`: indicates that `status-check` has just started. <br> - `"In progress"`: InProgress is sent after every resource check is complete. <br> - `"Succeeded"`: - `"Failed"`: |
-| statusCode | [enums.StatusCode](#proto.enums.StatusCode) |  | StatusCheck statusCode |
+| resources | [StatusCheckState.ResourcesEntry](#proto.v1.StatusCheckState.ResourcesEntry) | repeated | A map of `resource name -> status-check-state`. Where `resource-name` is the kubernetes resource name. The `status-check-state` can be <br> - `"Not started"`: indicates that `status-check` has just started. <br> - `"In progress"`: InProgress is sent after every resource check is complete. <br> - `"Succeeded"`: - `"Failed"`: |
+| statusCode | [proto.enums.StatusCode](#proto.enums.StatusCode) |  | StatusCheck statusCode |
 
 
 
@@ -625,7 +625,7 @@ will be sent with the new status.
 
 
 
-<a name="proto.StatusCheckState.ResourcesEntry"></a>
+<a name="proto.v1.StatusCheckState.ResourcesEntry"></a>
 #### StatusCheckState.ResourcesEntry
 
 
@@ -641,14 +641,14 @@ will be sent with the new status.
 
 
 
-<a name="proto.Suggestion"></a>
+<a name="proto.v1.Suggestion"></a>
 #### Suggestion
 Suggestion defines the action a user needs to recover from an error.
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| suggestionCode | [enums.SuggestionCode](#proto.enums.SuggestionCode) |  | code representing a suggestion |
+| suggestionCode | [proto.enums.SuggestionCode](#proto.enums.SuggestionCode) |  | code representing a suggestion |
 | action | [string](#string) |  | action represents the suggestion action |
 
 
@@ -657,7 +657,7 @@ Suggestion defines the action a user needs to recover from an error.
 
 
 
-<a name="proto.TerminationEvent"></a>
+<a name="proto.v1.TerminationEvent"></a>
 #### TerminationEvent
 `TerminationEvent` marks the end of the skaffold session
 
@@ -665,7 +665,7 @@ Suggestion defines the action a user needs to recover from an error.
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | status | [string](#string) |  | status oneof: Completed or Failed |
-| err | [ActionableErr](#proto.ActionableErr) |  | actionable error message |
+| err | [ActionableErr](#proto.v1.ActionableErr) |  | actionable error message |
 
 
 
@@ -673,7 +673,7 @@ Suggestion defines the action a user needs to recover from an error.
 
 
 
-<a name="proto.TestEvent"></a>
+<a name="proto.v1.TestEvent"></a>
 #### TestEvent
 `TestEvent` represents the status of a test, and is emitted by Skaffold
 anytime a test starts or completes, successfully or not.
@@ -682,7 +682,7 @@ anytime a test starts or completes, successfully or not.
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | status | [string](#string) |  | test status oneof: InProgress, Completed, Failed |
-| actionableErr | [ActionableErr](#proto.ActionableErr) |  | actionable error message |
+| actionableErr | [ActionableErr](#proto.v1.ActionableErr) |  | actionable error message |
 
 
 
@@ -690,14 +690,14 @@ anytime a test starts or completes, successfully or not.
 
 
 
-<a name="proto.TestMetadata"></a>
+<a name="proto.v1.TestMetadata"></a>
 #### TestMetadata
 TestMetadata describes the test pipeline
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| Testers | [TestMetadata.Tester](#proto.TestMetadata.Tester) | repeated |  |
+| Testers | [TestMetadata.Tester](#proto.v1.TestMetadata.Tester) | repeated |  |
 
 
 
@@ -705,14 +705,14 @@ TestMetadata describes the test pipeline
 
 
 
-<a name="proto.TestMetadata.Tester"></a>
+<a name="proto.v1.TestMetadata.Tester"></a>
 #### TestMetadata.Tester
 
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| type | [enums.TesterType](#proto.enums.TesterType) |  |  |
+| type | [proto.enums.TesterType](#proto.enums.TesterType) |  |  |
 | count | [int32](#int32) |  |  |
 
 
@@ -721,7 +721,7 @@ TestMetadata describes the test pipeline
 
 
 
-<a name="proto.TestState"></a>
+<a name="proto.v1.TestState"></a>
 #### TestState
 `TestState` describes the current state of the test
 
@@ -729,7 +729,7 @@ TestMetadata describes the test pipeline
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | status | [string](#string) |  | Status of the current test |
-| statusCode | [enums.StatusCode](#proto.enums.StatusCode) |  | Teststate status code |
+| statusCode | [proto.enums.StatusCode](#proto.enums.StatusCode) |  | Teststate status code |
 
 
 
@@ -737,14 +737,14 @@ TestMetadata describes the test pipeline
 
 
 
-<a name="proto.TriggerRequest"></a>
+<a name="proto.v1.TriggerRequest"></a>
 #### TriggerRequest
 
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| state | [TriggerState](#proto.TriggerState) |  |  |
+| state | [TriggerState](#proto.v1.TriggerState) |  |  |
 
 
 
@@ -752,7 +752,7 @@ TestMetadata describes the test pipeline
 
 
 
-<a name="proto.TriggerState"></a>
+<a name="proto.v1.TriggerState"></a>
 #### TriggerState
 TriggerState represents trigger state for a given phase.
 
@@ -767,14 +767,14 @@ TriggerState represents trigger state for a given phase.
 
 
 
-<a name="proto.UserIntentRequest"></a>
+<a name="proto.v1.UserIntentRequest"></a>
 #### UserIntentRequest
 
 
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| intent | [Intent](#proto.Intent) |  |  |
+| intent | [Intent](#proto.v1.Intent) |  |  |
 
 
 
diff --git a/hack/generate-proto.sh b/hack/generate-proto.sh
index 7b9cd56792b..f8b23775495 100755
--- a/hack/generate-proto.sh
+++ b/hack/generate-proto.sh
@@ -20,8 +20,10 @@ docker build -t gen-proto -f hack/proto/Dockerfile --target generate-files proto
 docker run --rm gen-proto cat enums/github.com/GoogleContainerTools/skaffold/proto/enums/enums.pb.go > proto/enums/enums.pb.go
 
 # Copy v1 files
-docker run --rm gen-proto cat v1/skaffold.pb.go > proto/v1/skaffold.pb.go
-docker run --rm gen-proto cat v1/skaffold.pb.gw.go > proto/v1/skaffold.pb.gw.go
+#docker run --rm gen-proto cat v1/skaffold.pb.go > proto/v1/skaffold.pb.go
+#docker run --rm gen-proto cat v1/skaffold.pb.gw.go > proto/v1/skaffold.pb.gw.go
+docker run --rm gen-proto cat /proto/github.com/GoogleContainerTools/skaffold/proto/v1/skaffold.pb.go > proto/v1/skaffold.pb.go
+docker run --rm gen-proto cat /proto/github.com/GoogleContainerTools/skaffold/proto/v1/skaffold.pb.gw.go > proto/v1/skaffold.pb.gw.go
 
 # Copy v2 files
 docker run --rm gen-proto cat /proto/github.com/GoogleContainerTools/skaffold/proto/v2/skaffold.pb.go > proto/v2/skaffold.pb.go
diff --git a/integration/cache_test.go b/integration/cache_test.go
index c050028871b..539a2cda8f5 100644
--- a/integration/cache_test.go
+++ b/integration/cache_test.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 func TestCacheAPITriggers(t *testing.T) {
diff --git a/integration/debug_test.go b/integration/debug_test.go
index cc61fbe07c2..417338d3ca4 100644
--- a/integration/debug_test.go
+++ b/integration/debug_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
 	debugannotations "github.com/GoogleContainerTools/skaffold/pkg/skaffold/debug/annotations"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/integration/dev_test.go b/integration/dev_test.go
index b26f6981faa..a5567001e73 100644
--- a/integration/dev_test.go
+++ b/integration/dev_test.go
@@ -36,7 +36,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/integration/rpc_test.go b/integration/rpc_test.go
index b0220d5f1ff..e9ad597e1fb 100644
--- a/integration/rpc_test.go
+++ b/integration/rpc_test.go
@@ -34,7 +34,7 @@ import (
 
 	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/event"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/integration/sync_test.go b/integration/sync_test.go
index f6a462709a6..1951200b705 100644
--- a/integration/sync_test.go
+++ b/integration/sync_test.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 func TestDevSync(t *testing.T) {
diff --git a/integration/test_events_test.go b/integration/test_events_test.go
index 6c5377e5b2f..6ccab0dc432 100644
--- a/integration/test_events_test.go
+++ b/integration/test_events_test.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	"github.com/GoogleContainerTools/skaffold/integration/skaffold"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 func TestTestEvents(t *testing.T) {
diff --git a/pkg/diag/recommender/container_errors.go b/pkg/diag/recommender/container_errors.go
index b7bfd050af8..7d58884f3a5 100644
--- a/pkg/diag/recommender/container_errors.go
+++ b/pkg/diag/recommender/container_errors.go
@@ -17,7 +17,7 @@ limitations under the License.
 package recommender
 
 import (
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 type ContainerError struct {
diff --git a/pkg/diag/validator/pod.go b/pkg/diag/validator/pod.go
index 0f2644e38bb..18a77bfb5ab 100644
--- a/pkg/diag/validator/pod.go
+++ b/pkg/diag/validator/pod.go
@@ -31,7 +31,7 @@ import (
 	corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
 
 	"github.com/GoogleContainerTools/skaffold/pkg/diag/recommender"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 const (
diff --git a/pkg/diag/validator/pod_test.go b/pkg/diag/validator/pod_test.go
index ba15af272e4..3212ac15b2b 100644
--- a/pkg/diag/validator/pod_test.go
+++ b/pkg/diag/validator/pod_test.go
@@ -31,7 +31,7 @@ import (
 	fakekubeclientset "k8s.io/client-go/kubernetes/fake"
 
 	"github.com/GoogleContainerTools/skaffold/pkg/diag/recommender"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/diag/validator/recommender.go b/pkg/diag/validator/recommender.go
index e2fcd2d1c25..3ca9423de13 100644
--- a/pkg/diag/validator/recommender.go
+++ b/pkg/diag/validator/recommender.go
@@ -17,7 +17,7 @@ limitations under the License.
 package validator
 
 import (
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 // Recommender makes recommendations based on err in the actionable error
diff --git a/pkg/diag/validator/resource.go b/pkg/diag/validator/resource.go
index 0d6ab809d87..e5a13269352 100644
--- a/pkg/diag/validator/resource.go
+++ b/pkg/diag/validator/resource.go
@@ -22,7 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 type Resource struct {
diff --git a/pkg/diag/validator/resource_test.go b/pkg/diag/validator/resource_test.go
index 523fe7c9665..6572e2696cd 100644
--- a/pkg/diag/validator/resource_test.go
+++ b/pkg/diag/validator/resource_test.go
@@ -23,7 +23,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/build/build_problems.go b/pkg/skaffold/build/build_problems.go
index 465b0cc1828..1d9fa1aec06 100644
--- a/pkg/skaffold/build/build_problems.go
+++ b/pkg/skaffold/build/build_problems.go
@@ -25,7 +25,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 const (
diff --git a/pkg/skaffold/build/build_problems_test.go b/pkg/skaffold/build/build_problems_test.go
index 9d6fd724c35..bbb5d3f0324 100644
--- a/pkg/skaffold/build/build_problems_test.go
+++ b/pkg/skaffold/build/build_problems_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/build/cache/lookup_test.go b/pkg/skaffold/build/cache/lookup_test.go
index 2b6c80c1f7e..24d1f30c7fe 100644
--- a/pkg/skaffold/build/cache/lookup_test.go
+++ b/pkg/skaffold/build/cache/lookup_test.go
@@ -30,7 +30,7 @@ import (
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/build/docker/docker_test.go b/pkg/skaffold/build/docker/docker_test.go
index 26acc12e969..14d6c094a11 100644
--- a/pkg/skaffold/build/docker/docker_test.go
+++ b/pkg/skaffold/build/docker/docker_test.go
@@ -31,7 +31,7 @@ import (
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/build/docker/errors.go b/pkg/skaffold/build/docker/errors.go
index 28305aaa106..07f7dc9986d 100644
--- a/pkg/skaffold/build/docker/errors.go
+++ b/pkg/skaffold/build/docker/errors.go
@@ -27,7 +27,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 var (
diff --git a/pkg/skaffold/build/jib/errors.go b/pkg/skaffold/build/jib/errors.go
index e9522498b60..849bfc958a7 100644
--- a/pkg/skaffold/build/jib/errors.go
+++ b/pkg/skaffold/build/jib/errors.go
@@ -22,7 +22,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 func unknownPluginType(ws string) error {
diff --git a/pkg/skaffold/deploy/deploy_problems.go b/pkg/skaffold/deploy/deploy_problems.go
index d2a9c19d53a..2d3c21e0698 100644
--- a/pkg/skaffold/deploy/deploy_problems.go
+++ b/pkg/skaffold/deploy/deploy_problems.go
@@ -24,7 +24,7 @@ import (
 	deployerr "github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/error"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/types"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 var (
diff --git a/pkg/skaffold/deploy/deploy_problems_test.go b/pkg/skaffold/deploy/deploy_problems_test.go
index b43d58f5b64..f1bc6594f60 100644
--- a/pkg/skaffold/deploy/deploy_problems_test.go
+++ b/pkg/skaffold/deploy/deploy_problems_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/deploy/error/errors.go b/pkg/skaffold/deploy/error/errors.go
index 16493c2de77..adb1c120393 100644
--- a/pkg/skaffold/deploy/error/errors.go
+++ b/pkg/skaffold/deploy/error/errors.go
@@ -24,7 +24,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/types"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 const (
diff --git a/pkg/skaffold/deploy/error/errors_test.go b/pkg/skaffold/deploy/error/errors_test.go
index 662e6c580ae..b2922b0dfcd 100644
--- a/pkg/skaffold/deploy/error/errors_test.go
+++ b/pkg/skaffold/deploy/error/errors_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/deploy/helm/errors.go b/pkg/skaffold/deploy/helm/errors.go
index 7d63cd93e93..bfbb5d408cf 100644
--- a/pkg/skaffold/deploy/helm/errors.go
+++ b/pkg/skaffold/deploy/helm/errors.go
@@ -23,7 +23,7 @@ import (
 
 	deployerr "github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/error"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 const (
diff --git a/pkg/skaffold/deploy/kubectl/errors.go b/pkg/skaffold/deploy/kubectl/errors.go
index 1a9450bc94d..cdec8ed42da 100644
--- a/pkg/skaffold/deploy/kubectl/errors.go
+++ b/pkg/skaffold/deploy/kubectl/errors.go
@@ -21,7 +21,7 @@ import (
 
 	deployerr "github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/error"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 const (
diff --git a/pkg/skaffold/deploy/kustomize/errors.go b/pkg/skaffold/deploy/kustomize/errors.go
index 1abd9227a86..1653906b854 100644
--- a/pkg/skaffold/deploy/kustomize/errors.go
+++ b/pkg/skaffold/deploy/kustomize/errors.go
@@ -18,7 +18,7 @@ package kustomize
 
 import (
 	deployerr "github.com/GoogleContainerTools/skaffold/pkg/skaffold/deploy/error"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 func userErr(err error) error {
diff --git a/pkg/skaffold/deploy/resource/deployment.go b/pkg/skaffold/deploy/resource/deployment.go
index d571df7e70e..e7aebda1be7 100644
--- a/pkg/skaffold/deploy/resource/deployment.go
+++ b/pkg/skaffold/deploy/resource/deployment.go
@@ -30,7 +30,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/event"
 	eventV2 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/event/v2"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubectl"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 const (
diff --git a/pkg/skaffold/deploy/resource/deployment_test.go b/pkg/skaffold/deploy/resource/deployment_test.go
index 03e112c2f16..0779c55d820 100644
--- a/pkg/skaffold/deploy/resource/deployment_test.go
+++ b/pkg/skaffold/deploy/resource/deployment_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/diag/validator"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/deploy/resource/status.go b/pkg/skaffold/deploy/resource/status.go
index ed488468c46..3d3e3d7c081 100644
--- a/pkg/skaffold/deploy/resource/status.go
+++ b/pkg/skaffold/deploy/resource/status.go
@@ -19,7 +19,7 @@ package resource
 import (
 	"fmt"
 
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 type Status struct {
diff --git a/pkg/skaffold/deploy/resource/status_test.go b/pkg/skaffold/deploy/resource/status_test.go
index 7ae20b10940..8d8d62e75d0 100644
--- a/pkg/skaffold/deploy/resource/status_test.go
+++ b/pkg/skaffold/deploy/resource/status_test.go
@@ -19,7 +19,7 @@ package resource
 import (
 	"testing"
 
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/docker/errors.go b/pkg/skaffold/docker/errors.go
index b7f75e33637..78d3c7806bc 100644
--- a/pkg/skaffold/docker/errors.go
+++ b/pkg/skaffold/docker/errors.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 func remoteDigestGetErr(err error) error {
diff --git a/pkg/skaffold/docker/image_test.go b/pkg/skaffold/docker/image_test.go
index 36b07512435..736c0801485 100644
--- a/pkg/skaffold/docker/image_test.go
+++ b/pkg/skaffold/docker/image_test.go
@@ -30,7 +30,7 @@ import (
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/docker/parse.go b/pkg/skaffold/docker/parse.go
index c883e29c487..da70fdb1310 100644
--- a/pkg/skaffold/docker/parse.go
+++ b/pkg/skaffold/docker/parse.go
@@ -39,7 +39,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 type from struct {
diff --git a/pkg/skaffold/errors/err_def.go b/pkg/skaffold/errors/err_def.go
index da8592e5f3d..3c489be31e0 100644
--- a/pkg/skaffold/errors/err_def.go
+++ b/pkg/skaffold/errors/err_def.go
@@ -19,7 +19,7 @@ package errors
 import (
 	"fmt"
 
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 type Error interface {
diff --git a/pkg/skaffold/errors/errors.go b/pkg/skaffold/errors/errors.go
index 6cc8a82892d..e4008d03afb 100644
--- a/pkg/skaffold/errors/errors.go
+++ b/pkg/skaffold/errors/errors.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/instrumentation"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	protoV2 "github.com/GoogleContainerTools/skaffold/proto/v2"
 )
 
diff --git a/pkg/skaffold/errors/errors_test.go b/pkg/skaffold/errors/errors_test.go
index da21b0308b6..63d0dde4c6e 100644
--- a/pkg/skaffold/errors/errors_test.go
+++ b/pkg/skaffold/errors/errors_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/errors/problem.go b/pkg/skaffold/errors/problem.go
index 3136ec66620..b64a3632d82 100644
--- a/pkg/skaffold/errors/problem.go
+++ b/pkg/skaffold/errors/problem.go
@@ -23,7 +23,7 @@ import (
 	"sync"
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 var (
diff --git a/pkg/skaffold/event/event.go b/pkg/skaffold/event/event.go
index e7bf7c941e3..c8923a7f6d7 100644
--- a/pkg/skaffold/event/event.go
+++ b/pkg/skaffold/event/event.go
@@ -33,7 +33,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/instrumentation"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/version"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 const (
diff --git a/pkg/skaffold/event/event_test.go b/pkg/skaffold/event/event_test.go
index 7ee55bcc4e1..dd7767efd36 100644
--- a/pkg/skaffold/event/event_test.go
+++ b/pkg/skaffold/event/event_test.go
@@ -34,7 +34,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	schemautil "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/event/util.go b/pkg/skaffold/event/util.go
index d88237767cc..35a11961b13 100644
--- a/pkg/skaffold/event/util.go
+++ b/pkg/skaffold/event/util.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 func initializeMetadata(pipelines []latestV1.Pipeline, kubeContext string) *proto.Metadata {
diff --git a/pkg/skaffold/event/util_test.go b/pkg/skaffold/event/util_test.go
index 6d3263e5f61..5ce335943f3 100644
--- a/pkg/skaffold/event/util_test.go
+++ b/pkg/skaffold/event/util_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/initializer/init_problems.go b/pkg/skaffold/initializer/init_problems.go
index cc01d9d9bb9..c809e68a083 100644
--- a/pkg/skaffold/initializer/init_problems.go
+++ b/pkg/skaffold/initializer/init_problems.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 var (
diff --git a/pkg/skaffold/initializer/init_problems_test.go b/pkg/skaffold/initializer/init_problems_test.go
index d6e03af264a..a19e1fbdb1e 100644
--- a/pkg/skaffold/initializer/init_problems_test.go
+++ b/pkg/skaffold/initializer/init_problems_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/inspect/buildEnv/modify_gcb_test.go b/pkg/skaffold/inspect/buildEnv/modify_gcb_test.go
index 4032f90d3cd..5473614ca39 100644
--- a/pkg/skaffold/inspect/buildEnv/modify_gcb_test.go
+++ b/pkg/skaffold/inspect/buildEnv/modify_gcb_test.go
@@ -27,7 +27,7 @@ import (
 	v1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/yaml"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/inspect/errors.go b/pkg/skaffold/inspect/errors.go
index 12b101309b8..892767c6301 100644
--- a/pkg/skaffold/inspect/errors.go
+++ b/pkg/skaffold/inspect/errors.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 // BuildEnvAlreadyExists specifies that there's an existing build environment definition for the same type.
diff --git a/pkg/skaffold/inspect/output.go b/pkg/skaffold/inspect/output.go
index 1609d1f5aeb..bb5e7757b94 100644
--- a/pkg/skaffold/inspect/output.go
+++ b/pkg/skaffold/inspect/output.go
@@ -22,7 +22,7 @@ import (
 	"io"
 
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 type Formatter interface {
diff --git a/pkg/skaffold/instrumentation/export.go b/pkg/skaffold/instrumentation/export.go
index 433ccf7e59a..624d7a42a65 100644
--- a/pkg/skaffold/instrumentation/export.go
+++ b/pkg/skaffold/instrumentation/export.go
@@ -48,7 +48,7 @@ import (
 
 	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd/statik"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 func ExportMetrics(exitCode int) error {
diff --git a/pkg/skaffold/instrumentation/export_test.go b/pkg/skaffold/instrumentation/export_test.go
index 264b51d04b9..7df55d2a87a 100644
--- a/pkg/skaffold/instrumentation/export_test.go
+++ b/pkg/skaffold/instrumentation/export_test.go
@@ -31,7 +31,7 @@ import (
 	"go.opentelemetry.io/otel/sdk/metric/controller/basic"
 
 	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd/statik"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/instrumentation/meter.go b/pkg/skaffold/instrumentation/meter.go
index 946de67f9ca..bd3e6ad6c38 100644
--- a/pkg/skaffold/instrumentation/meter.go
+++ b/pkg/skaffold/instrumentation/meter.go
@@ -28,7 +28,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/version"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/yamltags"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 var (
diff --git a/pkg/skaffold/instrumentation/types.go b/pkg/skaffold/instrumentation/types.go
index 67e329adda8..77245dd67bb 100644
--- a/pkg/skaffold/instrumentation/types.go
+++ b/pkg/skaffold/instrumentation/types.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 // skaffoldMeter describes the data used to determine operational metrics.
diff --git a/pkg/skaffold/kubernetes/manifest/errors.go b/pkg/skaffold/kubernetes/manifest/errors.go
index 6443b265af1..2ac1ae2ae5b 100644
--- a/pkg/skaffold/kubernetes/manifest/errors.go
+++ b/pkg/skaffold/kubernetes/manifest/errors.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 func replaceImageErr(err error) error {
diff --git a/pkg/skaffold/kubernetes/status/status_check.go b/pkg/skaffold/kubernetes/status/status_check.go
index 81acb612716..4dd460c73f7 100644
--- a/pkg/skaffold/kubernetes/status/status_check.go
+++ b/pkg/skaffold/kubernetes/status/status_check.go
@@ -44,7 +44,7 @@ import (
 	kubernetesclient "github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/client"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 var (
diff --git a/pkg/skaffold/kubernetes/status/status_check_test.go b/pkg/skaffold/kubernetes/status/status_check_test.go
index b508cd5c12e..a9574a9540e 100644
--- a/pkg/skaffold/kubernetes/status/status_check_test.go
+++ b/pkg/skaffold/kubernetes/status/status_check_test.go
@@ -38,7 +38,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 	testEvent "github.com/GoogleContainerTools/skaffold/testutil/event"
 )
diff --git a/pkg/skaffold/parser/config_test.go b/pkg/skaffold/parser/config_test.go
index 62e4d76942e..ff0643565d2 100644
--- a/pkg/skaffold/parser/config_test.go
+++ b/pkg/skaffold/parser/config_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/git"
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/render/renderer/renderer.go b/pkg/skaffold/render/renderer/renderer.go
index 36b6ee98f45..ab6f5d25bba 100644
--- a/pkg/skaffold/render/renderer/renderer.go
+++ b/pkg/skaffold/render/renderer/renderer.go
@@ -36,7 +36,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/render/validate"
 	latestV2 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v2"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 const (
diff --git a/pkg/skaffold/render/transform/transform.go b/pkg/skaffold/render/transform/transform.go
index 4848a202feb..e1f69572ac0 100644
--- a/pkg/skaffold/render/transform/transform.go
+++ b/pkg/skaffold/render/transform/transform.go
@@ -22,7 +22,7 @@ import (
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/render/kptfile"
 	latestV2 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v2"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 var (
diff --git a/pkg/skaffold/render/validate/validate.go b/pkg/skaffold/render/validate/validate.go
index 1467c81aa76..fc312031eaf 100644
--- a/pkg/skaffold/render/validate/validate.go
+++ b/pkg/skaffold/render/validate/validate.go
@@ -21,7 +21,7 @@ import (
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/render/kptfile"
 	latestV2 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v2"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 var (
diff --git a/pkg/skaffold/runner/v1/dev.go b/pkg/skaffold/runner/v1/dev.go
index 7c1ae4024e1..38d06754637 100644
--- a/pkg/skaffold/runner/v1/dev.go
+++ b/pkg/skaffold/runner/v1/dev.go
@@ -36,7 +36,7 @@ import (
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/sync"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 var (
diff --git a/pkg/skaffold/schema/errors/errors.go b/pkg/skaffold/schema/errors/errors.go
index e3355b0aea0..87ac53c2d61 100644
--- a/pkg/skaffold/schema/errors/errors.go
+++ b/pkg/skaffold/schema/errors/errors.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 // ConfigParsingError returns a generic config parsing error
diff --git a/pkg/skaffold/schema/errors/errors_test.go b/pkg/skaffold/schema/errors/errors_test.go
index e6eab4381aa..7284b088792 100644
--- a/pkg/skaffold/schema/errors/errors_test.go
+++ b/pkg/skaffold/schema/errors/errors_test.go
@@ -23,7 +23,7 @@ import (
 
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
 	"github.com/GoogleContainerTools/skaffold/proto/enums"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/schema/validation/validation.go b/pkg/skaffold/schema/validation/validation.go
index 63dba9e410b..dfa4dc70f24 100644
--- a/pkg/skaffold/schema/validation/validation.go
+++ b/pkg/skaffold/schema/validation/validation.go
@@ -37,7 +37,7 @@ import (
 	latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/yamltags"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 var (
diff --git a/pkg/skaffold/server/endpoints.go b/pkg/skaffold/server/endpoints.go
index 33a5c79aac7..e5f8c305448 100644
--- a/pkg/skaffold/server/endpoints.go
+++ b/pkg/skaffold/server/endpoints.go
@@ -24,7 +24,7 @@ import (
 	"google.golang.org/grpc/status"
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/event"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 func (s *server) GetState(context.Context, *empty.Empty) (*proto.State, error) {
diff --git a/pkg/skaffold/server/server.go b/pkg/skaffold/server/server.go
index 920155d5a19..9ef0dcf2158 100644
--- a/pkg/skaffold/server/server.go
+++ b/pkg/skaffold/server/server.go
@@ -34,7 +34,7 @@ import (
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/event"
 	v2 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/server/v2"
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	protoV2 "github.com/GoogleContainerTools/skaffold/proto/v2"
 )
 
diff --git a/pkg/skaffold/server/server_test.go b/pkg/skaffold/server/server_test.go
index 064db0e90b3..a783f0141c5 100644
--- a/pkg/skaffold/server/server_test.go
+++ b/pkg/skaffold/server/server_test.go
@@ -24,7 +24,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 	"github.com/GoogleContainerTools/skaffold/testutil"
 )
 
diff --git a/pkg/skaffold/test/custom/error.go b/pkg/skaffold/test/custom/error.go
index 119e7e70075..945f109af82 100644
--- a/pkg/skaffold/test/custom/error.go
+++ b/pkg/skaffold/test/custom/error.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 func cmdRunRetrieveErr(command string, imageName string, err error) error {
diff --git a/pkg/skaffold/test/structure/error.go b/pkg/skaffold/test/structure/error.go
index 50dafd07d96..265987c9ca1 100644
--- a/pkg/skaffold/test/structure/error.go
+++ b/pkg/skaffold/test/structure/error.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	sErrors "github.com/GoogleContainerTools/skaffold/pkg/skaffold/errors"
-	"github.com/GoogleContainerTools/skaffold/proto/v1"
+	proto "github.com/GoogleContainerTools/skaffold/proto/v1"
 )
 
 func containerStructureTestErr(err error) error {
diff --git a/proto/v1/skaffold.pb.go b/proto/v1/skaffold.pb.go
index a21b5c14c45..7abe7c740e3 100644
--- a/proto/v1/skaffold.pb.go
+++ b/proto/v1/skaffold.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: v1/skaffold.proto
 
-package proto
+package v1
 
 import (
 	context "context"
@@ -2593,184 +2593,186 @@ func (m *IntOrString) GetStrVal() string {
 }
 
 func init() {
-	proto.RegisterType((*StateResponse)(nil), "proto.StateResponse")
-	proto.RegisterType((*Response)(nil), "proto.Response")
-	proto.RegisterType((*Request)(nil), "proto.Request")
-	proto.RegisterType((*State)(nil), "proto.State")
-	proto.RegisterMapType((map[int32]*PortEvent)(nil), "proto.State.ForwardedPortsEntry")
-	proto.RegisterType((*Metadata)(nil), "proto.Metadata")
-	proto.RegisterMapType((map[string]string)(nil), "proto.Metadata.AdditionalEntry")
-	proto.RegisterType((*BuildMetadata)(nil), "proto.BuildMetadata")
-	proto.RegisterMapType((map[string]string)(nil), "proto.BuildMetadata.AdditionalEntry")
-	proto.RegisterType((*BuildMetadata_ImageBuilder)(nil), "proto.BuildMetadata.ImageBuilder")
-	proto.RegisterType((*TestMetadata)(nil), "proto.TestMetadata")
-	proto.RegisterType((*TestMetadata_Tester)(nil), "proto.TestMetadata.Tester")
-	proto.RegisterType((*DeployMetadata)(nil), "proto.DeployMetadata")
-	proto.RegisterType((*DeployMetadata_Deployer)(nil), "proto.DeployMetadata.Deployer")
-	proto.RegisterType((*BuildState)(nil), "proto.BuildState")
-	proto.RegisterMapType((map[string]string)(nil), "proto.BuildState.ArtifactsEntry")
-	proto.RegisterType((*TestState)(nil), "proto.TestState")
-	proto.RegisterType((*DeployState)(nil), "proto.DeployState")
-	proto.RegisterType((*StatusCheckState)(nil), "proto.StatusCheckState")
-	proto.RegisterMapType((map[string]string)(nil), "proto.StatusCheckState.ResourcesEntry")
-	proto.RegisterType((*FileSyncState)(nil), "proto.FileSyncState")
-	proto.RegisterType((*Event)(nil), "proto.Event")
-	proto.RegisterType((*TerminationEvent)(nil), "proto.TerminationEvent")
-	proto.RegisterType((*DevLoopEvent)(nil), "proto.DevLoopEvent")
-	proto.RegisterType((*ActionableErr)(nil), "proto.ActionableErr")
-	proto.RegisterType((*MetaEvent)(nil), "proto.MetaEvent")
-	proto.RegisterType((*BuildEvent)(nil), "proto.BuildEvent")
-	proto.RegisterType((*TestEvent)(nil), "proto.TestEvent")
-	proto.RegisterType((*DeployEvent)(nil), "proto.DeployEvent")
-	proto.RegisterType((*StatusCheckEvent)(nil), "proto.StatusCheckEvent")
-	proto.RegisterType((*ResourceStatusCheckEvent)(nil), "proto.ResourceStatusCheckEvent")
-	proto.RegisterType((*PortEvent)(nil), "proto.PortEvent")
-	proto.RegisterType((*FileSyncEvent)(nil), "proto.FileSyncEvent")
-	proto.RegisterType((*DebuggingContainerEvent)(nil), "proto.DebuggingContainerEvent")
-	proto.RegisterMapType((map[string]uint32)(nil), "proto.DebuggingContainerEvent.DebugPortsEntry")
-	proto.RegisterType((*LogEntry)(nil), "proto.LogEntry")
-	proto.RegisterType((*UserIntentRequest)(nil), "proto.UserIntentRequest")
-	proto.RegisterType((*TriggerRequest)(nil), "proto.TriggerRequest")
-	proto.RegisterType((*TriggerState)(nil), "proto.TriggerState")
-	proto.RegisterType((*Intent)(nil), "proto.Intent")
-	proto.RegisterType((*Suggestion)(nil), "proto.Suggestion")
-	proto.RegisterType((*IntOrString)(nil), "proto.IntOrString")
+	proto.RegisterType((*StateResponse)(nil), "proto.v1.StateResponse")
+	proto.RegisterType((*Response)(nil), "proto.v1.Response")
+	proto.RegisterType((*Request)(nil), "proto.v1.Request")
+	proto.RegisterType((*State)(nil), "proto.v1.State")
+	proto.RegisterMapType((map[int32]*PortEvent)(nil), "proto.v1.State.ForwardedPortsEntry")
+	proto.RegisterType((*Metadata)(nil), "proto.v1.Metadata")
+	proto.RegisterMapType((map[string]string)(nil), "proto.v1.Metadata.AdditionalEntry")
+	proto.RegisterType((*BuildMetadata)(nil), "proto.v1.BuildMetadata")
+	proto.RegisterMapType((map[string]string)(nil), "proto.v1.BuildMetadata.AdditionalEntry")
+	proto.RegisterType((*BuildMetadata_ImageBuilder)(nil), "proto.v1.BuildMetadata.ImageBuilder")
+	proto.RegisterType((*TestMetadata)(nil), "proto.v1.TestMetadata")
+	proto.RegisterType((*TestMetadata_Tester)(nil), "proto.v1.TestMetadata.Tester")
+	proto.RegisterType((*DeployMetadata)(nil), "proto.v1.DeployMetadata")
+	proto.RegisterType((*DeployMetadata_Deployer)(nil), "proto.v1.DeployMetadata.Deployer")
+	proto.RegisterType((*BuildState)(nil), "proto.v1.BuildState")
+	proto.RegisterMapType((map[string]string)(nil), "proto.v1.BuildState.ArtifactsEntry")
+	proto.RegisterType((*TestState)(nil), "proto.v1.TestState")
+	proto.RegisterType((*DeployState)(nil), "proto.v1.DeployState")
+	proto.RegisterType((*StatusCheckState)(nil), "proto.v1.StatusCheckState")
+	proto.RegisterMapType((map[string]string)(nil), "proto.v1.StatusCheckState.ResourcesEntry")
+	proto.RegisterType((*FileSyncState)(nil), "proto.v1.FileSyncState")
+	proto.RegisterType((*Event)(nil), "proto.v1.Event")
+	proto.RegisterType((*TerminationEvent)(nil), "proto.v1.TerminationEvent")
+	proto.RegisterType((*DevLoopEvent)(nil), "proto.v1.DevLoopEvent")
+	proto.RegisterType((*ActionableErr)(nil), "proto.v1.ActionableErr")
+	proto.RegisterType((*MetaEvent)(nil), "proto.v1.MetaEvent")
+	proto.RegisterType((*BuildEvent)(nil), "proto.v1.BuildEvent")
+	proto.RegisterType((*TestEvent)(nil), "proto.v1.TestEvent")
+	proto.RegisterType((*DeployEvent)(nil), "proto.v1.DeployEvent")
+	proto.RegisterType((*StatusCheckEvent)(nil), "proto.v1.StatusCheckEvent")
+	proto.RegisterType((*ResourceStatusCheckEvent)(nil), "proto.v1.ResourceStatusCheckEvent")
+	proto.RegisterType((*PortEvent)(nil), "proto.v1.PortEvent")
+	proto.RegisterType((*FileSyncEvent)(nil), "proto.v1.FileSyncEvent")
+	proto.RegisterType((*DebuggingContainerEvent)(nil), "proto.v1.DebuggingContainerEvent")
+	proto.RegisterMapType((map[string]uint32)(nil), "proto.v1.DebuggingContainerEvent.DebugPortsEntry")
+	proto.RegisterType((*LogEntry)(nil), "proto.v1.LogEntry")
+	proto.RegisterType((*UserIntentRequest)(nil), "proto.v1.UserIntentRequest")
+	proto.RegisterType((*TriggerRequest)(nil), "proto.v1.TriggerRequest")
+	proto.RegisterType((*TriggerState)(nil), "proto.v1.TriggerState")
+	proto.RegisterType((*Intent)(nil), "proto.v1.Intent")
+	proto.RegisterType((*Suggestion)(nil), "proto.v1.Suggestion")
+	proto.RegisterType((*IntOrString)(nil), "proto.v1.IntOrString")
 }
 
 func init() { proto.RegisterFile("v1/skaffold.proto", fileDescriptor_9ef8072bea85606e) }
 
 var fileDescriptor_9ef8072bea85606e = []byte{
-	// 2066 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4f, 0x73, 0x1b, 0x49,
-	0x15, 0xf7, 0x48, 0x1a, 0x49, 0xf3, 0x24, 0xd9, 0x72, 0x27, 0xb6, 0xc5, 0x24, 0x24, 0x66, 0x2a,
-	0x1b, 0x42, 0x76, 0x57, 0x8a, 0x9d, 0x2d, 0x58, 0x4c, 0x02, 0x95, 0xd8, 0xde, 0x38, 0x4b, 0x48,
-	0x42, 0xcb, 0x50, 0x14, 0x05, 0x95, 0x1a, 0x4b, 0xed, 0xd9, 0x29, 0x4b, 0x33, 0x62, 0x66, 0xe4,
-	0x45, 0x17, 0x0a, 0xf8, 0x00, 0x54, 0x6d, 0xf1, 0x1d, 0xf8, 0x0e, 0x1c, 0x39, 0xec, 0x27, 0xd8,
-	0x13, 0x14, 0x47, 0x28, 0x8e, 0x5c, 0xf8, 0x00, 0x54, 0xff, 0x9b, 0xe9, 0x96, 0x66, 0x2c, 0x3b,
-	0x29, 0x8a, 0x4b, 0xa2, 0x7e, 0xfd, 0x7b, 0x7f, 0xfb, 0xf5, 0x7b, 0x6f, 0xda, 0xb0, 0x7e, 0xbe,
-	0xd3, 0x8b, 0xcf, 0xdc, 0xd3, 0xd3, 0x70, 0x34, 0xec, 0x4e, 0xa2, 0x30, 0x09, 0x91, 0xc9, 0xfe,
-	0xb3, 0x6f, 0x7a, 0x61, 0xe8, 0x8d, 0x48, 0xcf, 0x9d, 0xf8, 0x3d, 0x37, 0x08, 0xc2, 0xc4, 0x4d,
-	0xfc, 0x30, 0x88, 0x39, 0xc8, 0xbe, 0x2d, 0x76, 0xd9, 0xea, 0x64, 0x7a, 0xda, 0x4b, 0xfc, 0x31,
-	0x89, 0x13, 0x77, 0x3c, 0x11, 0x80, 0x1b, 0xf3, 0x00, 0x32, 0x9e, 0x24, 0x33, 0xb1, 0xb9, 0x4e,
-	0x82, 0xe9, 0x38, 0xee, 0xb1, 0x7f, 0x39, 0xc9, 0x79, 0x08, 0xad, 0x7e, 0xe2, 0x26, 0x04, 0x93,
-	0x78, 0x12, 0x06, 0x31, 0x41, 0x0e, 0x98, 0x31, 0x25, 0x74, 0x8c, 0x6d, 0xe3, 0x5e, 0x63, 0xb7,
-	0xc9, 0x71, 0x5d, 0x0e, 0xe2, 0x5b, 0xce, 0x4d, 0xa8, 0xa7, 0xf8, 0x36, 0x94, 0xc7, 0xb1, 0xc7,
-	0xd0, 0x16, 0xa6, 0x3f, 0x9d, 0xaf, 0x43, 0x0d, 0x93, 0x5f, 0x4d, 0x49, 0x9c, 0x20, 0x04, 0x95,
-	0xc0, 0x1d, 0x13, 0xb1, 0xcb, 0x7e, 0x3b, 0x5f, 0x56, 0xc0, 0x64, 0xd2, 0xd0, 0x0e, 0xc0, 0xc9,
-	0xd4, 0x1f, 0x0d, 0xfb, 0x8a, 0xbe, 0x75, 0xa1, 0xef, 0x69, 0xba, 0x81, 0x15, 0x10, 0xfa, 0x08,
-	0x1a, 0x43, 0x32, 0x19, 0x85, 0x33, 0xce, 0x53, 0x62, 0x3c, 0x48, 0xf0, 0x1c, 0x64, 0x3b, 0x58,
-	0x85, 0xa1, 0x23, 0x58, 0x3d, 0x0d, 0xa3, 0xcf, 0xdd, 0x68, 0x48, 0x86, 0xaf, 0xc3, 0x28, 0x89,
-	0x3b, 0x95, 0xed, 0xf2, 0xbd, 0xc6, 0xee, 0xb6, 0xea, 0x5c, 0xf7, 0x13, 0x0d, 0x72, 0x18, 0x24,
-	0xd1, 0x0c, 0xcf, 0xf1, 0xa1, 0x7d, 0x68, 0xd3, 0x10, 0x4c, 0xe3, 0xfd, 0xcf, 0xc8, 0xe0, 0x8c,
-	0x1b, 0x61, 0x32, 0x23, 0xb6, 0x14, 0x59, 0xea, 0x36, 0x5e, 0x60, 0x40, 0x7b, 0xd0, 0x3a, 0xf5,
-	0x47, 0xa4, 0x3f, 0x0b, 0x06, 0x5c, 0x42, 0x95, 0x49, 0xb8, 0x2e, 0x24, 0x7c, 0xa2, 0xee, 0x61,
-	0x1d, 0x8a, 0x5e, 0xc3, 0xb5, 0x21, 0x39, 0x99, 0x7a, 0x9e, 0x1f, 0x78, 0xfb, 0x61, 0x90, 0xb8,
-	0x7e, 0x40, 0xa2, 0xb8, 0x53, 0x63, 0xfe, 0xdc, 0x4a, 0x03, 0x31, 0x8f, 0x38, 0x3c, 0x27, 0x41,
-	0x82, 0xf3, 0x58, 0xd1, 0xfb, 0x50, 0x1f, 0x93, 0xc4, 0x1d, 0xba, 0x89, 0xdb, 0xa9, 0x33, 0x43,
-	0xd6, 0x84, 0x98, 0x1f, 0x09, 0x32, 0x4e, 0x01, 0xa8, 0x0b, 0x56, 0x42, 0xe2, 0x84, 0x9b, 0x6d,
-	0x31, 0x74, 0x5b, 0xa0, 0x8f, 0x25, 0x1d, 0x67, 0x10, 0xbb, 0x0f, 0xd7, 0x72, 0xc2, 0x4a, 0x93,
-	0xe6, 0x8c, 0xcc, 0xd8, 0x91, 0x9b, 0x98, 0xfe, 0x44, 0x77, 0xc1, 0x3c, 0x77, 0x47, 0x53, 0x79,
-	0xa4, 0x52, 0x28, 0xe5, 0xe1, 0xb6, 0xf3, 0xed, 0xbd, 0xd2, 0xc7, 0xc6, 0xa7, 0x95, 0x7a, 0xb9,
-	0x5d, 0x71, 0xfe, 0x50, 0x82, 0xba, 0xb4, 0x10, 0xdd, 0x07, 0x93, 0x65, 0x89, 0xc8, 0xa2, 0xeb,
-	0x6a, 0x16, 0xa5, 0x6e, 0x70, 0x08, 0xfa, 0x10, 0xaa, 0x3c, 0x39, 0x84, 0xae, 0x0d, 0x2d, 0x7d,
-	0x52, 0xb4, 0x00, 0xa1, 0x6f, 0x42, 0x85, 0xfa, 0xd3, 0x29, 0x33, 0xf0, 0x35, 0xc5, 0xdb, 0x14,
-	0xca, 0x00, 0xe8, 0x07, 0x00, 0xee, 0x70, 0xe8, 0xd3, 0xeb, 0xea, 0x8e, 0x3a, 0x03, 0x76, 0x22,
-	0xb7, 0xe7, 0x42, 0xd9, 0x7d, 0x92, 0x22, 0x78, 0x82, 0x29, 0x2c, 0xf6, 0x63, 0x58, 0x9b, 0xdb,
-	0x56, 0x03, 0x65, 0xf1, 0x40, 0x5d, 0x57, 0x03, 0x65, 0x29, 0x61, 0x71, 0x7e, 0x57, 0x86, 0x96,
-	0xe6, 0x30, 0xfa, 0x00, 0xd6, 0x83, 0xe9, 0xf8, 0x84, 0x44, 0xaf, 0x4e, 0x9f, 0x44, 0x89, 0x7f,
-	0xea, 0x0e, 0x92, 0x58, 0x04, 0x7d, 0x71, 0x03, 0x3d, 0x86, 0x3a, 0x0b, 0x10, 0xcd, 0xa7, 0x12,
-	0xb3, 0xfe, 0x1b, 0x79, 0x61, 0xec, 0x3e, 0x1f, 0xbb, 0x1e, 0x79, 0xca, 0x91, 0x38, 0x65, 0x41,
-	0xf7, 0xa1, 0x92, 0xcc, 0x26, 0x84, 0xc5, 0x69, 0x75, 0x77, 0x53, 0xb0, 0xf2, 0x5a, 0xc3, 0xd0,
-	0xc7, 0xb3, 0x09, 0xc1, 0x0c, 0x83, 0x0e, 0x72, 0x42, 0x75, 0x27, 0x57, 0xd9, 0x45, 0xf1, 0xc2,
-	0xd0, 0x54, 0x6d, 0x41, 0x1f, 0x08, 0x0b, 0x0c, 0x66, 0x41, 0x67, 0xd1, 0x02, 0x12, 0x29, 0x36,
-	0x5c, 0x07, 0x73, 0x10, 0x4e, 0x83, 0x84, 0x05, 0xd2, 0xc4, 0x7c, 0xf1, 0xae, 0x67, 0xf0, 0x85,
-	0x01, 0x4d, 0x35, 0x35, 0xd0, 0x47, 0x50, 0xa3, 0x6b, 0x1a, 0x53, 0x83, 0xb9, 0x69, 0xe7, 0x24,
-	0x50, 0x97, 0x43, 0xb0, 0x84, 0xda, 0x3f, 0x84, 0x2a, 0xff, 0x89, 0xde, 0xd7, 0x7c, 0xda, 0xd2,
-	0x7c, 0xe2, 0x90, 0x65, 0x2e, 0x39, 0x5f, 0x19, 0xb0, 0xaa, 0xe7, 0x36, 0x7a, 0x04, 0x16, 0xcf,
-	0xee, 0xcc, 0xae, 0x5b, 0xb9, 0xb7, 0x40, 0x2c, 0x49, 0x84, 0x33, 0x06, 0xb4, 0x0b, 0xb5, 0xc1,
-	0x68, 0x4a, 0x75, 0x33, 0x45, 0xf3, 0xa1, 0xde, 0xe7, 0x7b, 0xcc, 0x2e, 0x09, 0xb4, 0x5f, 0x41,
-	0x5d, 0x8a, 0x42, 0x1f, 0x6a, 0x3e, 0x7d, 0x4d, 0x63, 0x96, 0xa0, 0xa5, 0x5e, 0xfd, 0xd3, 0x00,
-	0xc8, 0x9a, 0x04, 0xfa, 0x3e, 0x58, 0xae, 0x92, 0xe2, 0x6a, 0x75, 0xcf, 0x50, 0xdd, 0x34, 0xd9,
-	0x79, 0x32, 0x65, 0x2c, 0x68, 0x1b, 0x1a, 0xee, 0x34, 0x09, 0x8f, 0x23, 0xdf, 0xf3, 0x84, 0x5f,
-	0x75, 0xac, 0x92, 0xd0, 0x77, 0x00, 0x44, 0x25, 0x0f, 0x87, 0x32, 0xcb, 0xf5, 0xf3, 0xe8, 0xa7,
-	0xdb, 0x58, 0x81, 0xda, 0x8f, 0x60, 0x55, 0xd7, 0x7b, 0xa5, 0x8c, 0xfa, 0x05, 0x58, 0x69, 0x65,
-	0x45, 0x9b, 0x50, 0xe5, 0x82, 0x05, 0xaf, 0x58, 0xcd, 0xd9, 0x56, 0xba, 0xb4, 0x6d, 0xce, 0x6f,
-	0x0d, 0x68, 0x28, 0x6d, 0xb3, 0x50, 0xc1, 0xff, 0x2e, 0x3c, 0xce, 0xbf, 0x0c, 0x68, 0xcf, 0x37,
-	0xcd, 0x42, 0x3b, 0x0e, 0xc0, 0x8a, 0x48, 0x1c, 0x4e, 0xa3, 0x01, 0x91, 0x45, 0xea, 0x6e, 0x41,
-	0xe3, 0xed, 0x62, 0x09, 0x14, 0x87, 0x9d, 0x32, 0xbe, 0xd3, 0x51, 0xea, 0x52, 0xaf, 0x74, 0x94,
-	0xcf, 0xa1, 0xa5, 0xf5, 0xf6, 0xb7, 0x8f, 0xb6, 0xf3, 0x37, 0x13, 0x4c, 0xd6, 0x17, 0xd1, 0x03,
-	0xb0, 0x68, 0x77, 0x66, 0x0b, 0xd1, 0xfd, 0xda, 0x4a, 0xd3, 0x61, 0xf4, 0xa3, 0x15, 0x9c, 0x81,
-	0xd0, 0x43, 0x31, 0x76, 0x71, 0x96, 0xd2, 0xe2, 0xd8, 0x25, 0x79, 0x14, 0x18, 0xfa, 0xb6, 0x1c,
-	0xbc, 0x38, 0x57, 0x39, 0x67, 0xf0, 0x92, 0x6c, 0x2a, 0x90, 0x9a, 0x37, 0x91, 0x3d, 0xbc, 0x53,
-	0xc9, 0xef, 0xed, 0xd4, 0xbc, 0x14, 0x84, 0x0e, 0xb5, 0x11, 0x8b, 0x33, 0x16, 0x8e, 0x58, 0x92,
-	0x7f, 0x81, 0x05, 0xfd, 0x12, 0x3a, 0xf2, 0xc0, 0xe7, 0xf1, 0x62, 0xde, 0x92, 0xbd, 0x19, 0x17,
-	0xc0, 0x8e, 0x56, 0x70, 0xa1, 0x08, 0xf4, 0x28, 0x9b, 0xe1, 0xb8, 0xcc, 0x5a, 0xee, 0x0c, 0x27,
-	0x05, 0xe9, 0x60, 0xf4, 0x73, 0xd8, 0x1a, 0xe6, 0xcf, 0x68, 0x62, 0x04, 0x5b, 0x32, 0xc9, 0x1d,
-	0xad, 0xe0, 0x22, 0x01, 0xe8, 0xbb, 0xd0, 0x1c, 0x92, 0xf3, 0x17, 0x61, 0x38, 0xe1, 0x02, 0x2d,
-	0x6d, 0x6e, 0x39, 0x50, 0xb6, 0x8e, 0x56, 0xb0, 0x06, 0xa5, 0xa1, 0x4f, 0x48, 0x34, 0xf6, 0x03,
-	0xf6, 0xcd, 0xc1, 0xd9, 0x41, 0x0b, 0xfd, 0xf1, 0xdc, 0x36, 0x0d, 0xfd, 0x3c, 0x0b, 0x3d, 0x73,
-	0x5a, 0xb2, 0x38, 0x7f, 0x63, 0x61, 0x48, 0x4c, 0xcf, 0x3c, 0x5d, 0x3c, 0x6d, 0x02, 0x10, 0xfa,
-	0xe3, 0x0d, 0x2d, 0xf8, 0x0e, 0x86, 0xf6, 0xbc, 0x9e, 0xc2, 0xab, 0x72, 0x17, 0xca, 0x24, 0x8a,
-	0x44, 0x16, 0xcb, 0xe8, 0x3f, 0x19, 0xb0, 0xfe, 0x7d, 0x32, 0x22, 0x87, 0x51, 0x84, 0x29, 0xc0,
-	0x19, 0x41, 0x53, 0x75, 0x1d, 0xdd, 0x04, 0xcb, 0x4f, 0x48, 0xc4, 0x34, 0x88, 0x91, 0x28, 0x23,
-	0x28, 0xda, 0x4a, 0x79, 0xda, 0xca, 0xcb, 0xb4, 0x7d, 0x61, 0x40, 0x4b, 0x23, 0xa3, 0x1d, 0xa8,
-	0x91, 0x28, 0x62, 0xf5, 0xc6, 0xb8, 0xb8, 0xde, 0x48, 0x1c, 0xea, 0x40, 0x6d, 0x4c, 0xe2, 0xd8,
-	0xf5, 0x64, 0x29, 0x91, 0x4b, 0xf4, 0x10, 0x1a, 0xf1, 0xd4, 0xf3, 0x48, 0xcc, 0x3e, 0x0d, 0x3b,
-	0x65, 0x56, 0x07, 0xe5, 0x15, 0xee, 0xa7, 0x3b, 0x58, 0x45, 0x39, 0x2f, 0xc1, 0x4a, 0x0b, 0x02,
-	0x2d, 0x52, 0x84, 0xd6, 0x2f, 0x11, 0x4d, 0xbe, 0xd0, 0x3e, 0x05, 0x4a, 0x4b, 0x3e, 0x05, 0x9c,
-	0xbf, 0xc8, 0x06, 0xcc, 0x25, 0xda, 0x50, 0x97, 0xdd, 0x54, 0x08, 0x4d, 0xd7, 0x85, 0xe1, 0x6c,
-	0x67, 0xe1, 0xb4, 0x58, 0xe0, 0xd4, 0x30, 0x55, 0x2e, 0x19, 0xa6, 0x3d, 0x68, 0xb9, 0x6a, 0xa8,
-	0x45, 0xb1, 0xc8, 0x3f, 0x1d, 0x1d, 0xea, 0xbc, 0x51, 0x32, 0xb5, 0x30, 0xc5, 0x16, 0x14, 0x94,
-	0x2e, 0xaf, 0xe0, 0x4f, 0x69, 0x7f, 0xbd, 0x58, 0x47, 0x3b, 0x4b, 0xe3, 0xc5, 0x48, 0x94, 0xdf,
-	0x36, 0x12, 0x95, 0xcb, 0x1b, 0xfa, 0xa5, 0xde, 0x85, 0x2f, 0xb6, 0xb6, 0x38, 0x33, 0xff, 0xef,
-	0x27, 0xfa, 0x6f, 0x03, 0x3a, 0x45, 0x05, 0x9d, 0xe6, 0xa8, 0x2c, 0xe8, 0x32, 0x47, 0xe5, 0xba,
-	0x30, 0x47, 0x15, 0x5f, 0xcb, 0xb9, 0xbe, 0x56, 0x32, 0x5f, 0xf5, 0xb9, 0xc2, 0xbc, 0xf4, 0x5c,
-	0xb1, 0xe8, 0x71, 0xf5, 0xf2, 0x1e, 0xff, 0xb5, 0x04, 0x56, 0xda, 0x4a, 0x69, 0x5d, 0x1b, 0x85,
-	0x03, 0x77, 0x44, 0x29, 0xb2, 0xae, 0xa5, 0x04, 0x74, 0x0b, 0x20, 0x22, 0xe3, 0x30, 0x21, 0x6c,
-	0x9b, 0xcf, 0xd3, 0x0a, 0x85, 0x3a, 0x3b, 0x09, 0x87, 0x2f, 0xdd, 0x71, 0xea, 0xac, 0x58, 0xa2,
-	0x3b, 0xd0, 0x1a, 0xc8, 0x3e, 0xc3, 0xf6, 0xb9, 0xdb, 0x3a, 0x91, 0x6a, 0x0f, 0xdc, 0x31, 0x89,
-	0x27, 0xee, 0x80, 0xfb, 0x6f, 0xe1, 0x8c, 0x40, 0xc3, 0x4f, 0xdb, 0x3c, 0x63, 0xaf, 0xf2, 0xf0,
-	0xcb, 0x35, 0x72, 0xa0, 0x29, 0x8f, 0x82, 0x8e, 0xfe, 0xac, 0x9d, 0x5a, 0x58, 0xa3, 0xa9, 0x18,
-	0x26, 0xa3, 0xae, 0x63, 0x98, 0x9c, 0x0e, 0xd4, 0xdc, 0xe1, 0x30, 0x22, 0x71, 0xcc, 0x1a, 0x9f,
-	0x85, 0xe5, 0x12, 0xed, 0x02, 0x24, 0x6e, 0xe4, 0x91, 0x84, 0xf9, 0x0e, 0xda, 0x00, 0xf3, 0x3c,
-	0x48, 0x5e, 0x45, 0xfd, 0x24, 0xf2, 0x03, 0x0f, 0x2b, 0x28, 0xe7, 0xef, 0x46, 0x36, 0xb2, 0xa5,
-	0xf1, 0xa5, 0xad, 0x7c, 0x9f, 0x7d, 0x90, 0x88, 0xf8, 0xa6, 0x04, 0x5a, 0x56, 0xfd, 0x71, 0x76,
-	0x2d, 0xf8, 0x42, 0x49, 0xad, 0x72, 0xde, 0xa5, 0xaf, 0xe4, 0x5e, 0x16, 0xf3, 0x6d, 0x2f, 0xcb,
-	0x15, 0x52, 0xe7, 0x3f, 0x25, 0xd8, 0x2a, 0x98, 0x30, 0x2e, 0xba, 0xfb, 0x32, 0x45, 0x4a, 0x4b,
-	0x52, 0xa4, 0xbc, 0x34, 0x45, 0x2a, 0x39, 0x29, 0x92, 0x76, 0x11, 0x73, 0xae, 0x8b, 0x74, 0xa0,
-	0x16, 0x4d, 0x83, 0xc4, 0x4f, 0xb3, 0x47, 0x2e, 0x69, 0x5a, 0x7f, 0x1e, 0x46, 0x67, 0x7e, 0xe0,
-	0x1d, 0xf8, 0x91, 0x48, 0x1d, 0x85, 0x82, 0x5e, 0x02, 0xb0, 0x69, 0x89, 0xbf, 0xfd, 0xd5, 0x59,
-	0xbb, 0xec, 0x5e, 0x3c, 0x61, 0x71, 0xba, 0xf2, 0x12, 0xa8, 0x48, 0xb0, 0x1f, 0xc3, 0xda, 0xdc,
-	0xf6, 0xb2, 0xef, 0x80, 0x96, 0xfa, 0x1d, 0xf0, 0x1b, 0xa8, 0xbf, 0x08, 0x3d, 0xce, 0xf7, 0x31,
-	0x58, 0xe9, 0x13, 0xae, 0x18, 0xdf, 0xed, 0x2e, 0x7f, 0xc3, 0xed, 0xca, 0x37, 0xdc, 0xee, 0xb1,
-	0x44, 0xe0, 0x0c, 0x8c, 0x1c, 0x30, 0x89, 0x32, 0xc1, 0xcb, 0x87, 0x5a, 0xf1, 0x5a, 0x46, 0xf4,
-	0x36, 0x5f, 0x56, 0xda, 0xbc, 0xb3, 0x07, 0xeb, 0x3f, 0x89, 0x49, 0xf4, 0x3c, 0x48, 0x28, 0x54,
-	0x3c, 0xd5, 0xbe, 0x07, 0x55, 0x9f, 0x11, 0x84, 0x15, 0xad, 0xec, 0x6a, 0x50, 0x94, 0xd8, 0x74,
-	0xbe, 0x07, 0xab, 0xe2, 0x1b, 0x44, 0x32, 0x7e, 0x4b, 0x7f, 0x30, 0x4e, 0x1f, 0xc8, 0x38, 0x4a,
-	0x7b, 0x37, 0xde, 0x81, 0xa6, 0x4a, 0x46, 0x36, 0xd4, 0x08, 0x4b, 0x46, 0xfe, 0x6e, 0x57, 0x3f,
-	0x5a, 0xc1, 0x92, 0xf0, 0xd4, 0x84, 0xf2, 0xb9, 0x3b, 0x72, 0x3e, 0x85, 0x2a, 0xb7, 0x80, 0xfa,
-	0x92, 0x3d, 0xf1, 0xd5, 0xe5, 0x63, 0x1e, 0x82, 0x4a, 0x3c, 0x0b, 0x06, 0xe2, 0x1b, 0x89, 0xfd,
-	0xa6, 0xa9, 0x2b, 0x1e, 0xf8, 0xca, 0x8c, 0x2a, 0x56, 0x8e, 0x0f, 0x90, 0x0d, 0x47, 0x68, 0x1f,
-	0x56, 0xb3, 0xf1, 0x48, 0x19, 0xcc, 0x6e, 0xe8, 0x57, 0x4e, 0x83, 0xe0, 0x39, 0x16, 0xaa, 0x8a,
-	0x5f, 0x29, 0xd9, 0x35, 0xf8, 0xca, 0xf9, 0x31, 0x34, 0x94, 0x9a, 0x42, 0xad, 0x4c, 0x5f, 0x3c,
-	0x4c, 0xf1, 0xac, 0xb1, 0xc9, 0x02, 0xfe, 0x53, 0x77, 0x24, 0xea, 0xb0, 0x58, 0xf1, 0x8b, 0x17,
-	0x51, 0x7a, 0x5a, 0x2d, 0xe8, 0x6a, 0xf7, 0xcf, 0x26, 0xac, 0xf5, 0xc5, 0x9f, 0x0c, 0xfa, 0x24,
-	0x3a, 0xf7, 0x07, 0x04, 0xed, 0x43, 0xfd, 0x19, 0x91, 0x6f, 0x03, 0x0b, 0x69, 0x73, 0x38, 0x9e,
-	0x24, 0x33, 0x5b, 0x7b, 0xc1, 0x77, 0xd6, 0x7f, 0xff, 0xd5, 0x3f, 0xfe, 0x58, 0x6a, 0x20, 0xab,
-	0x77, 0xbe, 0xd3, 0x63, 0xa7, 0x82, 0x9e, 0x41, 0x9d, 0x25, 0xcd, 0x8b, 0xd0, 0x43, 0x72, 0xde,
-	0x93, 0xf9, 0x69, 0xcf, 0x13, 0x9c, 0x0d, 0x26, 0x60, 0x0d, 0xb5, 0xa8, 0x00, 0x3e, 0xb4, 0x8f,
-	0x42, 0xef, 0x9e, 0xf1, 0xc0, 0x40, 0xcf, 0xa0, 0xca, 0x04, 0xc5, 0x85, 0xb6, 0x2c, 0x48, 0x43,
-	0x4c, 0x5a, 0x13, 0x41, 0x2a, 0x2d, 0x7e, 0x60, 0xa0, 0x9f, 0x41, 0xed, 0xf0, 0xd7, 0x64, 0x30,
-	0x4d, 0x08, 0x92, 0x4f, 0x4b, 0x0b, 0x09, 0x6b, 0x17, 0xe8, 0x70, 0x6e, 0x30, 0x91, 0x1b, 0x4e,
-	0x83, 0x89, 0xe4, 0x62, 0xf6, 0x44, 0xfa, 0x22, 0x17, 0xac, 0x27, 0xd3, 0x24, 0x64, 0x73, 0x2b,
-	0xda, 0xd0, 0x53, 0x75, 0x99, 0xe0, 0xf7, 0x98, 0xe0, 0xdb, 0xf6, 0x26, 0x15, 0xcc, 0xb2, 0xaf,
-	0x47, 0x3f, 0xc9, 0xdf, 0x48, 0x1d, 0x3c, 0xc9, 0xd1, 0x1b, 0xa8, 0x53, 0x15, 0xb4, 0x65, 0x5c,
-	0x55, 0xc3, 0x1d, 0xa6, 0xe1, 0x96, 0xbd, 0xc1, 0x0e, 0x67, 0x16, 0x0c, 0x72, 0x15, 0x0c, 0x00,
-	0xa8, 0x02, 0x3e, 0x56, 0x5e, 0x55, 0xc5, 0x5d, 0xa6, 0x62, 0xdb, 0xde, 0xa2, 0x2a, 0xf8, 0xbd,
-	0xc8, 0x55, 0xf2, 0x02, 0xaa, 0x47, 0x6e, 0x30, 0x1c, 0x11, 0xa4, 0x15, 0x96, 0x42, 0xb9, 0x37,
-	0x99, 0xdc, 0x4d, 0x67, 0x3d, 0x3b, 0xc8, 0xde, 0x67, 0x4c, 0xc0, 0x9e, 0x71, 0xff, 0x75, 0xf9,
-	0xa4, 0xca, 0xf0, 0x0f, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x04, 0x2e, 0xed, 0x6c, 0xf9, 0x1a,
-	0x00, 0x00,
+	// 2111 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcd, 0x93, 0xdb, 0x48,
+	0x15, 0x1f, 0xf9, 0x53, 0x7a, 0x9e, 0xcf, 0x4e, 0x32, 0x63, 0x94, 0xec, 0x6e, 0x56, 0x24, 0x90,
+	0x2c, 0x59, 0x3b, 0x4e, 0x20, 0x59, 0x52, 0x3b, 0x2c, 0x33, 0x93, 0x49, 0x26, 0xd9, 0x2c, 0xd9,
+	0xc8, 0xb3, 0x7b, 0xe0, 0xa3, 0x16, 0xd9, 0xee, 0x51, 0x54, 0xb1, 0x25, 0x23, 0xc9, 0x5e, 0x7c,
+	0x03, 0x2e, 0xfc, 0x01, 0xec, 0x89, 0xff, 0x80, 0xff, 0x83, 0x03, 0x77, 0x28, 0x4e, 0x54, 0xc1,
+	0x81, 0x03, 0xc5, 0x91, 0x0b, 0x07, 0x2e, 0x54, 0xbf, 0xee, 0x96, 0x5a, 0xb2, 0x35, 0xce, 0x4c,
+	0x8a, 0x2a, 0x2e, 0x33, 0xea, 0xee, 0xdf, 0xfb, 0xec, 0xd7, 0xef, 0xbd, 0x6e, 0xc3, 0xd6, 0xb4,
+	0xd3, 0x8e, 0x5e, 0x39, 0x27, 0x27, 0xc1, 0x70, 0xd0, 0x1a, 0x87, 0x41, 0x1c, 0x10, 0x1d, 0xff,
+	0xb5, 0xa6, 0x1d, 0xf3, 0x8a, 0x1b, 0x04, 0xee, 0x90, 0xb6, 0x9d, 0xb1, 0xd7, 0x76, 0x7c, 0x3f,
+	0x88, 0x9d, 0xd8, 0x0b, 0xfc, 0x88, 0xe3, 0xcc, 0x77, 0xc4, 0x2a, 0x8e, 0x7a, 0x93, 0x93, 0x76,
+	0xec, 0x8d, 0x68, 0x14, 0x3b, 0xa3, 0xb1, 0x00, 0x5c, 0xce, 0x03, 0xe8, 0x68, 0x1c, 0xcf, 0xc4,
+	0xe2, 0x16, 0xf5, 0x27, 0xa3, 0xa8, 0x8d, 0x7f, 0xf9, 0x94, 0x75, 0x0f, 0xd6, 0xba, 0xb1, 0x13,
+	0x53, 0x9b, 0x46, 0xe3, 0xc0, 0x8f, 0x28, 0xb9, 0x0e, 0xd5, 0x88, 0x4d, 0x34, 0xb5, 0xab, 0xda,
+	0x8d, 0xc6, 0x9d, 0x8d, 0x96, 0xd4, 0xac, 0xc5, 0x71, 0x7c, 0xd5, 0xba, 0x02, 0x7a, 0x42, 0xb2,
+	0x09, 0xe5, 0x51, 0xe4, 0x22, 0x81, 0x61, 0xb3, 0x4f, 0xeb, 0x2d, 0xa8, 0xdb, 0xf4, 0x67, 0x13,
+	0x1a, 0xc5, 0x84, 0x40, 0xc5, 0x77, 0x46, 0x54, 0xac, 0xe2, 0xb7, 0xf5, 0xb7, 0x0a, 0x54, 0x91,
+	0x1b, 0xf9, 0x36, 0x40, 0x6f, 0xe2, 0x0d, 0x07, 0x5d, 0x45, 0xe4, 0xc5, 0x54, 0xe4, 0x7e, 0xb2,
+	0x66, 0x2b, 0x38, 0x72, 0x1f, 0x1a, 0x03, 0x3a, 0x1e, 0x06, 0x33, 0x4e, 0x56, 0x42, 0xb2, 0x4b,
+	0x29, 0xd9, 0xc3, 0x74, 0xd1, 0x56, 0x91, 0xe4, 0x63, 0x58, 0x3f, 0x09, 0xc2, 0x2f, 0x9d, 0x70,
+	0x40, 0x07, 0x9f, 0x06, 0x61, 0x1c, 0x35, 0x2b, 0x57, 0xcb, 0x37, 0x1a, 0x77, 0xbe, 0x9e, 0xb3,
+	0xb2, 0xf5, 0x28, 0x83, 0x3a, 0xf4, 0xe3, 0x70, 0x66, 0xe7, 0x48, 0xc9, 0x23, 0xd8, 0x64, 0xbe,
+	0x98, 0x44, 0x07, 0x2f, 0x69, 0xff, 0x15, 0x57, 0xa5, 0x8a, 0xaa, 0x98, 0x59, 0x76, 0x2a, 0xc2,
+	0x9e, 0xa3, 0x21, 0xbb, 0xb0, 0x76, 0xe2, 0x0d, 0x69, 0x77, 0xe6, 0xf7, 0x39, 0x93, 0x1a, 0x32,
+	0xd9, 0x49, 0x99, 0x3c, 0x52, 0x97, 0xed, 0x2c, 0x9a, 0x74, 0xe1, 0xc2, 0x80, 0xf6, 0x26, 0xae,
+	0xeb, 0xf9, 0xee, 0x41, 0xe0, 0xc7, 0x8e, 0xe7, 0xd3, 0x30, 0x6a, 0xd6, 0xd1, 0xb0, 0x77, 0x55,
+	0xa7, 0xe4, 0x41, 0x87, 0x53, 0xea, 0xc7, 0xf6, 0x22, 0x6a, 0xd2, 0x02, 0x7d, 0x44, 0x63, 0x67,
+	0xe0, 0xc4, 0x4e, 0x53, 0x47, 0x75, 0x48, 0xca, 0xe9, 0x13, 0xb1, 0x62, 0x27, 0x18, 0xd2, 0x01,
+	0x23, 0xa6, 0x51, 0xcc, 0xf5, 0x37, 0x90, 0xe0, 0x42, 0x4a, 0x70, 0x2c, 0x97, 0xec, 0x14, 0x65,
+	0x7e, 0x0e, 0x17, 0x16, 0x78, 0x99, 0x05, 0xd3, 0x2b, 0x3a, 0xc3, 0x50, 0xa8, 0xda, 0xec, 0x93,
+	0xdc, 0x84, 0xea, 0xd4, 0x19, 0x4e, 0xe4, 0x3e, 0x2b, 0x7c, 0x19, 0x19, 0x37, 0x82, 0x23, 0x1e,
+	0x94, 0x3e, 0xd0, 0x9e, 0x56, 0xf4, 0xf2, 0x66, 0xc5, 0xfa, 0x6d, 0x09, 0x74, 0xa9, 0x27, 0x79,
+	0x1f, 0xaa, 0x18, 0x3d, 0x22, 0xc0, 0x76, 0x72, 0x01, 0x96, 0xd8, 0xc3, 0x51, 0xe4, 0x36, 0xd4,
+	0x78, 0xd0, 0x08, 0x89, 0xcd, 0x7c, 0x64, 0x25, 0x04, 0x02, 0x47, 0xde, 0x83, 0x0a, 0x33, 0xac,
+	0x59, 0x46, 0xfc, 0x76, 0xd6, 0xf2, 0x04, 0x8d, 0x18, 0xb2, 0x0f, 0xe0, 0x0c, 0x06, 0x1e, 0x3b,
+	0xd5, 0xce, 0xb0, 0xd9, 0xc7, 0x6d, 0xb2, 0xe6, 0x9d, 0xdb, 0xda, 0x4b, 0x40, 0x3c, 0xfc, 0x14,
+	0x2a, 0x73, 0x17, 0x36, 0x72, 0xcb, 0xaa, 0xdf, 0x0c, 0xee, 0xb7, 0x8b, 0xaa, 0xdf, 0x0c, 0xc5,
+	0x45, 0xd6, 0xaf, 0xcb, 0xb0, 0x96, 0xb1, 0x9c, 0xdc, 0x82, 0x2d, 0x7f, 0x32, 0xea, 0xd1, 0xf0,
+	0xf9, 0xc9, 0x5e, 0x18, 0x7b, 0x27, 0x4e, 0x3f, 0x8e, 0xc4, 0x1e, 0xcc, 0x2f, 0x90, 0xef, 0x83,
+	0x8e, 0x9e, 0x62, 0x71, 0x56, 0x42, 0x03, 0xae, 0x15, 0xb8, 0xb4, 0xf5, 0x64, 0xe4, 0xb8, 0x74,
+	0x9f, 0x83, 0xed, 0x84, 0x0a, 0x1d, 0x36, 0x1b, 0x53, 0x74, 0xd8, 0x7a, 0xe2, 0x30, 0x9e, 0x98,
+	0x10, 0x7d, 0x3c, 0x1b, 0x53, 0x1b, 0x31, 0xe4, 0xf1, 0x02, 0x87, 0x7d, 0xb3, 0x48, 0xde, 0x69,
+	0x5e, 0xb3, 0x61, 0x55, 0x55, 0x87, 0xdc, 0x12, 0x4a, 0x68, 0xa8, 0x44, 0x73, 0x5e, 0x09, 0x1a,
+	0x2a, 0x6a, 0x5c, 0x84, 0x6a, 0x3f, 0x98, 0xf8, 0x31, 0xba, 0xb3, 0x6a, 0xf3, 0xc1, 0x9b, 0xee,
+	0xc4, 0x57, 0x1a, 0xac, 0xaa, 0x31, 0x42, 0xee, 0x43, 0x9d, 0x8d, 0x99, 0x67, 0x35, 0xb4, 0xf4,
+	0xad, 0xc5, 0xc1, 0xd4, 0xe2, 0x28, 0x5b, 0xa2, 0xcd, 0x8f, 0xa1, 0xc6, 0x3f, 0xc9, 0xb7, 0x32,
+	0x66, 0xed, 0x64, 0xcc, 0xe2, 0x90, 0x65, 0x56, 0x59, 0x7f, 0xd6, 0x60, 0x3d, 0x1b, 0xea, 0xe4,
+	0x23, 0x30, 0x78, 0xb0, 0xa7, 0xaa, 0xbd, 0x5b, 0x74, 0x2e, 0xc4, 0x90, 0x86, 0x76, 0x4a, 0x43,
+	0xee, 0x40, 0xbd, 0x3f, 0x9c, 0x30, 0xf1, 0x28, 0x2b, 0xef, 0xf0, 0x03, 0xbe, 0x86, 0xaa, 0x49,
+	0xa0, 0xf9, 0x1c, 0x74, 0xc9, 0x8a, 0xbc, 0x9f, 0x31, 0xeb, 0x6b, 0x19, 0x62, 0x09, 0x5a, 0x6a,
+	0xd8, 0x3f, 0x34, 0x80, 0xb4, 0xa8, 0x90, 0x3d, 0x30, 0x1c, 0x25, 0xdc, 0x73, 0xa5, 0x20, 0x05,
+	0xb6, 0x92, 0xd8, 0xe7, 0x51, 0x95, 0x52, 0x91, 0xab, 0xd0, 0x70, 0x26, 0x71, 0x70, 0x1c, 0x7a,
+	0xae, 0x2b, 0x4c, 0xd3, 0x6d, 0x75, 0x8a, 0xdc, 0x07, 0x10, 0x39, 0x3f, 0x18, 0xc8, 0x88, 0xcf,
+	0xee, 0x4a, 0x37, 0x59, 0xb6, 0x15, 0xa8, 0xf9, 0x21, 0xac, 0x67, 0xe5, 0x9e, 0x29, 0xb4, 0x7e,
+	0x0c, 0x46, 0x92, 0x77, 0xc9, 0x36, 0xd4, 0x38, 0x63, 0x41, 0x2b, 0x46, 0x39, 0xdd, 0x4a, 0xaf,
+	0xad, 0x9b, 0xf5, 0x0b, 0x0d, 0x1a, 0x4a, 0x99, 0x2d, 0x14, 0xf0, 0xbf, 0x73, 0x8f, 0xf5, 0x4f,
+	0x0d, 0x36, 0xf3, 0xe5, 0xb5, 0x50, 0x8f, 0xc7, 0x60, 0x84, 0x34, 0x0a, 0x26, 0x61, 0x9f, 0xca,
+	0x9c, 0x75, 0xb3, 0xb8, 0x4a, 0xb7, 0x6c, 0x89, 0x15, 0xfb, 0x9d, 0xd0, 0xbe, 0xd1, 0x6e, 0x66,
+	0xb9, 0x9e, 0x69, 0x37, 0x9f, 0xc0, 0x5a, 0xa6, 0x0b, 0x38, 0xbf, 0xc3, 0xad, 0xff, 0x54, 0xa1,
+	0x8a, 0x55, 0x93, 0xdc, 0x05, 0x83, 0x55, 0x70, 0x1c, 0x88, 0xda, 0x78, 0x21, 0x5b, 0x89, 0x70,
+	0xe9, 0x68, 0xc5, 0x4e, 0x71, 0xe4, 0x9e, 0x68, 0xd9, 0x38, 0x55, 0x69, 0x61, 0xcb, 0x26, 0xc9,
+	0x14, 0x24, 0xf9, 0xae, 0x6c, 0xda, 0x38, 0x61, 0x79, 0x71, 0xd3, 0x26, 0x29, 0x55, 0x2c, 0xd3,
+	0x73, 0x2c, 0x4b, 0x7d, 0xb3, 0x52, 0xd8, 0x05, 0x30, 0x3d, 0x13, 0x1c, 0x39, 0xca, 0xb4, 0x67,
+	0x9c, 0xf6, 0xb4, 0xf6, 0x4c, 0xb2, 0x98, 0xa3, 0x22, 0x3f, 0x85, 0xa6, 0xdc, 0xff, 0x3c, 0x5e,
+	0xf4, 0x6a, 0x4a, 0xfd, 0xb6, 0x0b, 0x90, 0x47, 0x2b, 0x76, 0x21, 0x17, 0xf2, 0x51, 0xda, 0x02,
+	0x72, 0xb6, 0xf5, 0xa2, 0x16, 0x50, 0xf2, 0xca, 0xe2, 0xc9, 0x4f, 0x60, 0x67, 0xb0, 0xb8, 0xbf,
+	0x13, 0xed, 0xdb, 0xf2, 0x46, 0xf0, 0x68, 0xc5, 0x2e, 0xe2, 0x41, 0x3e, 0x84, 0xd5, 0x01, 0x9d,
+	0x3e, 0x0b, 0x82, 0x31, 0xe7, 0x69, 0xe4, 0xfb, 0x9c, 0x87, 0xca, 0xea, 0xd1, 0x8a, 0x9d, 0x41,
+	0xb3, 0x9d, 0x88, 0x69, 0x38, 0xf2, 0x7c, 0xbc, 0xca, 0x70, 0x0e, 0x90, 0xdf, 0x89, 0xe3, 0x1c,
+	0x82, 0xed, 0x44, 0x9e, 0x8a, 0x05, 0x02, 0xcb, 0x69, 0x9c, 0x45, 0x63, 0x51, 0x9b, 0x99, 0x04,
+	0x42, 0x32, 0xd8, 0x5f, 0x05, 0xa0, 0xec, 0xe3, 0x0b, 0x56, 0x17, 0xac, 0xcf, 0x60, 0x33, 0x2f,
+	0xaa, 0xf0, 0x2c, 0xdd, 0x84, 0x32, 0x0d, 0x43, 0x11, 0xe3, 0xca, 0x66, 0xec, 0xf5, 0xb1, 0xde,
+	0xf7, 0x86, 0xf4, 0x30, 0x0c, 0x6d, 0x86, 0xb1, 0x02, 0x58, 0x55, 0x7d, 0x40, 0xae, 0x80, 0xe1,
+	0xc5, 0x34, 0x44, 0x21, 0xa2, 0x91, 0x4a, 0x27, 0x14, 0x81, 0xa5, 0x45, 0x02, 0xcb, 0xaf, 0x21,
+	0xf0, 0x2b, 0x0d, 0xd6, 0x32, 0xd3, 0xa4, 0x03, 0x75, 0x1a, 0x86, 0x98, 0x96, 0xb4, 0xd3, 0xd3,
+	0x92, 0xc4, 0x91, 0x26, 0xd4, 0x47, 0x34, 0x8a, 0x1c, 0x57, 0x66, 0x1c, 0x39, 0x24, 0xf7, 0xa0,
+	0x11, 0x4d, 0x5c, 0x97, 0x46, 0x78, 0xfb, 0x6c, 0x96, 0x31, 0x63, 0x2a, 0xc7, 0xbc, 0x9b, 0x2c,
+	0xda, 0x2a, 0xd0, 0x7a, 0x01, 0x46, 0x92, 0x37, 0x58, 0x3a, 0xa3, 0x2c, 0xd3, 0x09, 0xb7, 0xf2,
+	0x41, 0xe6, 0x6e, 0x51, 0x5a, 0x7e, 0xb7, 0xb0, 0x7e, 0x2f, 0x6b, 0x36, 0x67, 0x6a, 0x82, 0x2e,
+	0xab, 0xaf, 0xe0, 0x9b, 0x8c, 0x0b, 0xfd, 0xba, 0x99, 0xfa, 0xd5, 0x40, 0xf7, 0xa9, 0xce, 0xaa,
+	0xbc, 0xa6, 0xb3, 0x76, 0x61, 0xcd, 0x51, 0x1d, 0x2e, 0xb2, 0x49, 0xe1, 0x36, 0x65, 0xd1, 0x56,
+	0x4f, 0x89, 0xdd, 0xc2, 0x88, 0x9b, 0x93, 0x51, 0x3a, 0x93, 0x8c, 0xdf, 0x25, 0x55, 0xf9, 0x74,
+	0x31, 0x9b, 0x69, 0x60, 0xcf, 0xfb, 0xa3, 0x7c, 0x5e, 0x7f, 0x54, 0xce, 0xa4, 0xeb, 0x1f, 0xb2,
+	0xe5, 0xfb, 0x74, 0x85, 0x8b, 0x03, 0xf5, 0xff, 0x61, 0x6b, 0xff, 0xa5, 0x41, 0xb3, 0x28, 0xef,
+	0xb3, 0x78, 0x95, 0x79, 0x5f, 0xc6, 0xab, 0x1c, 0x17, 0xc6, 0xab, 0x62, 0x6e, 0x79, 0xa1, 0xb9,
+	0x95, 0xd4, 0xdc, 0x6c, 0x43, 0x52, 0x7d, 0xed, 0x86, 0x64, 0xde, 0xe8, 0xda, 0x99, 0x8c, 0xfe,
+	0x4b, 0x09, 0x8c, 0xa4, 0xf4, 0xb2, 0x7c, 0x37, 0x0c, 0xfa, 0xce, 0x90, 0xcd, 0xc8, 0x7c, 0x97,
+	0x4c, 0x90, 0xb7, 0x01, 0x42, 0x3a, 0x0a, 0x62, 0x8a, 0xcb, 0xbc, 0x23, 0x57, 0x66, 0x98, 0xbd,
+	0xe3, 0x60, 0xf0, 0x03, 0x67, 0x94, 0xd8, 0x2b, 0x86, 0xe4, 0x1a, 0xac, 0xf5, 0x65, 0x2d, 0xc2,
+	0x75, 0x6e, 0x79, 0x76, 0x92, 0x49, 0xf7, 0x9d, 0x11, 0x8d, 0xc6, 0x4e, 0x9f, 0xbb, 0xc0, 0xb0,
+	0xd3, 0x09, 0xb6, 0x03, 0xac, 0x2d, 0x40, 0xf2, 0x1a, 0xdf, 0x01, 0x39, 0x26, 0x16, 0xac, 0xca,
+	0xdd, 0x60, 0x97, 0x07, 0x2c, 0xbc, 0x86, 0x9d, 0x99, 0x53, 0x31, 0xc8, 0x43, 0xcf, 0x62, 0x90,
+	0x4f, 0x13, 0xea, 0xce, 0x60, 0x10, 0xd2, 0x28, 0xc2, 0xe2, 0x68, 0xd8, 0x72, 0x48, 0xbe, 0x03,
+	0x10, 0x3b, 0xa1, 0x4b, 0x63, 0xb4, 0x1d, 0xf2, 0x6d, 0xcf, 0x13, 0x3f, 0x7e, 0x1e, 0x76, 0xe3,
+	0xd0, 0xf3, 0x5d, 0x5b, 0x01, 0x5a, 0x7f, 0xd5, 0xd2, 0x8e, 0x2f, 0x71, 0x31, 0x2b, 0xfa, 0x07,
+	0x78, 0xab, 0x11, 0x2e, 0x4e, 0x26, 0x58, 0xae, 0xf5, 0x46, 0xe9, 0xf9, 0xe0, 0x03, 0x25, 0xc0,
+	0xca, 0x8b, 0x12, 0x40, 0x65, 0xe1, 0xa9, 0xa9, 0x9e, 0xf7, 0xd4, 0x9c, 0x2d, 0x80, 0xfe, 0x5d,
+	0x82, 0x9d, 0x82, 0x5e, 0xe4, 0xb4, 0x3c, 0x20, 0x03, 0xa5, 0xb4, 0x24, 0x50, 0xca, 0x4b, 0x03,
+	0xa5, 0xb2, 0x20, 0x50, 0x92, 0xd2, 0x52, 0xcd, 0x95, 0x96, 0x26, 0xd4, 0xc3, 0x89, 0x1f, 0x7b,
+	0x49, 0x0c, 0xc9, 0x21, 0x0b, 0xee, 0x2f, 0x83, 0xf0, 0x95, 0xe7, 0xbb, 0x0f, 0xbd, 0x50, 0x04,
+	0x90, 0x32, 0x43, 0x5e, 0x00, 0x60, 0x5f, 0xc5, 0x1f, 0x1c, 0x75, 0xac, 0xa4, 0x9d, 0xa5, 0xed,
+	0x18, 0x9f, 0x57, 0x9e, 0x1f, 0x15, 0x26, 0xe6, 0x2e, 0x6c, 0xe4, 0x96, 0x97, 0x5d, 0x26, 0xd6,
+	0xd4, 0xcb, 0xc4, 0x2f, 0x35, 0xd0, 0x9f, 0x05, 0x2e, 0x27, 0xfc, 0x00, 0x8c, 0xe4, 0x11, 0x59,
+	0x5c, 0x02, 0xcc, 0x16, 0x7f, 0x45, 0x6e, 0xc9, 0x57, 0xe4, 0xd6, 0xb1, 0x44, 0xd8, 0x29, 0x98,
+	0x5c, 0x87, 0x2a, 0x55, 0x2e, 0x01, 0xca, 0x53, 0xb1, 0x78, 0x94, 0xa3, 0xd9, 0x2e, 0xa0, 0xac,
+	0x74, 0x01, 0xd6, 0x2e, 0x6c, 0x7d, 0x16, 0xd1, 0xf0, 0x89, 0x1f, 0x33, 0xa8, 0x78, 0x2c, 0xbe,
+	0x01, 0x35, 0x0f, 0x27, 0x84, 0x22, 0x9b, 0x99, 0x73, 0xc2, 0x80, 0x62, 0xdd, 0xfa, 0x1e, 0xac,
+	0x8b, 0xfb, 0x8c, 0xa4, 0xbd, 0x95, 0x7d, 0xb8, 0x56, 0x1f, 0xe1, 0x38, 0x30, 0xf3, 0x7e, 0xdd,
+	0x81, 0x55, 0x75, 0x9a, 0x98, 0x50, 0xa7, 0x18, 0x99, 0xfc, 0x91, 0x50, 0x3f, 0x5a, 0xb1, 0xe5,
+	0xc4, 0x7e, 0x15, 0xca, 0x53, 0x67, 0x68, 0x3d, 0x85, 0x1a, 0x57, 0x82, 0x59, 0x94, 0xbe, 0x27,
+	0xea, 0xf2, 0xd9, 0x90, 0x40, 0x25, 0x9a, 0xf9, 0x7d, 0x71, 0xe5, 0xc2, 0x6f, 0x16, 0xc7, 0xe2,
+	0x29, 0xb1, 0x8c, 0xb3, 0x62, 0x64, 0x79, 0x00, 0x69, 0x07, 0x45, 0x0e, 0x60, 0x3d, 0xed, 0xa1,
+	0x94, 0x06, 0xee, 0x72, 0xf6, 0x08, 0x66, 0x20, 0x76, 0x8e, 0x84, 0x89, 0xe2, 0xe7, 0x4b, 0xd6,
+	0x12, 0x3e, 0xb2, 0x5e, 0x40, 0x43, 0xc9, 0x31, 0x4c, 0xcb, 0xe4, 0x19, 0xa5, 0x2a, 0xde, 0x4a,
+	0xb6, 0xd1, 0xed, 0x9f, 0x3b, 0x43, 0x91, 0x9a, 0xc5, 0x88, 0x9f, 0xc2, 0x90, 0xcd, 0x27, 0xd9,
+	0x83, 0x8d, 0xee, 0xfc, 0xa9, 0x0a, 0x1b, 0x5d, 0xf1, 0x03, 0x46, 0x97, 0x86, 0x53, 0xaf, 0x4f,
+	0xc9, 0x23, 0xd0, 0x1f, 0x53, 0xf9, 0xda, 0x30, 0x17, 0x3f, 0x87, 0xa3, 0x71, 0x3c, 0x33, 0xf3,
+	0x3f, 0x26, 0x58, 0x5b, 0xbf, 0xfa, 0xe3, 0xdf, 0x7f, 0x53, 0x6a, 0x10, 0xa3, 0x3d, 0xed, 0xb4,
+	0x71, 0x63, 0xc8, 0x27, 0xa0, 0x63, 0xf4, 0x3c, 0x0b, 0x5c, 0xa2, 0xf4, 0x85, 0x32, 0x5c, 0xcd,
+	0x05, 0x73, 0xd6, 0x25, 0x64, 0xb3, 0x41, 0xd6, 0x18, 0x1b, 0xde, 0xeb, 0x0f, 0x03, 0xf7, 0x86,
+	0x76, 0x5b, 0x23, 0x4f, 0xa1, 0x86, 0xec, 0xa2, 0x42, 0xa5, 0x16, 0x31, 0x24, 0xc8, 0x70, 0x95,
+	0x40, 0xc2, 0x30, 0xba, 0xad, 0x91, 0x1f, 0x41, 0xfd, 0xf0, 0xe7, 0xb4, 0x3f, 0x89, 0x29, 0xb9,
+	0x9c, 0x12, 0xcd, 0x45, 0xb1, 0x59, 0x20, 0xc9, 0xba, 0x8c, 0x5c, 0x2f, 0x59, 0x0d, 0xe4, 0xca,
+	0x39, 0x3d, 0x10, 0x01, 0x4d, 0x06, 0x60, 0xec, 0x4d, 0xe2, 0x00, 0x1b, 0x5d, 0xd2, 0x9c, 0x0b,
+	0xde, 0x65, 0xbc, 0xaf, 0x23, 0xef, 0x77, 0xcc, 0x6d, 0xc6, 0x1b, 0xe3, 0xb1, 0xcd, 0xee, 0xfc,
+	0x5f, 0x48, 0x31, 0x3c, 0xec, 0x49, 0x0f, 0x74, 0x26, 0x85, 0x15, 0x95, 0x73, 0x08, 0xb9, 0x86,
+	0x42, 0xde, 0x36, 0x2f, 0xe1, 0x76, 0xcd, 0xfc, 0xfe, 0x42, 0x19, 0x27, 0x00, 0x4c, 0x06, 0xef,
+	0x43, 0xcf, 0x21, 0xe5, 0x1b, 0x28, 0xe5, 0xaa, 0xb9, 0xc3, 0xa4, 0xf0, 0xf3, 0xb2, 0x50, 0xce,
+	0x73, 0xa8, 0x1d, 0x39, 0xfe, 0x60, 0x48, 0x49, 0x3e, 0xf3, 0x14, 0xb2, 0xbe, 0x82, 0xac, 0xb7,
+	0xad, 0xad, 0x74, 0x5f, 0xdb, 0x2f, 0x91, 0xc7, 0x03, 0xed, 0xbd, 0xfd, 0xbb, 0x3f, 0xec, 0xb8,
+	0x5e, 0xfc, 0x72, 0xd2, 0x6b, 0xf5, 0x83, 0x51, 0xfb, 0x31, 0x72, 0x48, 0x92, 0xf2, 0x71, 0x10,
+	0x0c, 0xa3, 0xe4, 0x67, 0x3b, 0xfe, 0xfb, 0x5a, 0x7b, 0xda, 0xf9, 0xb4, 0xdc, 0xab, 0xe1, 0xf7,
+	0xdd, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x26, 0x79, 0x74, 0xd7, 0x1b, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2814,7 +2816,7 @@ func NewSkaffoldServiceClient(cc grpc.ClientConnInterface) SkaffoldServiceClient
 
 func (c *skaffoldServiceClient) GetState(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*State, error) {
 	out := new(State)
-	err := c.cc.Invoke(ctx, "/proto.SkaffoldService/GetState", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/proto.v1.SkaffoldService/GetState", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2822,7 +2824,7 @@ func (c *skaffoldServiceClient) GetState(ctx context.Context, in *emptypb.Empty,
 }
 
 func (c *skaffoldServiceClient) EventLog(ctx context.Context, opts ...grpc.CallOption) (SkaffoldService_EventLogClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_SkaffoldService_serviceDesc.Streams[0], "/proto.SkaffoldService/EventLog", opts...)
+	stream, err := c.cc.NewStream(ctx, &_SkaffoldService_serviceDesc.Streams[0], "/proto.v1.SkaffoldService/EventLog", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2853,7 +2855,7 @@ func (x *skaffoldServiceEventLogClient) Recv() (*LogEntry, error) {
 }
 
 func (c *skaffoldServiceClient) Events(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (SkaffoldService_EventsClient, error) {
-	stream, err := c.cc.NewStream(ctx, &_SkaffoldService_serviceDesc.Streams[1], "/proto.SkaffoldService/Events", opts...)
+	stream, err := c.cc.NewStream(ctx, &_SkaffoldService_serviceDesc.Streams[1], "/proto.v1.SkaffoldService/Events", opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2886,7 +2888,7 @@ func (x *skaffoldServiceEventsClient) Recv() (*LogEntry, error) {
 
 func (c *skaffoldServiceClient) Execute(ctx context.Context, in *UserIntentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/proto.SkaffoldService/Execute", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/proto.v1.SkaffoldService/Execute", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2895,7 +2897,7 @@ func (c *skaffoldServiceClient) Execute(ctx context.Context, in *UserIntentReque
 
 func (c *skaffoldServiceClient) AutoBuild(ctx context.Context, in *TriggerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/proto.SkaffoldService/AutoBuild", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/proto.v1.SkaffoldService/AutoBuild", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2904,7 +2906,7 @@ func (c *skaffoldServiceClient) AutoBuild(ctx context.Context, in *TriggerReques
 
 func (c *skaffoldServiceClient) AutoSync(ctx context.Context, in *TriggerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/proto.SkaffoldService/AutoSync", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/proto.v1.SkaffoldService/AutoSync", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2913,7 +2915,7 @@ func (c *skaffoldServiceClient) AutoSync(ctx context.Context, in *TriggerRequest
 
 func (c *skaffoldServiceClient) AutoDeploy(ctx context.Context, in *TriggerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/proto.SkaffoldService/AutoDeploy", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/proto.v1.SkaffoldService/AutoDeploy", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2922,7 +2924,7 @@ func (c *skaffoldServiceClient) AutoDeploy(ctx context.Context, in *TriggerReque
 
 func (c *skaffoldServiceClient) Handle(ctx context.Context, in *Event, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	out := new(emptypb.Empty)
-	err := c.cc.Invoke(ctx, "/proto.SkaffoldService/Handle", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/proto.v1.SkaffoldService/Handle", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -2993,7 +2995,7 @@ func _SkaffoldService_GetState_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/proto.SkaffoldService/GetState",
+		FullMethod: "/proto.v1.SkaffoldService/GetState",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(SkaffoldServiceServer).GetState(ctx, req.(*emptypb.Empty))
@@ -3058,7 +3060,7 @@ func _SkaffoldService_Execute_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/proto.SkaffoldService/Execute",
+		FullMethod: "/proto.v1.SkaffoldService/Execute",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(SkaffoldServiceServer).Execute(ctx, req.(*UserIntentRequest))
@@ -3076,7 +3078,7 @@ func _SkaffoldService_AutoBuild_Handler(srv interface{}, ctx context.Context, de
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/proto.SkaffoldService/AutoBuild",
+		FullMethod: "/proto.v1.SkaffoldService/AutoBuild",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(SkaffoldServiceServer).AutoBuild(ctx, req.(*TriggerRequest))
@@ -3094,7 +3096,7 @@ func _SkaffoldService_AutoSync_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/proto.SkaffoldService/AutoSync",
+		FullMethod: "/proto.v1.SkaffoldService/AutoSync",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(SkaffoldServiceServer).AutoSync(ctx, req.(*TriggerRequest))
@@ -3112,7 +3114,7 @@ func _SkaffoldService_AutoDeploy_Handler(srv interface{}, ctx context.Context, d
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/proto.SkaffoldService/AutoDeploy",
+		FullMethod: "/proto.v1.SkaffoldService/AutoDeploy",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(SkaffoldServiceServer).AutoDeploy(ctx, req.(*TriggerRequest))
@@ -3130,7 +3132,7 @@ func _SkaffoldService_Handle_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/proto.SkaffoldService/Handle",
+		FullMethod: "/proto.v1.SkaffoldService/Handle",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(SkaffoldServiceServer).Handle(ctx, req.(*Event))
@@ -3139,7 +3141,7 @@ func _SkaffoldService_Handle_Handler(srv interface{}, ctx context.Context, dec f
 }
 
 var _SkaffoldService_serviceDesc = grpc.ServiceDesc{
-	ServiceName: "proto.SkaffoldService",
+	ServiceName: "proto.v1.SkaffoldService",
 	HandlerType: (*SkaffoldServiceServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
diff --git a/proto/v1/skaffold.pb.gw.go b/proto/v1/skaffold.pb.gw.go
index 3f4d86c5f93..3fbb0d761b8 100644
--- a/proto/v1/skaffold.pb.gw.go
+++ b/proto/v1/skaffold.pb.gw.go
@@ -2,11 +2,11 @@
 // source: v1/skaffold.proto
 
 /*
-Package proto is a reverse proxy.
+Package v1 is a reverse proxy.
 
 It translates gRPC into RESTful JSON APIs.
 */
-package proto
+package v1
 
 import (
 	"context"
diff --git a/proto/v1/skaffold.proto b/proto/v1/skaffold.proto
index 642205aa28a..335efc7894d 100644
--- a/proto/v1/skaffold.proto
+++ b/proto/v1/skaffold.proto
@@ -1,5 +1,7 @@
 syntax = "proto3";
-package proto;
+package proto.v1;
+
+option go_package = "github.com/GoogleContainerTools/skaffold/proto/v1";
 
 import "google/api/annotations.proto";
 import "google/protobuf/timestamp.proto";