diff --git a/pkg/skaffold/event/event.go b/pkg/skaffold/event/event.go index 39894f1d5cb..d38e42f724a 100644 --- a/pkg/skaffold/event/event.go +++ b/pkg/skaffold/event/event.go @@ -175,7 +175,7 @@ func BuildComplete(imageName string) { } // PortForwarded notifies that a remote port has been forwarded locally. -func PortForwarded(localPort, remotePort int32, podName, containerName, namespace string, portName string, resourceType, resourceName string) { +func PortForwarded(localPort, remotePort int32, podName, containerName, namespace string, portName string, resourceType, resourceName string, terminated bool) { go handler.handle(&proto.Event{ EventType: &proto.Event_PortEvent{ PortEvent: &proto.PortEvent{ @@ -187,6 +187,7 @@ func PortForwarded(localPort, remotePort int32, podName, containerName, namespac PortName: portName, ResourceType: resourceType, ResourceName: resourceName, + Terminated: terminated, }, }, }) diff --git a/pkg/skaffold/event/event_test.go b/pkg/skaffold/event/event_test.go index 2c80431064e..54442036f0b 100644 --- a/pkg/skaffold/event/event_test.go +++ b/pkg/skaffold/event/event_test.go @@ -159,7 +159,7 @@ func TestPortForwarded(t *testing.T) { } wait(t, func() bool { return handler.getState().ForwardedPorts["container"] == nil }) - PortForwarded(8080, 8888, "pod", "container", "ns", "portname", "resourceType", "resourceName") + PortForwarded(8080, 8888, "pod", "container", "ns", "portname", "resourceType", "resourceName", false) wait(t, func() bool { return handler.getState().ForwardedPorts["container"] != nil }) } diff --git a/pkg/skaffold/kubernetes/portforward/entry_manager.go b/pkg/skaffold/kubernetes/portforward/entry_manager.go index 6a66131b42a..5e6de3c2619 100644 --- a/pkg/skaffold/kubernetes/portforward/entry_manager.go +++ b/pkg/skaffold/kubernetes/portforward/entry_manager.go @@ -31,7 +31,7 @@ import ( var ( // For testing forwardingTimeoutTime = time.Minute - portForwardEvent = func(entry *portForwardEntry) { + portForwardEvent = func(entry *portForwardEntry, terminated bool) { // TODO priyawadhwa@, change event API to accept ports of type int event.PortForwarded( int32(entry.localPort), @@ -41,7 +41,8 @@ var ( entry.resource.Namespace, entry.portName, string(entry.resource.Type), - entry.resource.Name) + entry.resource.Name, + terminated) } ) @@ -182,7 +183,7 @@ func (b *EntryManager) forwardPortForwardEntry(ctx context.Context, entry *portF color.Default.Fprintln(b.output, fmt.Sprintf("Port forwarded %s/%s from remote port %d to local port %d", entry.resource.Type, entry.resource.Name, entry.resource.Port, entry.localPort)) - portForwardEvent(entry) + portForwardEvent(entry, false) return nil } @@ -198,6 +199,7 @@ func (b *EntryManager) Terminate(p *portForwardEntry) { b.forwardedResources.Delete(p.key()) b.forwardedPorts.Delete(p.localPort) b.EntryForwarder.Terminate(p) + portForwardEvent(p, true) } func (b *EntryManager) Retry(ctx context.Context, p *portForwardEntry) error { diff --git a/pkg/skaffold/kubernetes/portforward/entry_manager_test.go b/pkg/skaffold/kubernetes/portforward/entry_manager_test.go index 9595e58c70d..f7d00182dce 100644 --- a/pkg/skaffold/kubernetes/portforward/entry_manager_test.go +++ b/pkg/skaffold/kubernetes/portforward/entry_manager_test.go @@ -57,6 +57,10 @@ func TestStop(t *testing.T) { localPort: 9001, } + portForwardEventHandler := portForwardEvent + defer func() { portForwardEvent = portForwardEventHandler }() + portForwardEvent = func(entry *portForwardEntry, terminated bool) {} + em := NewEntryManager(ioutil.Discard) em.forwardedResources = newForwardedResources() diff --git a/pkg/skaffold/kubernetes/portforward/port_forward_integration.go b/pkg/skaffold/kubernetes/portforward/port_forward_integration.go index df900915ed4..416c070c124 100644 --- a/pkg/skaffold/kubernetes/portforward/port_forward_integration.go +++ b/pkg/skaffold/kubernetes/portforward/port_forward_integration.go @@ -35,7 +35,7 @@ func WhiteBoxPortForwardCycle(namespace string, t *testing.T) { em := NewEntryManager(os.Stdout) portForwardEventHandler := portForwardEvent defer func() { portForwardEvent = portForwardEventHandler }() - portForwardEvent = func(entry *portForwardEntry) {} + portForwardEvent = func(entry *portForwardEntry, terminated bool) {} ctx := context.Background() localPort := retrieveAvailablePort(9000, em.forwardedPorts) pfe := &portForwardEntry{ diff --git a/proto/skaffold.pb.go b/proto/skaffold.pb.go index 5370aa1a260..8f7fd6805d6 100644 --- a/proto/skaffold.pb.go +++ b/proto/skaffold.pb.go @@ -540,6 +540,7 @@ type PortEvent struct { PortName string `protobuf:"bytes,6,opt,name=portName,proto3" json:"portName,omitempty"` ResourceType string `protobuf:"bytes,7,opt,name=resourceType,proto3" json:"resourceType,omitempty"` ResourceName string `protobuf:"bytes,8,opt,name=resourceName,proto3" json:"resourceName,omitempty"` + Terminated bool `protobuf:"varint,9,opt,name=terminated,proto3" json:"terminated,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -626,6 +627,13 @@ func (m *PortEvent) GetResourceName() string { return "" } +func (m *PortEvent) GetTerminated() bool { + if m != nil { + return m.Terminated + } + return false +} + type LogEntry struct { Timestamp *timestamp.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` Event *Event `protobuf:"bytes,2,opt,name=event,proto3" json:"event,omitempty"` @@ -797,62 +805,63 @@ func init() { func init() { proto.RegisterFile("skaffold.proto", fileDescriptor_4f2d38e344f9dbf5) } var fileDescriptor_4f2d38e344f9dbf5 = []byte{ - // 868 bytes of a gzipped FileDescriptorProto + // 887 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xcd, 0x6e, 0x23, 0x45, - 0x10, 0x66, 0xc6, 0xb1, 0x33, 0x53, 0xce, 0xcf, 0xa6, 0x61, 0x57, 0xd6, 0x6c, 0x80, 0xd0, 0x62, - 0x51, 0xc4, 0xc1, 0xde, 0x4d, 0x10, 0xac, 0x22, 0x84, 0x44, 0x20, 0x6c, 0x40, 0x01, 0xa1, 0xf1, - 0x22, 0x71, 0x43, 0x1d, 0xbb, 0x6c, 0xac, 0x8c, 0xa7, 0x87, 0xe9, 0x76, 0xc0, 0x17, 0x0e, 0x1c, - 0xd9, 0x03, 0x07, 0x1e, 0x8d, 0x57, 0x40, 0x3c, 0x07, 0xea, 0xea, 0xee, 0xf9, 0xc9, 0x8f, 0xb4, - 0x27, 0x77, 0x55, 0x7d, 0xf5, 0x4d, 0x55, 0x7d, 0xdd, 0x65, 0xd8, 0x51, 0x57, 0x62, 0x36, 0x93, - 0xd9, 0x74, 0x58, 0x94, 0x52, 0x4b, 0xd6, 0xa5, 0x9f, 0x64, 0x7f, 0x2e, 0xe5, 0x3c, 0xc3, 0x91, - 0x28, 0x16, 0x23, 0x91, 0xe7, 0x52, 0x0b, 0xbd, 0x90, 0xb9, 0xb2, 0xa0, 0xe4, 0x5d, 0x17, 0x25, - 0xeb, 0x72, 0x35, 0x1b, 0xe9, 0xc5, 0x12, 0x95, 0x16, 0xcb, 0xc2, 0x01, 0x1e, 0xdf, 0x04, 0xe0, - 0xb2, 0xd0, 0x6b, 0x1b, 0xe4, 0xc7, 0xb0, 0x3d, 0xd6, 0x42, 0x63, 0x8a, 0xaa, 0x90, 0xb9, 0x42, - 0xc6, 0xa1, 0xab, 0x8c, 0x63, 0x10, 0x1c, 0x04, 0x87, 0xfd, 0xa3, 0x2d, 0x8b, 0x1b, 0x5a, 0x90, - 0x0d, 0xf1, 0x7d, 0x88, 0x2a, 0xfc, 0x03, 0xe8, 0x2c, 0xd5, 0x9c, 0xd0, 0x71, 0x6a, 0x8e, 0xfc, - 0x6d, 0xd8, 0x4c, 0xf1, 0x97, 0x15, 0x2a, 0xcd, 0x18, 0x6c, 0xe4, 0x62, 0x89, 0x2e, 0x4a, 0x67, - 0xfe, 0x57, 0x08, 0x5d, 0x62, 0x63, 0xcf, 0x00, 0x2e, 0x57, 0x8b, 0x6c, 0x3a, 0x6e, 0x7c, 0x6f, - 0xcf, 0x7d, 0xef, 0xb4, 0x0a, 0xa4, 0x0d, 0x10, 0xfb, 0x08, 0xfa, 0x53, 0x2c, 0x32, 0xb9, 0xb6, - 0x39, 0x21, 0xe5, 0x30, 0x97, 0xf3, 0x65, 0x1d, 0x49, 0x9b, 0x30, 0x76, 0x0e, 0x3b, 0x33, 0x59, - 0xfe, 0x2a, 0xca, 0x29, 0x4e, 0xbf, 0x97, 0xa5, 0x56, 0x83, 0xce, 0x41, 0xe7, 0xb0, 0x7f, 0x74, - 0xd0, 0x6c, 0x6e, 0xf8, 0x55, 0x0b, 0x72, 0x96, 0xeb, 0x72, 0x9d, 0xde, 0xc8, 0x4b, 0xc6, 0xf0, - 0xe6, 0x1d, 0x30, 0x33, 0x84, 0x2b, 0x5c, 0xfb, 0x21, 0x5c, 0xe1, 0x9a, 0x7d, 0x00, 0xdd, 0x6b, - 0x91, 0xad, 0x7c, 0x89, 0x0f, 0xdc, 0x97, 0x4c, 0xce, 0xd9, 0x35, 0xe6, 0x3a, 0xb5, 0xe1, 0x93, - 0xf0, 0x79, 0xc0, 0xff, 0x0c, 0x00, 0xea, 0x7e, 0xd9, 0x67, 0x10, 0x8b, 0x52, 0x2f, 0x66, 0x62, - 0xa2, 0xd5, 0x20, 0x68, 0x15, 0x5a, 0xa3, 0x86, 0x9f, 0x7b, 0x88, 0x2d, 0xb4, 0x4e, 0x49, 0x3e, - 0x85, 0x9d, 0x76, 0xf0, 0x8e, 0xf2, 0xde, 0x6a, 0x96, 0x17, 0x37, 0x8b, 0x79, 0x02, 0xfd, 0xc6, - 0x1c, 0xd9, 0x23, 0xe8, 0x19, 0xcd, 0x57, 0xca, 0x65, 0x3b, 0x8b, 0xff, 0x17, 0x40, 0x97, 0x1a, - 0x61, 0x4f, 0x21, 0x5e, 0xa2, 0x16, 0x64, 0x38, 0x11, 0x7d, 0xb7, 0xdf, 0x7a, 0xff, 0xf9, 0x1b, - 0x69, 0x0d, 0x62, 0xc7, 0x4e, 0x77, 0x9b, 0x12, 0xde, 0xd6, 0xdd, 0xe7, 0x34, 0x60, 0xec, 0x63, - 0xaf, 0xbc, 0xcd, 0xea, 0xdc, 0xa1, 0xbc, 0x4f, 0x6b, 0x02, 0x4d, 0x79, 0x85, 0x1f, 0xfa, 0x60, - 0xe3, 0x6e, 0x31, 0x4c, 0x79, 0x15, 0xe8, 0x74, 0x0b, 0x00, 0xcd, 0xe1, 0x27, 0xbd, 0x2e, 0x90, - 0xbf, 0x07, 0x71, 0xd5, 0x86, 0x19, 0x1b, 0x9a, 0x89, 0xba, 0x61, 0x58, 0x83, 0xa7, 0x4e, 0x3e, - 0x8b, 0x49, 0x20, 0xf2, 0x5a, 0x38, 0x58, 0x65, 0x37, 0xa6, 0x19, 0x36, 0xa7, 0x69, 0x04, 0xc2, - 0xb2, 0xa4, 0xa6, 0xe2, 0xd4, 0x1c, 0xf9, 0x27, 0x5e, 0x06, 0x4b, 0x7a, 0x8f, 0x0c, 0x3e, 0x31, - 0xac, 0x13, 0x5f, 0x85, 0x10, 0x57, 0x8d, 0xb1, 0x7d, 0x88, 0x33, 0x39, 0x11, 0x99, 0xf1, 0x50, - 0x6a, 0x37, 0xad, 0x1d, 0xec, 0x1d, 0x80, 0x12, 0x97, 0x52, 0x23, 0x85, 0x43, 0x0a, 0x37, 0x3c, - 0x6c, 0x00, 0x9b, 0x85, 0x9c, 0x7e, 0x67, 0x5e, 0xb0, 0x2d, 0xcd, 0x9b, 0xec, 0x7d, 0xd8, 0x9e, - 0xc8, 0x5c, 0x8b, 0x45, 0x8e, 0x25, 0xc5, 0x37, 0x28, 0xde, 0x76, 0x9a, 0xaf, 0x9b, 0x27, 0xaf, - 0x0a, 0x31, 0xc1, 0x41, 0x97, 0x10, 0xb5, 0xc3, 0x0c, 0xca, 0x0c, 0x9d, 0xd2, 0x7b, 0x76, 0x50, - 0xde, 0x66, 0x1c, 0xb6, 0x4a, 0x54, 0x72, 0x55, 0x4e, 0xf0, 0xe5, 0xba, 0xc0, 0xc1, 0x26, 0xc5, - 0x5b, 0xbe, 0x26, 0x86, 0x38, 0xa2, 0x36, 0xc6, 0xf8, 0xf8, 0xef, 0x10, 0x5d, 0xc8, 0xb9, 0x7d, - 0x05, 0xcf, 0x21, 0xae, 0x56, 0xa3, 0xbb, 0xa8, 0xc9, 0xd0, 0xee, 0xc6, 0xa1, 0xdf, 0x8d, 0xc3, - 0x97, 0x1e, 0x91, 0xd6, 0x60, 0xb3, 0x13, 0xb1, 0x71, 0x57, 0xfd, 0x4e, 0x74, 0x0f, 0x19, 0xdb, - 0x57, 0xa3, 0xd3, 0xbc, 0x1a, 0x27, 0xb0, 0xf7, 0x83, 0xc2, 0xf2, 0xeb, 0x5c, 0x1b, 0xa8, 0xdb, - 0x8a, 0x4f, 0xa0, 0xb7, 0x20, 0x87, 0xab, 0x62, 0xdb, 0xf1, 0x39, 0x94, 0x0b, 0xf2, 0x6f, 0xa0, - 0x67, 0x3d, 0x86, 0x9b, 0x5e, 0x02, 0xe1, 0xa3, 0xd4, 0x1a, 0x66, 0xb9, 0xaa, 0x75, 0x3e, 0xa1, - 0xa2, 0xa2, 0x94, 0xce, 0xe6, 0x9e, 0xd8, 0xcb, 0x4f, 0x65, 0x44, 0xa9, 0xb3, 0x8e, 0x5e, 0x75, - 0x60, 0x77, 0xec, 0xfe, 0x5c, 0xc6, 0x58, 0x5e, 0x2f, 0x26, 0xc8, 0xbe, 0x80, 0xe8, 0x05, 0x6a, - 0xf7, 0xcc, 0x6f, 0x0d, 0xe2, 0xcc, 0xfc, 0x49, 0x24, 0xad, 0xf5, 0xcf, 0xf7, 0xfe, 0xf8, 0xe7, - 0xdf, 0xbf, 0xc3, 0x3e, 0x8b, 0x47, 0xd7, 0xcf, 0x46, 0xf4, 0x57, 0xc0, 0x5e, 0x40, 0x44, 0x63, - 0xb8, 0x90, 0x73, 0xb6, 0xeb, 0xc0, 0x7e, 0xe2, 0xc9, 0x4d, 0x07, 0x7f, 0x48, 0x04, 0xbb, 0x6c, - 0xdb, 0x10, 0xd8, 0x47, 0x96, 0xc9, 0xf9, 0x61, 0xf0, 0x34, 0x60, 0xa7, 0xd0, 0x23, 0x22, 0xf5, - 0x1a, 0x34, 0x8c, 0x68, 0xb6, 0x18, 0x54, 0x34, 0x8a, 0x38, 0x2e, 0xa0, 0x77, 0x2e, 0xf2, 0x69, - 0x86, 0xac, 0x25, 0x51, 0x72, 0x4f, 0x77, 0x7c, 0x9f, 0x78, 0x1e, 0xf1, 0xbd, 0x9a, 0x67, 0xf4, - 0x33, 0x11, 0x9c, 0x04, 0x1f, 0xb2, 0x1f, 0x61, 0xf3, 0xec, 0x37, 0x9c, 0xac, 0x34, 0xb2, 0x81, - 0xa3, 0xbb, 0xa5, 0xe5, 0xbd, 0xd4, 0x8f, 0x89, 0xfa, 0x21, 0xef, 0x13, 0xb5, 0xa5, 0x39, 0x71, - 0xca, 0x5e, 0xf6, 0x08, 0x7c, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x99, 0x57, 0x1f, 0xfd, - 0xf0, 0x07, 0x00, 0x00, + 0x10, 0x66, 0xec, 0xd8, 0x99, 0x29, 0xe7, 0x67, 0xd3, 0xb0, 0xab, 0xd1, 0x6c, 0x58, 0x42, 0x8b, + 0x45, 0x11, 0x07, 0x7b, 0x37, 0x41, 0xb0, 0x8a, 0x10, 0x12, 0x81, 0xb0, 0x01, 0x05, 0x84, 0xc6, + 0x8b, 0xc4, 0x0d, 0x75, 0xec, 0xb2, 0x19, 0x65, 0x3c, 0x3d, 0x4c, 0xb7, 0x03, 0xbe, 0x70, 0xe0, + 0x08, 0x07, 0x0e, 0x3c, 0x06, 0x8f, 0xc3, 0x2b, 0x20, 0x9e, 0x03, 0x75, 0x75, 0xb7, 0x67, 0x26, + 0x3f, 0x12, 0xa7, 0xe9, 0xaa, 0xfa, 0xea, 0x9b, 0xea, 0xfa, 0xba, 0xab, 0x61, 0x47, 0x5d, 0x89, + 0xd9, 0x4c, 0xe6, 0xd3, 0x61, 0x59, 0x49, 0x2d, 0x59, 0x8f, 0x3e, 0xc9, 0xfe, 0x5c, 0xca, 0x79, + 0x8e, 0x23, 0x51, 0x66, 0x23, 0x51, 0x14, 0x52, 0x0b, 0x9d, 0xc9, 0x42, 0x59, 0x50, 0xf2, 0x96, + 0x8b, 0x92, 0x75, 0xb9, 0x9c, 0x8d, 0x74, 0xb6, 0x40, 0xa5, 0xc5, 0xa2, 0x74, 0x80, 0xc7, 0x37, + 0x01, 0xb8, 0x28, 0xf5, 0xca, 0x06, 0xf9, 0x31, 0x6c, 0x8f, 0xb5, 0xd0, 0x98, 0xa2, 0x2a, 0x65, + 0xa1, 0x90, 0x71, 0xe8, 0x29, 0xe3, 0x88, 0x83, 0x83, 0xe0, 0x70, 0x70, 0xb4, 0x65, 0x71, 0x43, + 0x0b, 0xb2, 0x21, 0xbe, 0x0f, 0xe1, 0x1a, 0xff, 0x00, 0xba, 0x0b, 0x35, 0x27, 0x74, 0x94, 0x9a, + 0x25, 0x7f, 0x13, 0x36, 0x53, 0xfc, 0x71, 0x89, 0x4a, 0x33, 0x06, 0x1b, 0x85, 0x58, 0xa0, 0x8b, + 0xd2, 0x9a, 0xff, 0xd1, 0x81, 0x1e, 0xb1, 0xb1, 0xe7, 0x00, 0x97, 0xcb, 0x2c, 0x9f, 0x8e, 0x1b, + 0xff, 0xdb, 0x73, 0xff, 0x3b, 0x5d, 0x07, 0xd2, 0x06, 0x88, 0xbd, 0x0f, 0x83, 0x29, 0x96, 0xb9, + 0x5c, 0xd9, 0x9c, 0x0e, 0xe5, 0x30, 0x97, 0xf3, 0x59, 0x1d, 0x49, 0x9b, 0x30, 0x76, 0x0e, 0x3b, + 0x33, 0x59, 0xfd, 0x24, 0xaa, 0x29, 0x4e, 0xbf, 0x91, 0x95, 0x56, 0x71, 0xf7, 0xa0, 0x7b, 0x38, + 0x38, 0x3a, 0x68, 0x6e, 0x6e, 0xf8, 0x79, 0x0b, 0x72, 0x56, 0xe8, 0x6a, 0x95, 0xde, 0xc8, 0x4b, + 0xc6, 0xf0, 0xfa, 0x1d, 0x30, 0xd3, 0x84, 0x2b, 0x5c, 0xf9, 0x26, 0x5c, 0xe1, 0x8a, 0xbd, 0x0b, + 0xbd, 0x6b, 0x91, 0x2f, 0x7d, 0x89, 0x0f, 0xdc, 0x9f, 0x4c, 0xce, 0xd9, 0x35, 0x16, 0x3a, 0xb5, + 0xe1, 0x93, 0xce, 0x8b, 0x80, 0xff, 0x16, 0x00, 0xd4, 0xfb, 0x65, 0x1f, 0x43, 0x24, 0x2a, 0x9d, + 0xcd, 0xc4, 0x44, 0xab, 0x38, 0x68, 0x15, 0x5a, 0xa3, 0x86, 0x9f, 0x78, 0x88, 0x2d, 0xb4, 0x4e, + 0x49, 0x3e, 0x82, 0x9d, 0x76, 0xf0, 0x8e, 0xf2, 0xde, 0x68, 0x96, 0x17, 0x35, 0x8b, 0x79, 0x0a, + 0x83, 0x46, 0x1f, 0xd9, 0x23, 0xe8, 0x1b, 0xcd, 0x97, 0xca, 0x65, 0x3b, 0x8b, 0xff, 0x1b, 0x40, + 0x8f, 0x36, 0xc2, 0x9e, 0x41, 0xb4, 0x40, 0x2d, 0xc8, 0x70, 0x22, 0xfa, 0xdd, 0x7e, 0xe5, 0xfd, + 0xe7, 0xaf, 0xa5, 0x35, 0x88, 0x1d, 0x3b, 0xdd, 0x6d, 0x4a, 0xe7, 0xb6, 0xee, 0x3e, 0xa7, 0x01, + 0x63, 0x1f, 0x78, 0xe5, 0x6d, 0x56, 0xf7, 0x0e, 0xe5, 0x7d, 0x5a, 0x13, 0x68, 0xca, 0x2b, 0x7d, + 0xd3, 0xe3, 0x8d, 0xbb, 0xc5, 0x30, 0xe5, 0xad, 0x41, 0xa7, 0x5b, 0x00, 0x68, 0x16, 0xdf, 0xeb, + 0x55, 0x89, 0xfc, 0x6d, 0x88, 0xd6, 0xdb, 0x30, 0x6d, 0x43, 0xd3, 0x51, 0xd7, 0x0c, 0x6b, 0xf0, + 0xd4, 0xc9, 0x67, 0x31, 0x09, 0x84, 0x5e, 0x0b, 0x07, 0x5b, 0xdb, 0x8d, 0x6e, 0x76, 0x9a, 0xdd, + 0x34, 0x02, 0x61, 0x55, 0xd1, 0xa6, 0xa2, 0xd4, 0x2c, 0xf9, 0x87, 0x5e, 0x06, 0x4b, 0x7a, 0x8f, + 0x0c, 0x3e, 0xb1, 0x53, 0x27, 0xfe, 0xd5, 0x81, 0x68, 0xbd, 0x31, 0xb6, 0x0f, 0x51, 0x2e, 0x27, + 0x22, 0x37, 0x1e, 0x4a, 0xed, 0xa5, 0xb5, 0x83, 0x3d, 0x01, 0xa8, 0x70, 0x21, 0x35, 0x52, 0xb8, + 0x43, 0xe1, 0x86, 0x87, 0xc5, 0xb0, 0x59, 0xca, 0xe9, 0xd7, 0xe6, 0x06, 0xdb, 0xd2, 0xbc, 0xc9, + 0xde, 0x81, 0xed, 0x89, 0x2c, 0xb4, 0xc8, 0x0a, 0xac, 0x28, 0xbe, 0x41, 0xf1, 0xb6, 0xd3, 0xfc, + 0xdd, 0x5c, 0x79, 0x55, 0x8a, 0x09, 0xc6, 0x3d, 0x42, 0xd4, 0x0e, 0xd3, 0x28, 0xd3, 0x74, 0x4a, + 0xef, 0xdb, 0x46, 0x79, 0x9b, 0x71, 0xd8, 0xaa, 0x50, 0xc9, 0x65, 0x35, 0xc1, 0x57, 0xab, 0x12, + 0xe3, 0x4d, 0x8a, 0xb7, 0x7c, 0x4d, 0x0c, 0x71, 0x84, 0x6d, 0x0c, 0xf1, 0x3c, 0x01, 0xd0, 0x58, + 0x2d, 0xb2, 0x42, 0x68, 0x9c, 0xc6, 0xd1, 0x41, 0x70, 0x18, 0xa6, 0x0d, 0x0f, 0xff, 0x05, 0xc2, + 0x0b, 0x39, 0xb7, 0xb7, 0xe4, 0x05, 0x44, 0xeb, 0xd1, 0xe9, 0x0e, 0x72, 0x32, 0xb4, 0xb3, 0x73, + 0xe8, 0x67, 0xe7, 0xf0, 0x95, 0x47, 0xa4, 0x35, 0xd8, 0xcc, 0x4c, 0x6c, 0x9c, 0x65, 0x3f, 0x33, + 0xdd, 0x45, 0xc7, 0xf6, 0xd1, 0xe9, 0x36, 0x8f, 0xce, 0x09, 0xec, 0x7d, 0xab, 0xb0, 0xfa, 0xa2, + 0xd0, 0x06, 0xea, 0xa6, 0xe6, 0x53, 0xe8, 0x67, 0xe4, 0x70, 0x55, 0x6c, 0x3b, 0x3e, 0x87, 0x72, + 0x41, 0xfe, 0x25, 0xf4, 0xad, 0xc7, 0x70, 0xd3, 0x4d, 0x21, 0x7c, 0x98, 0x5a, 0xc3, 0x0c, 0x5f, + 0xb5, 0x2a, 0x26, 0x54, 0x54, 0x98, 0xd2, 0xda, 0x9c, 0x23, 0x7b, 0x39, 0xa8, 0x8c, 0x30, 0x75, + 0xd6, 0xd1, 0xef, 0x5d, 0xd8, 0x1d, 0xbb, 0xc7, 0x67, 0x8c, 0xd5, 0x75, 0x36, 0x41, 0xf6, 0x29, + 0x84, 0x2f, 0x51, 0xbb, 0x31, 0x70, 0xab, 0x11, 0x67, 0xe6, 0x11, 0x49, 0x5a, 0xcf, 0x03, 0xdf, + 0xfb, 0xf5, 0xef, 0x7f, 0xfe, 0xec, 0x0c, 0x58, 0x34, 0xba, 0x7e, 0x3e, 0xa2, 0xa7, 0x82, 0xbd, + 0x84, 0x90, 0xda, 0x70, 0x21, 0xe7, 0x6c, 0xd7, 0x81, 0x7d, 0xc7, 0x93, 0x9b, 0x0e, 0xfe, 0x90, + 0x08, 0x76, 0xd9, 0xb6, 0x21, 0xb0, 0x97, 0x30, 0x97, 0xf3, 0xc3, 0xe0, 0x59, 0xc0, 0x4e, 0xa1, + 0x4f, 0x44, 0xea, 0x7f, 0xd0, 0x30, 0xa2, 0xd9, 0x62, 0xb0, 0xa6, 0x51, 0xc4, 0x71, 0x01, 0xfd, + 0x73, 0x51, 0x4c, 0x73, 0x64, 0x2d, 0x89, 0x92, 0x7b, 0x76, 0xc7, 0xf7, 0x89, 0xe7, 0x11, 0xdf, + 0xab, 0x79, 0x46, 0x3f, 0x10, 0xc1, 0x49, 0xf0, 0x1e, 0xfb, 0x0e, 0x36, 0xcf, 0x7e, 0xc6, 0xc9, + 0x52, 0x23, 0x8b, 0x1d, 0xdd, 0x2d, 0x2d, 0xef, 0xa5, 0x7e, 0x4c, 0xd4, 0x0f, 0xf9, 0x80, 0xa8, + 0x2d, 0xcd, 0x89, 0x53, 0xf6, 0xb2, 0x4f, 0xe0, 0xe3, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xee, + 0x9e, 0x0b, 0xbd, 0x10, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/skaffold.proto b/proto/skaffold.proto index dd03a610687..239e22bd77f 100644 --- a/proto/skaffold.proto +++ b/proto/skaffold.proto @@ -67,6 +67,7 @@ message PortEvent { string portName = 6; string resourceType=7; string resourceName=8; + bool terminated=9; } message LogEntry {