Datadog defines configuration for a Datadog tracer.
+
+
+
+
+| Field |
+Type |
+Description |
+
+
+
+
+address |
+string |
+
+ Address of the Datadog Agent.
+
|
diff --git a/mesh/v1alpha1/proxy.pb.go b/mesh/v1alpha1/proxy.pb.go
index 1a5eba036d..c40a4ce396 100644
--- a/mesh/v1alpha1/proxy.pb.go
+++ b/mesh/v1alpha1/proxy.pb.go
@@ -86,6 +86,7 @@ type Tracing struct {
// Types that are valid to be assigned to Tracer:
// *Tracing_Zipkin_
// *Tracing_Lightstep_
+ // *Tracing_Datadog_
Tracer isTracing_Tracer `protobuf_oneof:"tracer"`
}
@@ -106,9 +107,13 @@ type Tracing_Zipkin_ struct {
type Tracing_Lightstep_ struct {
Lightstep *Tracing_Lightstep `protobuf:"bytes,2,opt,name=lightstep,oneof"`
}
+type Tracing_Datadog_ struct {
+ Datadog *Tracing_Datadog `protobuf:"bytes,3,opt,name=datadog,oneof"`
+}
func (*Tracing_Zipkin_) isTracing_Tracer() {}
func (*Tracing_Lightstep_) isTracing_Tracer() {}
+func (*Tracing_Datadog_) isTracing_Tracer() {}
func (m *Tracing) GetTracer() isTracing_Tracer {
if m != nil {
@@ -131,11 +136,19 @@ func (m *Tracing) GetLightstep() *Tracing_Lightstep {
return nil
}
+func (m *Tracing) GetDatadog() *Tracing_Datadog {
+ if x, ok := m.GetTracer().(*Tracing_Datadog_); ok {
+ return x.Datadog
+ }
+ return nil
+}
+
// XXX_OneofFuncs is for the internal use of the proto package.
func (*Tracing) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
return _Tracing_OneofMarshaler, _Tracing_OneofUnmarshaler, _Tracing_OneofSizer, []interface{}{
(*Tracing_Zipkin_)(nil),
(*Tracing_Lightstep_)(nil),
+ (*Tracing_Datadog_)(nil),
}
}
@@ -153,6 +166,11 @@ func _Tracing_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
if err := b.EncodeMessage(x.Lightstep); err != nil {
return err
}
+ case *Tracing_Datadog_:
+ _ = b.EncodeVarint(3<<3 | proto.WireBytes)
+ if err := b.EncodeMessage(x.Datadog); err != nil {
+ return err
+ }
case nil:
default:
return fmt.Errorf("Tracing.Tracer has unexpected type %T", x)
@@ -179,6 +197,14 @@ func _Tracing_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer
err := b.DecodeMessage(msg)
m.Tracer = &Tracing_Lightstep_{msg}
return true, err
+ case 3: // tracer.datadog
+ if wire != proto.WireBytes {
+ return true, proto.ErrInternalBadWireType
+ }
+ msg := new(Tracing_Datadog)
+ err := b.DecodeMessage(msg)
+ m.Tracer = &Tracing_Datadog_{msg}
+ return true, err
default:
return false, nil
}
@@ -198,6 +224,11 @@ func _Tracing_OneofSizer(msg proto.Message) (n int) {
n += proto.SizeVarint(2<<3 | proto.WireBytes)
n += proto.SizeVarint(uint64(s))
n += s
+ case *Tracing_Datadog_:
+ s := proto.Size(x.Datadog)
+ n += proto.SizeVarint(3<<3 | proto.WireBytes)
+ n += proto.SizeVarint(uint64(s))
+ n += s
case nil:
default:
panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
@@ -268,6 +299,24 @@ func (m *Tracing_Lightstep) GetCacertPath() string {
return ""
}
+// Datadog defines configuration for a Datadog tracer.
+type Tracing_Datadog struct {
+ // Address of the Datadog Agent.
+ Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
+}
+
+func (m *Tracing_Datadog) Reset() { *m = Tracing_Datadog{} }
+func (m *Tracing_Datadog) String() string { return proto.CompactTextString(m) }
+func (*Tracing_Datadog) ProtoMessage() {}
+func (*Tracing_Datadog) Descriptor() ([]byte, []int) { return fileDescriptorProxy, []int{0, 2} }
+
+func (m *Tracing_Datadog) GetAddress() string {
+ if m != nil {
+ return m.Address
+ }
+ return ""
+}
+
// ProxyConfig defines variables for individual Envoy instances.
type ProxyConfig struct {
// Path to the generated configuration file directory.
@@ -486,6 +535,7 @@ func init() {
proto.RegisterType((*Tracing)(nil), "istio.mesh.v1alpha1.Tracing")
proto.RegisterType((*Tracing_Zipkin)(nil), "istio.mesh.v1alpha1.Tracing.Zipkin")
proto.RegisterType((*Tracing_Lightstep)(nil), "istio.mesh.v1alpha1.Tracing.Lightstep")
+ proto.RegisterType((*Tracing_Datadog)(nil), "istio.mesh.v1alpha1.Tracing.Datadog")
proto.RegisterType((*ProxyConfig)(nil), "istio.mesh.v1alpha1.ProxyConfig")
proto.RegisterEnum("istio.mesh.v1alpha1.AuthenticationPolicy", AuthenticationPolicy_name, AuthenticationPolicy_value)
proto.RegisterEnum("istio.mesh.v1alpha1.ProxyConfig_InboundInterceptionMode", ProxyConfig_InboundInterceptionMode_name, ProxyConfig_InboundInterceptionMode_value)
@@ -543,6 +593,20 @@ func (m *Tracing_Lightstep_) MarshalTo(dAtA []byte) (int, error) {
}
return i, nil
}
+func (m *Tracing_Datadog_) MarshalTo(dAtA []byte) (int, error) {
+ i := 0
+ if m.Datadog != nil {
+ dAtA[i] = 0x1a
+ i++
+ i = encodeVarintProxy(dAtA, i, uint64(m.Datadog.Size()))
+ n4, err := m.Datadog.MarshalTo(dAtA[i:])
+ if err != nil {
+ return 0, err
+ }
+ i += n4
+ }
+ return i, nil
+}
func (m *Tracing_Zipkin) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
@@ -613,6 +677,30 @@ func (m *Tracing_Lightstep) MarshalTo(dAtA []byte) (int, error) {
return i, nil
}
+func (m *Tracing_Datadog) Marshal() (dAtA []byte, err error) {
+ size := m.Size()
+ dAtA = make([]byte, size)
+ n, err := m.MarshalTo(dAtA)
+ if err != nil {
+ return nil, err
+ }
+ return dAtA[:n], nil
+}
+
+func (m *Tracing_Datadog) MarshalTo(dAtA []byte) (int, error) {
+ var i int
+ _ = i
+ var l int
+ _ = l
+ if len(m.Address) > 0 {
+ dAtA[i] = 0xa
+ i++
+ i = encodeVarintProxy(dAtA, i, uint64(len(m.Address)))
+ i += copy(dAtA[i:], m.Address)
+ }
+ return i, nil
+}
+
func (m *ProxyConfig) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
@@ -650,21 +738,21 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) {
dAtA[i] = 0x22
i++
i = encodeVarintProxy(dAtA, i, uint64(m.DrainDuration.Size()))
- n4, err := m.DrainDuration.MarshalTo(dAtA[i:])
+ n5, err := m.DrainDuration.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n4
+ i += n5
}
if m.ParentShutdownDuration != nil {
dAtA[i] = 0x2a
i++
i = encodeVarintProxy(dAtA, i, uint64(m.ParentShutdownDuration.Size()))
- n5, err := m.ParentShutdownDuration.MarshalTo(dAtA[i:])
+ n6, err := m.ParentShutdownDuration.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n5
+ i += n6
}
if len(m.DiscoveryAddress) > 0 {
dAtA[i] = 0x32
@@ -676,11 +764,11 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) {
dAtA[i] = 0x3a
i++
i = encodeVarintProxy(dAtA, i, uint64(m.DiscoveryRefreshDelay.Size()))
- n6, err := m.DiscoveryRefreshDelay.MarshalTo(dAtA[i:])
+ n7, err := m.DiscoveryRefreshDelay.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n6
+ i += n7
}
if len(m.ZipkinAddress) > 0 {
dAtA[i] = 0x42
@@ -692,11 +780,11 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) {
dAtA[i] = 0x4a
i++
i = encodeVarintProxy(dAtA, i, uint64(m.ConnectTimeout.Size()))
- n7, err := m.ConnectTimeout.MarshalTo(dAtA[i:])
+ n8, err := m.ConnectTimeout.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n7
+ i += n8
}
if len(m.StatsdUdpAddress) > 0 {
dAtA[i] = 0x52
@@ -759,11 +847,11 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) {
dAtA[i] = 0x1
i++
i = encodeVarintProxy(dAtA, i, uint64(m.Tracing.Size()))
- n8, err := m.Tracing.MarshalTo(dAtA[i:])
+ n9, err := m.Tracing.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
- i += n8
+ i += n9
}
if len(m.EnvoyMetricsServiceAddress) > 0 {
dAtA[i] = 0xa2
@@ -812,6 +900,15 @@ func (m *Tracing_Lightstep_) Size() (n int) {
}
return n
}
+func (m *Tracing_Datadog_) Size() (n int) {
+ var l int
+ _ = l
+ if m.Datadog != nil {
+ l = m.Datadog.Size()
+ n += 1 + l + sovProxy(uint64(l))
+ }
+ return n
+}
func (m *Tracing_Zipkin) Size() (n int) {
var l int
_ = l
@@ -843,6 +940,16 @@ func (m *Tracing_Lightstep) Size() (n int) {
return n
}
+func (m *Tracing_Datadog) Size() (n int) {
+ var l int
+ _ = l
+ l = len(m.Address)
+ if l > 0 {
+ n += 1 + l + sovProxy(uint64(l))
+ }
+ return n
+}
+
func (m *ProxyConfig) Size() (n int) {
var l int
_ = l
@@ -1030,6 +1137,38 @@ func (m *Tracing) Unmarshal(dAtA []byte) error {
}
m.Tracer = &Tracing_Lightstep_{v}
iNdEx = postIndex
+ case 3:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Datadog", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowProxy
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= (int(b) & 0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return ErrInvalidLengthProxy
+ }
+ postIndex := iNdEx + msglen
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ v := &Tracing_Datadog{}
+ if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ m.Tracer = &Tracing_Datadog_{v}
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipProxy(dAtA[iNdEx:])
@@ -1287,6 +1426,85 @@ func (m *Tracing_Lightstep) Unmarshal(dAtA []byte) error {
}
return nil
}
+func (m *Tracing_Datadog) Unmarshal(dAtA []byte) error {
+ l := len(dAtA)
+ iNdEx := 0
+ for iNdEx < l {
+ preIndex := iNdEx
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowProxy
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ wire |= (uint64(b) & 0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ fieldNum := int32(wire >> 3)
+ wireType := int(wire & 0x7)
+ if wireType == 4 {
+ return fmt.Errorf("proto: Datadog: wiretype end group for non-group")
+ }
+ if fieldNum <= 0 {
+ return fmt.Errorf("proto: Datadog: illegal tag %d (wire type %d)", fieldNum, wire)
+ }
+ switch fieldNum {
+ case 1:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowProxy
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ stringLen |= (uint64(b) & 0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ intStringLen := int(stringLen)
+ if intStringLen < 0 {
+ return ErrInvalidLengthProxy
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Address = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ default:
+ iNdEx = preIndex
+ skippy, err := skipProxy(dAtA[iNdEx:])
+ if err != nil {
+ return err
+ }
+ if skippy < 0 {
+ return ErrInvalidLengthProxy
+ }
+ if (iNdEx + skippy) > l {
+ return io.ErrUnexpectedEOF
+ }
+ iNdEx += skippy
+ }
+ }
+
+ if iNdEx > l {
+ return io.ErrUnexpectedEOF
+ }
+ return nil
+}
func (m *ProxyConfig) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
@@ -1995,61 +2213,63 @@ var (
func init() { proto.RegisterFile("mesh/v1alpha1/proxy.proto", fileDescriptorProxy) }
var fileDescriptorProxy = []byte{
- // 892 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x5f, 0x6f, 0xdb, 0xb6,
- 0x17, 0x8d, 0xf2, 0x6b, 0xfd, 0xe7, 0x3a, 0x71, 0x14, 0xb6, 0xbf, 0x54, 0x31, 0xb6, 0xcc, 0xcb,
- 0x80, 0xcd, 0xdd, 0x06, 0x19, 0x4d, 0x81, 0x61, 0x2f, 0x1b, 0x66, 0x27, 0x29, 0x62, 0x20, 0x49,
- 0x0d, 0xc5, 0x01, 0xb6, 0xbc, 0x10, 0xb4, 0x74, 0x63, 0x11, 0x95, 0x49, 0x81, 0xa2, 0xbc, 0xb9,
- 0x6f, 0xfb, 0x6a, 0x03, 0x06, 0xec, 0x71, 0x1f, 0x61, 0xc8, 0xd3, 0x3e, 0xc6, 0x20, 0x52, 0x72,
- 0xbd, 0x21, 0x6d, 0xde, 0xcc, 0xc3, 0x73, 0xae, 0xce, 0x21, 0xef, 0xa5, 0x61, 0x7f, 0x8e, 0x59,
- 0xdc, 0x5f, 0xbc, 0x60, 0x49, 0x1a, 0xb3, 0x17, 0xfd, 0x54, 0xc9, 0x5f, 0x96, 0x7e, 0xaa, 0xa4,
- 0x96, 0xe4, 0x09, 0xcf, 0x34, 0x97, 0x7e, 0x41, 0xf0, 0x2b, 0x42, 0xe7, 0x60, 0x26, 0xe5, 0x2c,
- 0xc1, 0xbe, 0xa1, 0x4c, 0xf3, 0xdb, 0x7e, 0x94, 0x2b, 0xa6, 0xb9, 0x14, 0x56, 0x74, 0xf8, 0xdb,
- 0x26, 0xd4, 0x27, 0x8a, 0x85, 0x5c, 0xcc, 0xc8, 0x77, 0x50, 0x7b, 0xcb, 0xd3, 0x37, 0x5c, 0x78,
- 0x4e, 0xd7, 0xe9, 0xb5, 0x8e, 0x3e, 0xf3, 0xef, 0xa9, 0xe8, 0x97, 0x6c, 0xff, 0xc6, 0x50, 0xcf,
- 0x36, 0x82, 0x52, 0x44, 0x5e, 0x41, 0x33, 0xe1, 0xb3, 0x58, 0x67, 0x1a, 0x53, 0x6f, 0xd3, 0x54,
- 0xf8, 0xfc, 0x83, 0x15, 0xce, 0x2b, 0xf6, 0xd9, 0x46, 0xf0, 0x4e, 0xda, 0x39, 0x84, 0x9a, 0xad,
- 0x4d, 0x3c, 0xa8, 0xb3, 0x28, 0x52, 0x98, 0x65, 0xc6, 0x51, 0x33, 0xa8, 0x96, 0x9d, 0x5f, 0x1d,
- 0x68, 0xae, 0xe4, 0xef, 0xe7, 0x91, 0x4f, 0x61, 0x8b, 0x85, 0x21, 0x66, 0x19, 0xd5, 0xf2, 0x0d,
- 0x0a, 0x63, 0xab, 0x19, 0xb4, 0x2c, 0x36, 0x29, 0x20, 0xb2, 0x07, 0xb5, 0x0c, 0xc3, 0x5c, 0xa1,
- 0xf7, 0xbf, 0xae, 0xd3, 0x6b, 0x04, 0xe5, 0x8a, 0x7c, 0x02, 0xad, 0x90, 0x85, 0xa8, 0x34, 0x4d,
- 0x99, 0x8e, 0xbd, 0x47, 0x46, 0x09, 0x16, 0x1a, 0x33, 0x1d, 0x0f, 0x1b, 0x50, 0xd3, 0xaa, 0x58,
- 0x1e, 0xfe, 0xde, 0x84, 0xd6, 0xb8, 0xb8, 0x89, 0x63, 0x29, 0x6e, 0xf9, 0xcc, 0x48, 0xcd, 0x2f,
- 0x2b, 0x75, 0x4a, 0xa9, 0x81, 0x0a, 0x69, 0x41, 0x98, 0x72, 0xc1, 0xd4, 0xd2, 0x12, 0xac, 0x2b,
- 0xb0, 0x90, 0x21, 0x7c, 0x01, 0x3b, 0x19, 0xaa, 0x05, 0x0f, 0x91, 0x86, 0x49, 0x9e, 0x69, 0x54,
- 0xc6, 0x5d, 0x33, 0x68, 0x97, 0xf0, 0xb1, 0x45, 0xc9, 0x0f, 0xd0, 0x8e, 0x14, 0xe3, 0x82, 0x56,
- 0xf7, 0x6a, 0x8c, 0xb6, 0x8e, 0xf6, 0x7d, 0x7b, 0xf1, 0x7e, 0x75, 0xf1, 0xfe, 0x49, 0x49, 0x08,
- 0xb6, 0x8d, 0xa0, 0x5a, 0x92, 0x2b, 0xf0, 0x52, 0xa6, 0x50, 0x68, 0x9a, 0xc5, 0xb9, 0x8e, 0xe4,
- 0xcf, 0x6b, 0xb5, 0x1e, 0x3f, 0x54, 0x6b, 0xcf, 0x4a, 0xaf, 0x4a, 0xe5, 0xaa, 0xe8, 0x57, 0xb0,
- 0x1b, 0xf1, 0x2c, 0x94, 0x0b, 0x54, 0x4b, 0x5a, 0xdd, 0x4d, 0xcd, 0x24, 0x70, 0x57, 0x1b, 0x83,
- 0xf2, 0x92, 0xae, 0xe1, 0xd9, 0x3b, 0xb2, 0xc2, 0x5b, 0x85, 0x59, 0x4c, 0x23, 0x4c, 0xd8, 0xd2,
- 0xab, 0x3f, 0x60, 0x60, 0xb8, 0xe9, 0x39, 0xc1, 0xff, 0x57, 0xea, 0xc0, 0x8a, 0x4f, 0x0a, 0x2d,
- 0x79, 0x0e, 0x6d, 0xdb, 0x99, 0x2b, 0x03, 0x8d, 0xc2, 0x80, 0x91, 0x6c, 0xdb, 0x9d, 0xca, 0xc1,
- 0x10, 0x76, 0x42, 0x29, 0x04, 0x86, 0x9a, 0x6a, 0x3e, 0x47, 0x99, 0x6b, 0xaf, 0xf9, 0x50, 0xf4,
- 0x76, 0xa9, 0x98, 0x58, 0x01, 0xf9, 0x1a, 0x48, 0xa6, 0x99, 0xce, 0x22, 0x9a, 0x47, 0xe9, 0xea,
- 0x93, 0x60, 0x33, 0xdb, 0x9d, 0xeb, 0x28, 0xad, 0xbe, 0xd8, 0x03, 0xd7, 0xcc, 0x2e, 0x65, 0xd1,
- 0x9c, 0x0b, 0x9a, 0x4a, 0xa5, 0xbd, 0x56, 0xd7, 0xe9, 0x3d, 0x0e, 0xda, 0x06, 0x1f, 0x14, 0xf0,
- 0x58, 0x2a, 0x4d, 0xfa, 0xb0, 0xcb, 0x16, 0x8c, 0x27, 0x6c, 0xca, 0x13, 0xae, 0x97, 0xf4, 0xad,
- 0x14, 0xe8, 0x6d, 0xad, 0x92, 0xb8, 0xeb, 0x9b, 0x37, 0x52, 0x20, 0x89, 0x60, 0x3f, 0x94, 0x42,
- 0x2b, 0x99, 0xd0, 0x34, 0x61, 0x02, 0x29, 0xcb, 0x75, 0x4c, 0x53, 0x99, 0xf0, 0x70, 0xe9, 0x6d,
- 0x77, 0x9d, 0x5e, 0xfb, 0xe8, 0xf9, 0xbd, 0x73, 0x39, 0xc8, 0x75, 0x8c, 0x42, 0xf3, 0xd0, 0x04,
- 0x1c, 0x1b, 0x41, 0xb0, 0x57, 0xd6, 0x1a, 0x17, 0xa5, 0x0a, 0x86, 0xc5, 0x8b, 0xb8, 0x61, 0x9e,
- 0x69, 0x39, 0xa7, 0x65, 0xab, 0xdf, 0xf2, 0x04, 0xbd, 0xb6, 0x8d, 0x6b, 0x77, 0xec, 0x34, 0xbc,
- 0xe2, 0x09, 0x16, 0x71, 0x8b, 0x23, 0xa0, 0x82, 0xcd, 0x91, 0x26, 0x28, 0x66, 0x3a, 0xf6, 0x76,
- 0x6c, 0xdc, 0x02, 0xbf, 0x64, 0x73, 0x3c, 0x37, 0x28, 0xe9, 0x9a, 0xd9, 0x09, 0x73, 0xa5, 0x50,
- 0x84, 0x4b, 0xcf, 0x35, 0xa4, 0x75, 0x88, 0x0c, 0xe0, 0x63, 0x7b, 0x74, 0x53, 0x29, 0x75, 0xa6,
- 0x15, 0x4b, 0xa9, 0xc6, 0x79, 0x9a, 0x30, 0x8d, 0x76, 0x9c, 0x76, 0x8d, 0x89, 0x8e, 0x21, 0x0d,
- 0x2b, 0xce, 0xa4, 0xa4, 0x98, 0xf1, 0x42, 0xd8, 0xe5, 0x42, 0xa3, 0x0a, 0x31, 0x2d, 0xa2, 0xd2,
- 0xb9, 0x8c, 0xd0, 0x23, 0xe6, 0x68, 0xbe, 0xbd, 0xf7, 0x68, 0xd6, 0xa6, 0xdb, 0x1f, 0x89, 0xa9,
- 0xcc, 0x45, 0x34, 0x5a, 0x2b, 0x70, 0x21, 0x23, 0x0c, 0x5c, 0xfe, 0x1f, 0x84, 0x7c, 0x03, 0x75,
- 0x6d, 0xdf, 0x3a, 0xef, 0x89, 0x69, 0xa7, 0x8f, 0x3e, 0xf4, 0x1e, 0x06, 0x15, 0xb9, 0x48, 0x88,
- 0x62, 0x21, 0x97, 0x74, 0x8e, 0x5a, 0xf1, 0x30, 0xa3, 0xd5, 0x5b, 0x50, 0x75, 0xd5, 0x53, 0x9b,
- 0xd0, 0x90, 0x2e, 0x2c, 0xe7, 0xca, 0x52, 0xca, 0xfe, 0x3a, 0x7c, 0x09, 0xcf, 0xde, 0xe3, 0x93,
- 0x6c, 0x41, 0x23, 0x38, 0x3d, 0x19, 0x05, 0xa7, 0xc7, 0x13, 0x77, 0x83, 0x00, 0xd4, 0x26, 0xe3,
- 0xe0, 0xf5, 0x8f, 0x3f, 0xb9, 0xce, 0x97, 0xdf, 0xc3, 0xd3, 0xfb, 0x7a, 0x80, 0x34, 0xe0, 0xd1,
- 0xe5, 0xeb, 0xcb, 0x53, 0x77, 0x83, 0xb4, 0x01, 0x2e, 0xae, 0x27, 0xd7, 0x83, 0x73, 0x3a, 0x39,
- 0xbf, 0x72, 0x1d, 0xb2, 0x05, 0xf5, 0xd1, 0xe5, 0xd9, 0x69, 0x30, 0x9a, 0xb8, 0x7f, 0xd7, 0x87,
- 0xbd, 0x3f, 0xee, 0x0e, 0x9c, 0x3f, 0xef, 0x0e, 0x9c, 0xbf, 0xee, 0x0e, 0x9c, 0x9b, 0x8e, 0xcd,
- 0xca, 0x65, 0x9f, 0xa5, 0xbc, 0xff, 0xaf, 0xff, 0xad, 0x69, 0xcd, 0xcc, 0xd3, 0xcb, 0x7f, 0x02,
- 0x00, 0x00, 0xff, 0xff, 0x3f, 0x0f, 0x26, 0x61, 0xcf, 0x06, 0x00, 0x00,
+ // 920 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x5d, 0x6f, 0xe3, 0x44,
+ 0x14, 0xad, 0xf7, 0x23, 0x69, 0x6e, 0xda, 0xd4, 0x9d, 0x5d, 0xba, 0x6e, 0x04, 0xa5, 0x74, 0x11,
+ 0x64, 0x01, 0x39, 0xda, 0xae, 0x84, 0x78, 0x01, 0x6d, 0xd2, 0x76, 0xd5, 0x48, 0x6d, 0x37, 0x72,
+ 0x53, 0x09, 0xfa, 0x32, 0x9a, 0xd8, 0xb7, 0xf1, 0x68, 0x9d, 0x19, 0x6b, 0x3c, 0x0e, 0x64, 0xdf,
+ 0xf8, 0x39, 0xfc, 0x10, 0x24, 0x1e, 0xf9, 0x09, 0xa8, 0x4f, 0xfc, 0x0c, 0xe4, 0x19, 0x3b, 0x1b,
+ 0x56, 0xfd, 0x78, 0x8b, 0xcf, 0x9c, 0x73, 0x7c, 0xcf, 0xf5, 0xbd, 0x13, 0xd8, 0x9e, 0x62, 0x16,
+ 0x77, 0x67, 0x2f, 0x59, 0x92, 0xc6, 0xec, 0x65, 0x37, 0x55, 0xf2, 0xb7, 0xb9, 0x9f, 0x2a, 0xa9,
+ 0x25, 0x79, 0xc2, 0x33, 0xcd, 0xa5, 0x5f, 0x10, 0xfc, 0x8a, 0xd0, 0xde, 0x99, 0x48, 0x39, 0x49,
+ 0xb0, 0x6b, 0x28, 0xe3, 0xfc, 0xaa, 0x1b, 0xe5, 0x8a, 0x69, 0x2e, 0x85, 0x15, 0xed, 0xfd, 0xf1,
+ 0x10, 0xea, 0x23, 0xc5, 0x42, 0x2e, 0x26, 0xe4, 0x47, 0xa8, 0xbd, 0xe7, 0xe9, 0x3b, 0x2e, 0x3c,
+ 0x67, 0xd7, 0xe9, 0x34, 0xf7, 0x9f, 0xfb, 0x37, 0x38, 0xfa, 0x25, 0xdb, 0xbf, 0x34, 0xd4, 0xe3,
+ 0x95, 0xa0, 0x14, 0x91, 0x37, 0xd0, 0x48, 0xf8, 0x24, 0xd6, 0x99, 0xc6, 0xd4, 0x7b, 0x60, 0x1c,
+ 0xbe, 0xba, 0xd3, 0xe1, 0xa4, 0x62, 0x1f, 0xaf, 0x04, 0x1f, 0xa4, 0xe4, 0x35, 0xd4, 0x23, 0xa6,
+ 0x59, 0x24, 0x27, 0xde, 0x43, 0xe3, 0xf2, 0xe5, 0x9d, 0x2e, 0x87, 0x96, 0x7b, 0xbc, 0x12, 0x54,
+ 0xb2, 0xf6, 0x1e, 0xd4, 0x6c, 0x75, 0xc4, 0x83, 0x3a, 0x8b, 0x22, 0x85, 0x59, 0x66, 0x32, 0x35,
+ 0x82, 0xea, 0xb1, 0xfd, 0xbb, 0x03, 0x8d, 0x45, 0x01, 0xb7, 0xf3, 0xc8, 0x17, 0xb0, 0xc6, 0xc2,
+ 0x10, 0xb3, 0x8c, 0x6a, 0xf9, 0x0e, 0x85, 0x09, 0xd6, 0x08, 0x9a, 0x16, 0x1b, 0x15, 0x10, 0xd9,
+ 0x82, 0x5a, 0x86, 0x61, 0xae, 0xd0, 0xd4, 0xbb, 0x1a, 0x94, 0x4f, 0xe4, 0x73, 0x68, 0x86, 0x2c,
+ 0x44, 0xa5, 0x69, 0xca, 0x74, 0xec, 0x3d, 0x32, 0x4a, 0xb0, 0xd0, 0x90, 0xe9, 0xb8, 0xfd, 0x1c,
+ 0xea, 0x65, 0xf5, 0xb7, 0x17, 0xd0, 0x5f, 0x85, 0x9a, 0x56, 0x85, 0x66, 0xef, 0xcf, 0x06, 0x34,
+ 0x87, 0xc5, 0x07, 0x3f, 0x90, 0xe2, 0x8a, 0x4f, 0x8c, 0xbf, 0xf9, 0x65, 0xfd, 0x9d, 0xd2, 0xdf,
+ 0x40, 0x85, 0x7f, 0x41, 0x18, 0x73, 0xc1, 0xd4, 0xdc, 0x12, 0x6c, 0xe9, 0x60, 0x21, 0x43, 0xf8,
+ 0x1a, 0x36, 0x32, 0x54, 0x33, 0x1e, 0x22, 0x0d, 0x93, 0x3c, 0xd3, 0xa8, 0x4c, 0x84, 0x46, 0xd0,
+ 0x2a, 0xe1, 0x03, 0x8b, 0x92, 0xd7, 0xd0, 0x8a, 0x14, 0xe3, 0x82, 0x56, 0xe3, 0x63, 0xd2, 0x34,
+ 0xf7, 0xb7, 0x7d, 0x3b, 0x5f, 0x7e, 0x35, 0x5f, 0xfe, 0x61, 0x49, 0x08, 0xd6, 0x8d, 0xa0, 0x7a,
+ 0x24, 0xe7, 0xe0, 0xa5, 0x4c, 0xa1, 0xd0, 0x34, 0x8b, 0x73, 0x1d, 0xc9, 0x5f, 0x97, 0xbc, 0x1e,
+ 0xdf, 0xe7, 0xb5, 0x65, 0xa5, 0xe7, 0xa5, 0x72, 0x61, 0xfa, 0x2d, 0x6c, 0x46, 0x3c, 0x0b, 0xe5,
+ 0x0c, 0xd5, 0x9c, 0x56, 0xfd, 0xab, 0x99, 0x04, 0xee, 0xe2, 0xa0, 0x57, 0x7e, 0xc9, 0x0b, 0x78,
+ 0xf6, 0x81, 0xac, 0xf0, 0x4a, 0x61, 0x16, 0xd3, 0x08, 0x13, 0x36, 0xf7, 0xea, 0xf7, 0x14, 0xd0,
+ 0x7f, 0xe0, 0x39, 0xc1, 0x27, 0x0b, 0x75, 0x60, 0xc5, 0x87, 0x85, 0x96, 0xbc, 0x80, 0x96, 0x5d,
+ 0x80, 0x45, 0x01, 0xab, 0x45, 0x01, 0x46, 0xb2, 0x6e, 0x4f, 0xaa, 0x0a, 0xfa, 0xb0, 0x11, 0x4a,
+ 0x21, 0x30, 0xd4, 0x54, 0xf3, 0x29, 0xca, 0x5c, 0x7b, 0x8d, 0xfb, 0xa2, 0xb7, 0x4a, 0xc5, 0xc8,
+ 0x0a, 0xc8, 0x77, 0x40, 0x32, 0xcd, 0x74, 0x16, 0xd1, 0x3c, 0x4a, 0x17, 0xaf, 0x04, 0x9b, 0xd9,
+ 0x9e, 0x5c, 0x44, 0x69, 0xf5, 0xc6, 0x0e, 0xb8, 0xe6, 0x8a, 0xa0, 0x2c, 0x9a, 0x72, 0x41, 0x53,
+ 0xa9, 0xb4, 0xd7, 0xdc, 0x75, 0x3a, 0x8f, 0x83, 0x96, 0xc1, 0x7b, 0x05, 0x3c, 0x94, 0x4a, 0x93,
+ 0x2e, 0x6c, 0xb2, 0x19, 0xe3, 0x09, 0x1b, 0xf3, 0x84, 0xeb, 0x39, 0x7d, 0x2f, 0x05, 0x7a, 0x6b,
+ 0x8b, 0x24, 0xee, 0xf2, 0xe1, 0xa5, 0x14, 0x48, 0x22, 0xd8, 0x0e, 0xa5, 0xd0, 0x4a, 0x26, 0x34,
+ 0x4d, 0x98, 0x40, 0xca, 0x72, 0x1d, 0xd3, 0x54, 0x26, 0x3c, 0x9c, 0x7b, 0xeb, 0xbb, 0x4e, 0xa7,
+ 0xb5, 0xff, 0xe2, 0xc6, 0xc5, 0xed, 0xe5, 0x3a, 0x46, 0xa1, 0x79, 0x68, 0x02, 0x0e, 0x8d, 0x20,
+ 0xd8, 0x2a, 0xbd, 0x86, 0x85, 0x55, 0xc1, 0xb0, 0x78, 0x11, 0x37, 0xcc, 0x33, 0x2d, 0xa7, 0xb4,
+ 0x1c, 0xf5, 0x2b, 0x9e, 0xa0, 0xd7, 0xb2, 0x71, 0xed, 0x89, 0xdd, 0x86, 0x37, 0x3c, 0xc1, 0x22,
+ 0x6e, 0xd1, 0x02, 0x2a, 0xd8, 0x14, 0x69, 0x82, 0x62, 0xa2, 0x63, 0x6f, 0xc3, 0xc6, 0x2d, 0xf0,
+ 0x33, 0x36, 0xc5, 0x13, 0x83, 0x92, 0x5d, 0xb3, 0x3b, 0x61, 0xae, 0x14, 0x8a, 0x70, 0xee, 0xb9,
+ 0x86, 0xb4, 0x0c, 0x91, 0x1e, 0x7c, 0x66, 0x5b, 0x37, 0x96, 0x52, 0x67, 0x5a, 0xb1, 0x94, 0x6a,
+ 0x9c, 0xa6, 0x09, 0xd3, 0x68, 0xd7, 0x69, 0xd3, 0x14, 0xd1, 0x36, 0xa4, 0x7e, 0xc5, 0x19, 0x95,
+ 0x14, 0xb3, 0x5e, 0x08, 0x9b, 0x5c, 0x68, 0x54, 0x21, 0xa6, 0x45, 0x54, 0x3a, 0x95, 0x11, 0x7a,
+ 0xc4, 0xb4, 0xe6, 0x87, 0x1b, 0x5b, 0xb3, 0xb4, 0xdd, 0xfe, 0x40, 0x8c, 0x65, 0x2e, 0xa2, 0xc1,
+ 0x92, 0xc1, 0xa9, 0x8c, 0x30, 0x70, 0xf9, 0x47, 0x08, 0xf9, 0x1e, 0xea, 0xda, 0x5e, 0x86, 0xde,
+ 0x13, 0x33, 0x4e, 0x9f, 0xde, 0x75, 0x61, 0x06, 0x15, 0xb9, 0x48, 0x88, 0x62, 0x26, 0xe7, 0x74,
+ 0x8a, 0x5a, 0xf1, 0x30, 0xa3, 0xd5, 0x5d, 0x50, 0x4d, 0xd5, 0x53, 0x9b, 0xd0, 0x90, 0x4e, 0x2d,
+ 0xe7, 0xdc, 0x52, 0xca, 0xf9, 0xda, 0x7b, 0x05, 0xcf, 0x6e, 0xa9, 0x93, 0xac, 0xc1, 0x6a, 0x70,
+ 0x74, 0x38, 0x08, 0x8e, 0x0e, 0x46, 0xee, 0x0a, 0x01, 0xa8, 0x8d, 0x86, 0xc1, 0xdb, 0x9f, 0x7f,
+ 0x71, 0x9d, 0x6f, 0x7e, 0x82, 0xa7, 0x37, 0xcd, 0x00, 0x59, 0x85, 0x47, 0x67, 0x6f, 0xcf, 0x8e,
+ 0xdc, 0x15, 0xd2, 0x02, 0x38, 0xbd, 0x18, 0x5d, 0xf4, 0x4e, 0xe8, 0xe8, 0xe4, 0xdc, 0x75, 0xc8,
+ 0x1a, 0xd4, 0x07, 0x67, 0xc7, 0x47, 0xc1, 0x60, 0xe4, 0xfe, 0x5b, 0xef, 0x77, 0xfe, 0xba, 0xde,
+ 0x71, 0xfe, 0xbe, 0xde, 0x71, 0xfe, 0xb9, 0xde, 0x71, 0x2e, 0xdb, 0x36, 0x2b, 0x97, 0x5d, 0x96,
+ 0xf2, 0xee, 0xff, 0xfe, 0x1e, 0xc7, 0x35, 0xb3, 0x4f, 0xaf, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff,
+ 0x95, 0x7b, 0xdd, 0x7c, 0x36, 0x07, 0x00, 0x00,
}
diff --git a/mesh/v1alpha1/proxy.proto b/mesh/v1alpha1/proxy.proto
index 576289c8ad..fcdcbae5d5 100644
--- a/mesh/v1alpha1/proxy.proto
+++ b/mesh/v1alpha1/proxy.proto
@@ -60,12 +60,20 @@ message Tracing {
string cacert_path = 4;
}
+ // Datadog defines configuration for a Datadog tracer.
+ message Datadog {
+ // Address of the Datadog Agent.
+ string address = 1;
+ }
+
// The tracer implementation to be used by Envoy.
oneof tracer {
// Use a Zipkin tracer.
Zipkin zipkin = 1;
// Use a LightStep tracer.
Lightstep lightstep = 2;
+ // Use a Datadog tracer.
+ Datadog datadog = 3;
}
}
diff --git a/networking/v1alpha3/destination_rule.pb.go b/networking/v1alpha3/destination_rule.pb.go
index 9b263002db..be506dde81 100644
--- a/networking/v1alpha3/destination_rule.pb.go
+++ b/networking/v1alpha3/destination_rule.pb.go
@@ -250,9 +250,23 @@ type DestinationRule struct {
// One or more named sets that represent individual versions of a
// service. Traffic policies can be overridden at subset level.
Subsets []*Subset `protobuf:"bytes,3,rep,name=subsets" json:"subsets,omitempty"`
- // The resolution of a DestinationRule to apply to a service occurs in the
- // context of a hierarchy of namespaces. This rule controls whether those
- // namespaces are allowed to select this rule.
+ // A list of namespaces to which this destination rule is exported.
+ // The resolution of a destination rule to apply to a service occurs in the
+ // context of a hierarchy of namespaces. Exporting a desintation rule allows
+ // it to be included in the resolution hierarchy for services in
+ // other namespaces. This feature provides a mechanism for service owners
+ // and mesh administrators to control the visibility of destination rules
+ // across namespace boundaries.
+ //
+ // If no namespaces are specified then the destination rule is exported to all
+ // namespaces by default.
+ //
+ // The value "." is reserved and defines an export to the same namespace that
+ // the destination rule is declared in. Similarly, the value "*" is reserved and
+ // defines an export to all namespaces.
+ //
+ // NOTE: in the current release, the `exportTo` value is restricted to
+ // "." or "*" (i.e., the current namespace or all namespaces).
ExportTo []string `protobuf:"bytes,4,rep,name=export_to,json=exportTo" json:"export_to,omitempty"`
}
diff --git a/networking/v1alpha3/destination_rule.proto b/networking/v1alpha3/destination_rule.proto
index 1c340f8bbf..0bc860b571 100644
--- a/networking/v1alpha3/destination_rule.proto
+++ b/networking/v1alpha3/destination_rule.proto
@@ -118,9 +118,23 @@ message DestinationRule {
// service. Traffic policies can be overridden at subset level.
repeated Subset subsets = 3;
- // The resolution of a DestinationRule to apply to a service occurs in the
- // context of a hierarchy of namespaces. This rule controls whether those
- // namespaces are allowed to select this rule.
+ // A list of namespaces to which this destination rule is exported.
+ // The resolution of a destination rule to apply to a service occurs in the
+ // context of a hierarchy of namespaces. Exporting a destination rule allows
+ // it to be included in the resolution hierarchy for services in
+ // other namespaces. This feature provides a mechanism for service owners
+ // and mesh administrators to control the visibility of destination rules
+ // across namespace boundaries.
+ //
+ // If no namespaces are specified then the destination rule is exported to all
+ // namespaces by default.
+ //
+ // The value "." is reserved and defines an export to the same namespace that
+ // the destination rule is declared in. Similarly, the value "*" is reserved and
+ // defines an export to all namespaces.
+ //
+ // NOTE: in the current release, the `exportTo` value is restricted to
+ // "." or "*" (i.e., the current namespace or all namespaces).
repeated string export_to = 4;
}
diff --git a/networking/v1alpha3/istio.networking.v1alpha3.pb.html b/networking/v1alpha3/istio.networking.v1alpha3.pb.html
index 665bf24c10..21ed2e2e21 100644
--- a/networking/v1alpha3/istio.networking.v1alpha3.pb.html
+++ b/networking/v1alpha3/istio.networking.v1alpha3.pb.html
@@ -675,9 +675,23 @@ DestinationRule
exportTo |
string[] |
- The resolution of a DestinationRule to apply to a service occurs in the
-context of a hierarchy of namespaces. This rule controls whether those
-namespaces are allowed to select this rule.
+A list of namespaces to which this destination rule is exported.
+The resolution of a destination rule to apply to a service occurs in the
+context of a hierarchy of namespaces. Exporting a desintation rule allows
+it to be included in the resolution hierarchy for services in
+other namespaces. This feature provides a mechanism for service owners
+and mesh administrators to control the visibility of destination rules
+across namespace boundaries.
+
+If no namespaces are specified then the destination rule is exported to all
+namespaces by default.
+
+The value “.” is reserved and defines an export to the same namespace that
+the destination rule is declared in. Similarly, the value “*” is reserved and
+defines an export to all namespaces.
+
+NOTE: in the current release, the exportTo value is restricted to
+“.” or “*” (i.e., the current namespace or all namespaces).
|
@@ -3241,7 +3255,7 @@ ServiceEntry
The following example demonstrates the use of a dedicated egress gateway
through which all external service traffic is forwarded.
The ‘exportTo’ field allows for control over the visibility of a service
-declaration to other namespaces in the mesh. By default a service is exported
+declaration to other namespaces in the mesh. By default, a service is exported
to all namespaces. The following example restricts the visibility to the
current namespace, represented by “.”, so that it cannot be used by other
namespaces.
@@ -3299,7 +3313,7 @@ ServiceEntry
hosts:
- httpbin.com
exportTo:
- - *
+ - "*"
gateways:
- mesh
- istio-egressgateway
@@ -3511,7 +3525,7 @@ ServiceEntry
string[] |
A list of namespaces to which this service is exported. Exporting a service
-allows it to used by sidecars, gateways and virtual services defined in
+allows it to be used by sidecars, gateways and virtual services defined in
other namespaces. This feature provides a mechanism for service owners
and mesh administrators to control the visibility of services across
namespace boundaries.
@@ -3520,13 +3534,16 @@ ServiceEntry
namespaces by default.
The value “.” is reserved and defines an export to the same namespace that
-the service is declared in, similarly the value “*” is reserved and
+the service is declared in. Similarly, the value “*” is reserved and
defines an export to all namespaces.
-For a Kubernetes Service the equivalent effect can be achieved by setting
+ For a Kubernetes Service, the equivalent effect can be achieved by setting
the annotation “networking.istio.io/exportTo” to a comma-separated list
of namespace names.
+NOTE: in the current release, the exportTo value is restricted to
+“.” or “*” (i.e., the current namespace or all namespaces).
+
|
@@ -4613,7 +4630,7 @@ VirtualService
string[] |
A list of namespaces to which this virtual service is exported. Exporting a
-virtual service allows it to used by sidecars and gateways defined in
+virtual service allows it to be used by sidecars and gateways defined in
other namespaces. This feature provides a mechanism for service owners
and mesh administrators to control the visibility of virtual services
across namespace boundaries.
@@ -4622,9 +4639,12 @@ VirtualService
namespaces by default.
The value “.” is reserved and defines an export to the same namespace that
-the virtual service is declared in, similarly the value “*” is reserved and
+the virtual service is declared in. Similarly, the value “*” is reserved and
defines an export to all namespaces.
+NOTE: in the current release, the exportTo value is restricted to
+“.” or “*” (i.e., the current namespace or all namespaces).
+
|
diff --git a/networking/v1alpha3/service_entry.pb.go b/networking/v1alpha3/service_entry.pb.go
index 091d09a45a..a9793cab1e 100644
--- a/networking/v1alpha3/service_entry.pb.go
+++ b/networking/v1alpha3/service_entry.pb.go
@@ -214,7 +214,7 @@ func (ServiceEntry_Resolution) EnumDescriptor() ([]byte, []int) {
// The following example demonstrates the use of a dedicated egress gateway
// through which all external service traffic is forwarded.
// The 'exportTo' field allows for control over the visibility of a service
-// declaration to other namespaces in the mesh. By default a service is exported
+// declaration to other namespaces in the mesh. By default, a service is exported
// to all namespaces. The following example restricts the visibility to the
// current namespace, represented by ".", so that it cannot be used by other
// namespaces.
@@ -275,7 +275,7 @@ func (ServiceEntry_Resolution) EnumDescriptor() ([]byte, []int) {
// hosts:
// - httpbin.com
// exportTo:
-// - *
+// - "*"
// gateways:
// - mesh
// - istio-egressgateway
@@ -443,7 +443,7 @@ type ServiceEntry struct {
// One or more endpoints associated with the service.
Endpoints []*ServiceEntry_Endpoint `protobuf:"bytes,6,rep,name=endpoints" json:"endpoints,omitempty"`
// A list of namespaces to which this service is exported. Exporting a service
- // allows it to used by sidecars, gateways and virtual services defined in
+ // allows it to be used by sidecars, gateways and virtual services defined in
// other namespaces. This feature provides a mechanism for service owners
// and mesh administrators to control the visibility of services across
// namespace boundaries.
@@ -452,12 +452,15 @@ type ServiceEntry struct {
// namespaces by default.
//
// The value "." is reserved and defines an export to the same namespace that
- // the service is declared in, similarly the value "*" is reserved and
+ // the service is declared in. Similarly, the value "*" is reserved and
// defines an export to all namespaces.
//
- // For a Kubernetes Service the equivalent effect can be achieved by setting
+ // For a Kubernetes Service, the equivalent effect can be achieved by setting
// the annotation "networking.istio.io/exportTo" to a comma-separated list
// of namespace names.
+ //
+ // NOTE: in the current release, the `exportTo` value is restricted to
+ // "." or "*" (i.e., the current namespace or all namespaces).
ExportTo []string `protobuf:"bytes,7,rep,name=export_to,json=exportTo" json:"export_to,omitempty"`
// The list of subject alternate names allowed for workloads that
// implement this service. This information is used to enforce
diff --git a/networking/v1alpha3/service_entry.proto b/networking/v1alpha3/service_entry.proto
index 1527586f47..9d9151244d 100644
--- a/networking/v1alpha3/service_entry.proto
+++ b/networking/v1alpha3/service_entry.proto
@@ -135,7 +135,7 @@ option go_package = "istio.io/api/networking/v1alpha3";
// The following example demonstrates the use of a dedicated egress gateway
// through which all external service traffic is forwarded.
// The 'exportTo' field allows for control over the visibility of a service
-// declaration to other namespaces in the mesh. By default a service is exported
+// declaration to other namespaces in the mesh. By default, a service is exported
// to all namespaces. The following example restricts the visibility to the
// current namespace, represented by ".", so that it cannot be used by other
// namespaces.
@@ -196,7 +196,7 @@ option go_package = "istio.io/api/networking/v1alpha3";
// hosts:
// - httpbin.com
// exportTo:
-// - *
+// - "*"
// gateways:
// - mesh
// - istio-egressgateway
@@ -471,7 +471,7 @@ message ServiceEntry {
repeated Endpoint endpoints = 6;
// A list of namespaces to which this service is exported. Exporting a service
- // allows it to used by sidecars, gateways and virtual services defined in
+ // allows it to be used by sidecars, gateways and virtual services defined in
// other namespaces. This feature provides a mechanism for service owners
// and mesh administrators to control the visibility of services across
// namespace boundaries.
@@ -480,12 +480,15 @@ message ServiceEntry {
// namespaces by default.
//
// The value "." is reserved and defines an export to the same namespace that
- // the service is declared in, similarly the value "*" is reserved and
+ // the service is declared in. Similarly, the value "*" is reserved and
// defines an export to all namespaces.
//
- // For a Kubernetes Service the equivalent effect can be achieved by setting
+ // For a Kubernetes Service, the equivalent effect can be achieved by setting
// the annotation "networking.istio.io/exportTo" to a comma-separated list
// of namespace names.
+ //
+ // NOTE: in the current release, the `exportTo` value is restricted to
+ // "." or "*" (i.e., the current namespace or all namespaces).
repeated string export_to = 7;
// The list of subject alternate names allowed for workloads that
diff --git a/networking/v1alpha3/virtual_service.pb.go b/networking/v1alpha3/virtual_service.pb.go
index 433763766f..0a385309c1 100644
--- a/networking/v1alpha3/virtual_service.pb.go
+++ b/networking/v1alpha3/virtual_service.pb.go
@@ -135,7 +135,7 @@ type VirtualService struct {
// matching an incoming request is used.
Tcp []*TCPRoute `protobuf:"bytes,4,rep,name=tcp" json:"tcp,omitempty"`
// A list of namespaces to which this virtual service is exported. Exporting a
- // virtual service allows it to used by sidecars and gateways defined in
+ // virtual service allows it to be used by sidecars and gateways defined in
// other namespaces. This feature provides a mechanism for service owners
// and mesh administrators to control the visibility of virtual services
// across namespace boundaries.
@@ -144,8 +144,11 @@ type VirtualService struct {
// namespaces by default.
//
// The value "." is reserved and defines an export to the same namespace that
- // the virtual service is declared in, similarly the value "*" is reserved and
+ // the virtual service is declared in. Similarly, the value "*" is reserved and
// defines an export to all namespaces.
+ //
+ // NOTE: in the current release, the `exportTo` value is restricted to
+ // "." or "*" (i.e., the current namespace or all namespaces).
ExportTo []string `protobuf:"bytes,6,rep,name=export_to,json=exportTo" json:"export_to,omitempty"`
}
diff --git a/networking/v1alpha3/virtual_service.proto b/networking/v1alpha3/virtual_service.proto
index f9465aeaaa..43dbbada28 100644
--- a/networking/v1alpha3/virtual_service.proto
+++ b/networking/v1alpha3/virtual_service.proto
@@ -177,7 +177,7 @@ message VirtualService {
repeated TCPRoute tcp = 4;
// A list of namespaces to which this virtual service is exported. Exporting a
- // virtual service allows it to used by sidecars and gateways defined in
+ // virtual service allows it to be used by sidecars and gateways defined in
// other namespaces. This feature provides a mechanism for service owners
// and mesh administrators to control the visibility of virtual services
// across namespace boundaries.
@@ -186,8 +186,11 @@ message VirtualService {
// namespaces by default.
//
// The value "." is reserved and defines an export to the same namespace that
- // the virtual service is declared in, similarly the value "*" is reserved and
+ // the virtual service is declared in. Similarly, the value "*" is reserved and
// defines an export to all namespaces.
+ //
+ // NOTE: in the current release, the `exportTo` value is restricted to
+ // "." or "*" (i.e., the current namespace or all namespaces).
repeated string export_to = 6;
}
diff --git a/proto.lock b/proto.lock
index e928431dd2..84d70d6435 100644
--- a/proto.lock
+++ b/proto.lock
@@ -1218,6 +1218,11 @@
"id": 2,
"name": "lightstep",
"type": "Lightstep"
+ },
+ {
+ "id": 3,
+ "name": "datadog",
+ "type": "Datadog"
}
],
"messages": [
@@ -1255,6 +1260,16 @@
"type": "string"
}
]
+ },
+ {
+ "name": "Datadog",
+ "fields": [
+ {
+ "id": 1,
+ "name": "address",
+ "type": "string"
+ }
+ ]
}
]
},
diff --git a/python/istio_api/mesh/v1alpha1/proxy_pb2.py b/python/istio_api/mesh/v1alpha1/proxy_pb2.py
index 00f6ff7741..77e8305155 100644
--- a/python/istio_api/mesh/v1alpha1/proxy_pb2.py
+++ b/python/istio_api/mesh/v1alpha1/proxy_pb2.py
@@ -21,7 +21,7 @@
name='mesh/v1alpha1/proxy.proto',
package='istio.mesh.v1alpha1',
syntax='proto3',
- serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\"\xfb\x01\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1aW\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x12\x0e\n\x06secure\x18\x03 \x01(\x08\x12\x13\n\x0b\x63\x61\x63\x65rt_path\x18\x04 \x01(\tB\x08\n\x06tracer\"\xe0\x06\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x32\n\x0f\x63onnect_timeout\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12%\n\x1d\x65nvoy_metrics_service_address\x18\x14 \x01(\t\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x13\n\x0b\x63oncurrency\x18\x10 \x01(\x05\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3')
+ serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\"\xd0\x02\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x12\x37\n\x07\x64\x61tadog\x18\x03 \x01(\x0b\x32$.istio.mesh.v1alpha1.Tracing.DatadogH\x00\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1aW\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x12\x0e\n\x06secure\x18\x03 \x01(\x08\x12\x13\n\x0b\x63\x61\x63\x65rt_path\x18\x04 \x01(\t\x1a\x1a\n\x07\x44\x61tadog\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\tB\x08\n\x06tracer\"\xe0\x06\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x32\n\x0f\x63onnect_timeout\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12%\n\x1d\x65nvoy_metrics_service_address\x18\x14 \x01(\t\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x13\n\x0b\x63oncurrency\x18\x10 \x01(\x05\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3')
,
dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,])
@@ -46,8 +46,8 @@
],
containing_type=None,
options=None,
- serialized_start=1203,
- serialized_end=1265,
+ serialized_start=1288,
+ serialized_end=1350,
)
_sym_db.RegisterEnumDescriptor(_AUTHENTICATIONPOLICY)
@@ -74,8 +74,8 @@
],
containing_type=None,
options=None,
- serialized_start=1150,
- serialized_end=1201,
+ serialized_start=1235,
+ serialized_end=1286,
)
_sym_db.RegisterEnumDescriptor(_PROXYCONFIG_INBOUNDINTERCEPTIONMODE)
@@ -106,8 +106,8 @@
extension_ranges=[],
oneofs=[
],
- serialized_start=210,
- serialized_end=235,
+ serialized_start=267,
+ serialized_end=292,
)
_TRACING_LIGHTSTEP = _descriptor.Descriptor(
@@ -157,8 +157,38 @@
extension_ranges=[],
oneofs=[
],
- serialized_start=237,
- serialized_end=324,
+ serialized_start=294,
+ serialized_end=381,
+)
+
+_TRACING_DATADOG = _descriptor.Descriptor(
+ name='Datadog',
+ full_name='istio.mesh.v1alpha1.Tracing.Datadog',
+ filename=None,
+ file=DESCRIPTOR,
+ containing_type=None,
+ fields=[
+ _descriptor.FieldDescriptor(
+ name='address', full_name='istio.mesh.v1alpha1.Tracing.Datadog.address', index=0,
+ number=1, type=9, cpp_type=9, label=1,
+ has_default_value=False, default_value=_b("").decode('utf-8'),
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+ options=None, file=DESCRIPTOR),
+ ],
+ extensions=[
+ ],
+ nested_types=[],
+ enum_types=[
+ ],
+ options=None,
+ is_extendable=False,
+ syntax='proto3',
+ extension_ranges=[],
+ oneofs=[
+ ],
+ serialized_start=383,
+ serialized_end=409,
)
_TRACING = _descriptor.Descriptor(
@@ -182,10 +212,17 @@
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None, file=DESCRIPTOR),
+ _descriptor.FieldDescriptor(
+ name='datadog', full_name='istio.mesh.v1alpha1.Tracing.datadog', index=2,
+ number=3, type=11, cpp_type=10, label=1,
+ has_default_value=False, default_value=None,
+ message_type=None, enum_type=None, containing_type=None,
+ is_extension=False, extension_scope=None,
+ options=None, file=DESCRIPTOR),
],
extensions=[
],
- nested_types=[_TRACING_ZIPKIN, _TRACING_LIGHTSTEP, ],
+ nested_types=[_TRACING_ZIPKIN, _TRACING_LIGHTSTEP, _TRACING_DATADOG, ],
enum_types=[
],
options=None,
@@ -198,7 +235,7 @@
index=0, containing_type=None, fields=[]),
],
serialized_start=83,
- serialized_end=334,
+ serialized_end=419,
)
@@ -362,20 +399,25 @@
extension_ranges=[],
oneofs=[
],
- serialized_start=337,
- serialized_end=1201,
+ serialized_start=422,
+ serialized_end=1286,
)
_TRACING_ZIPKIN.containing_type = _TRACING
_TRACING_LIGHTSTEP.containing_type = _TRACING
+_TRACING_DATADOG.containing_type = _TRACING
_TRACING.fields_by_name['zipkin'].message_type = _TRACING_ZIPKIN
_TRACING.fields_by_name['lightstep'].message_type = _TRACING_LIGHTSTEP
+_TRACING.fields_by_name['datadog'].message_type = _TRACING_DATADOG
_TRACING.oneofs_by_name['tracer'].fields.append(
_TRACING.fields_by_name['zipkin'])
_TRACING.fields_by_name['zipkin'].containing_oneof = _TRACING.oneofs_by_name['tracer']
_TRACING.oneofs_by_name['tracer'].fields.append(
_TRACING.fields_by_name['lightstep'])
_TRACING.fields_by_name['lightstep'].containing_oneof = _TRACING.oneofs_by_name['tracer']
+_TRACING.oneofs_by_name['tracer'].fields.append(
+ _TRACING.fields_by_name['datadog'])
+_TRACING.fields_by_name['datadog'].containing_oneof = _TRACING.oneofs_by_name['tracer']
_PROXYCONFIG.fields_by_name['drain_duration'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION
_PROXYCONFIG.fields_by_name['parent_shutdown_duration'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION
_PROXYCONFIG.fields_by_name['discovery_refresh_delay'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION
@@ -404,6 +446,13 @@
# @@protoc_insertion_point(class_scope:istio.mesh.v1alpha1.Tracing.Lightstep)
))
,
+
+ Datadog = _reflection.GeneratedProtocolMessageType('Datadog', (_message.Message,), dict(
+ DESCRIPTOR = _TRACING_DATADOG,
+ __module__ = 'mesh.v1alpha1.proxy_pb2'
+ # @@protoc_insertion_point(class_scope:istio.mesh.v1alpha1.Tracing.Datadog)
+ ))
+ ,
DESCRIPTOR = _TRACING,
__module__ = 'mesh.v1alpha1.proxy_pb2'
# @@protoc_insertion_point(class_scope:istio.mesh.v1alpha1.Tracing)
@@ -411,6 +460,7 @@
_sym_db.RegisterMessage(Tracing)
_sym_db.RegisterMessage(Tracing.Zipkin)
_sym_db.RegisterMessage(Tracing.Lightstep)
+_sym_db.RegisterMessage(Tracing.Datadog)
ProxyConfig = _reflection.GeneratedProtocolMessageType('ProxyConfig', (_message.Message,), dict(
DESCRIPTOR = _PROXYCONFIG,
diff --git a/scripts/check-repositories b/scripts/check-repositories
new file mode 100755
index 0000000000..18da167752
--- /dev/null
+++ b/scripts/check-repositories
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# Copyright 2018 Istio Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+set -eu
+
+# Check whether any git repositories are defined.
+# Git repository definition contains `commit` and `remote` fields.
+if git --no-pager grep -E "commit =|remote =" -- 'WORKSPACE' '*.bzl'; then
+ echo "Using git repositories is not allowed."
+ echo "To ensure that all dependencies can be stored offline in distdir, only HTTP repositories are allowed."
+ exit 1
+fi
+
+# Check whether number of defined `url =` and `sha256 =` kwargs in repository
+# definitions is equal.
+urls_count=$(git --no-pager grep -E "url =" -- 'WORKSPACE' '*.bzl' | wc -l)
+sha256sums_count=$(git --no-pager grep -E "sha256 =" -- 'WORKSPACE' '*.bzl' | wc -l)
+
+if [[ $urls_count != $sha256sums_count ]]; then
+ echo "Found more defined repository URLs than SHA256 sums, which means that there are some repositories without sums."
+ echo "Dependencies without SHA256 sums cannot be stored in distdir."
+ echo "Please ensure that every repository has a SHA256 sum."
+ echo "Repositories are defined in the WORKSPACE file."
+ exit 1
+fi
diff --git a/scripts/pre-commit b/scripts/pre-commit
index 7a9d2a96da..065fb6e564 100755
--- a/scripts/pre-commit
+++ b/scripts/pre-commit
@@ -38,4 +38,7 @@ if [ $BRANCH_NAME != '(no branch)' ]; then
echo "Checking lint"
make lint
+
+ echo "Checking repositories definitions"
+ scripts/check-repositories
fi