mirror of https://github.com/istio/api.git
Proxy config: Add tls_certs_to_watch field (#824)
* Proxy config: Add tls_certs_to_watch field * Address PR comment
This commit is contained in:
Dan Richelson
Shriram Rajagopalan
parent
f2e09a7a27
commit
e613e358ae
|
|
@ -974,6 +974,15 @@ Increase the value of this field if you find that the metrics from Envoys are tr
|
|||
<td>
|
||||
<p>Tracing configuration to be used by the proxy.</p>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
<tr id="ProxyConfig-tls_certs_to_watch">
|
||||
<td><code>tlsCertsToWatch</code></td>
|
||||
<td><code>string[]</code></td>
|
||||
<td>
|
||||
<p>Absolute path to certs/key files used for istio mTLS. If omitted, defaults to
|
||||
/etc/certs/cert-chain.pem,/etc/certs/key.pem,/etc/certs/root-cert.pem</p>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
|
|||
|
|
@ -440,7 +440,10 @@ type ProxyConfig struct {
|
|||
// The mode used to redirect inbound traffic to Envoy.
|
||||
InterceptionMode ProxyConfig_InboundInterceptionMode `protobuf:"varint,18,opt,name=interception_mode,json=interceptionMode,proto3,enum=istio.mesh.v1alpha1.ProxyConfig_InboundInterceptionMode" json:"interception_mode,omitempty"`
|
||||
// Tracing configuration to be used by the proxy.
|
||||
Tracing *Tracing `protobuf:"bytes,19,opt,name=tracing,proto3" json:"tracing,omitempty"`
|
||||
Tracing *Tracing `protobuf:"bytes,19,opt,name=tracing,proto3" json:"tracing,omitempty"`
|
||||
// Absolute path to certs/key files used for istio mTLS. If omitted, defaults to
|
||||
// /etc/certs/cert-chain.pem,/etc/certs/key.pem,/etc/certs/root-cert.pem
|
||||
TlsCertsToWatch []string `protobuf:"bytes,21,rep,name=tls_certs_to_watch,json=tlsCertsToWatch,proto3" json:"tls_certs_to_watch,omitempty"`
|
||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||
XXX_unrecognized []byte `json:"-"`
|
||||
XXX_sizecache int32 `json:"-"`
|
||||
|
|
@ -622,6 +625,13 @@ func (m *ProxyConfig) GetTracing() *Tracing {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (m *ProxyConfig) GetTlsCertsToWatch() []string {
|
||||
if m != nil {
|
||||
return m.TlsCertsToWatch
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func init() {
|
||||
proto.RegisterEnum("istio.mesh.v1alpha1.AuthenticationPolicy", AuthenticationPolicy_name, AuthenticationPolicy_value)
|
||||
proto.RegisterEnum("istio.mesh.v1alpha1.ProxyConfig_InboundInterceptionMode", ProxyConfig_InboundInterceptionMode_name, ProxyConfig_InboundInterceptionMode_value)
|
||||
|
|
@ -634,63 +644,65 @@ func init() {
|
|||
func init() { proto.RegisterFile("mesh/v1alpha1/proxy.proto", fileDescriptor_5efecd978cf3d28d) }
|
||||
|
||||
var fileDescriptor_5efecd978cf3d28d = []byte{
|
||||
// 890 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x5f, 0x6f, 0xe3, 0xc4,
|
||||
0x17, 0xad, 0xfb, 0xdb, 0xcd, 0x9f, 0x9b, 0x36, 0x75, 0x67, 0xf7, 0xd7, 0x75, 0x23, 0x28, 0xa1,
|
||||
0x48, 0x90, 0x05, 0xe4, 0x68, 0xbb, 0x12, 0xe2, 0x05, 0x44, 0xd2, 0x76, 0xd5, 0x48, 0x6d, 0x37,
|
||||
0x72, 0x53, 0x09, 0xfa, 0x32, 0x9a, 0xd8, 0xb7, 0xf1, 0x68, 0x9d, 0x19, 0x6b, 0x3c, 0x0e, 0x64,
|
||||
0xdf, 0xf8, 0x6a, 0x48, 0x48, 0x3c, 0xf2, 0x11, 0x50, 0x9f, 0xf8, 0x18, 0xc8, 0x33, 0x76, 0x36,
|
||||
0xa0, 0xee, 0xf6, 0x2d, 0x73, 0xee, 0x39, 0x67, 0xee, 0x1f, 0xdf, 0x09, 0xec, 0xcf, 0x31, 0x8b,
|
||||
0xfb, 0x8b, 0x17, 0x2c, 0x49, 0x63, 0xf6, 0xa2, 0x9f, 0x2a, 0xf9, 0xcb, 0xd2, 0x4f, 0x95, 0xd4,
|
||||
0x92, 0x3c, 0xe1, 0x99, 0xe6, 0xd2, 0x2f, 0x08, 0x7e, 0x45, 0xe8, 0x1c, 0xcc, 0xa4, 0x9c, 0x25,
|
||||
0xd8, 0x37, 0x94, 0x69, 0x7e, 0xdb, 0x8f, 0x72, 0xc5, 0x34, 0x97, 0xc2, 0x8a, 0x0e, 0x7f, 0xdb,
|
||||
0x84, 0xfa, 0x44, 0xb1, 0x90, 0x8b, 0x19, 0xf9, 0x0e, 0x6a, 0x6f, 0x79, 0xfa, 0x86, 0x0b, 0xcf,
|
||||
0xe9, 0x3a, 0xbd, 0xd6, 0xd1, 0x67, 0xfe, 0x3d, 0x8e, 0x7e, 0xc9, 0xf6, 0x6f, 0x0c, 0xf5, 0x6c,
|
||||
0x23, 0x28, 0x45, 0xe4, 0x15, 0x34, 0x13, 0x3e, 0x8b, 0x75, 0xa6, 0x31, 0xf5, 0x36, 0x8d, 0xc3,
|
||||
0xe7, 0x1f, 0x74, 0x38, 0xaf, 0xd8, 0x67, 0x1b, 0xc1, 0x3b, 0x69, 0xe7, 0x10, 0x6a, 0xd6, 0x9b,
|
||||
0x78, 0x50, 0x67, 0x51, 0xa4, 0x30, 0xcb, 0x4c, 0x46, 0xcd, 0xa0, 0x3a, 0x76, 0x7e, 0x75, 0xa0,
|
||||
0xb9, 0x92, 0xbf, 0x9f, 0x47, 0x3e, 0x85, 0x2d, 0x16, 0x86, 0x98, 0x65, 0x54, 0xcb, 0x37, 0x28,
|
||||
0x4c, 0x5a, 0xcd, 0xa0, 0x65, 0xb1, 0x49, 0x01, 0x91, 0x3d, 0xa8, 0x65, 0x18, 0xe6, 0x0a, 0xbd,
|
||||
0xff, 0x75, 0x9d, 0x5e, 0x23, 0x28, 0x4f, 0xe4, 0x13, 0x68, 0x85, 0x2c, 0x44, 0xa5, 0x69, 0xca,
|
||||
0x74, 0xec, 0x3d, 0x32, 0x4a, 0xb0, 0xd0, 0x98, 0xe9, 0x78, 0xd8, 0x80, 0x9a, 0x56, 0xc5, 0xf1,
|
||||
0xf0, 0xf7, 0x26, 0xb4, 0xc6, 0xc5, 0x24, 0x8e, 0xa5, 0xb8, 0xe5, 0x33, 0x23, 0x35, 0xbf, 0xac,
|
||||
0xd4, 0x29, 0xa5, 0x06, 0x2a, 0xa4, 0x05, 0x61, 0xca, 0x05, 0x53, 0x4b, 0x4b, 0xb0, 0x59, 0x81,
|
||||
0x85, 0x0c, 0xe1, 0x0b, 0xd8, 0xc9, 0x50, 0x2d, 0x78, 0x88, 0x34, 0x4c, 0xf2, 0x4c, 0xa3, 0x32,
|
||||
0xd9, 0x35, 0x83, 0x76, 0x09, 0x1f, 0x5b, 0x94, 0xfc, 0x00, 0xed, 0x48, 0x31, 0x2e, 0x68, 0x35,
|
||||
0x57, 0x93, 0x68, 0xeb, 0x68, 0xdf, 0xb7, 0x83, 0xf7, 0xab, 0xc1, 0xfb, 0x27, 0x25, 0x21, 0xd8,
|
||||
0x36, 0x82, 0xea, 0x48, 0xae, 0xc0, 0x4b, 0x99, 0x42, 0xa1, 0x69, 0x16, 0xe7, 0x3a, 0x92, 0x3f,
|
||||
0xaf, 0x79, 0x3d, 0x7e, 0xc8, 0x6b, 0xcf, 0x4a, 0xaf, 0x4a, 0xe5, 0xca, 0xf4, 0x2b, 0xd8, 0x8d,
|
||||
0x78, 0x16, 0xca, 0x05, 0xaa, 0x25, 0xad, 0x66, 0x53, 0x33, 0x15, 0xb8, 0xab, 0xc0, 0xa0, 0x1c,
|
||||
0xd2, 0x35, 0x3c, 0x7b, 0x47, 0x56, 0x78, 0xab, 0x30, 0x8b, 0x69, 0x84, 0x09, 0x5b, 0x7a, 0xf5,
|
||||
0x07, 0x12, 0x18, 0x6e, 0x7a, 0x4e, 0xf0, 0xff, 0x95, 0x3a, 0xb0, 0xe2, 0x93, 0x42, 0x4b, 0x9e,
|
||||
0x43, 0xdb, 0x7e, 0x99, 0xab, 0x04, 0x1a, 0x45, 0x02, 0x46, 0xb2, 0x6d, 0x23, 0x55, 0x06, 0x43,
|
||||
0xd8, 0x09, 0xa5, 0x10, 0x18, 0x6a, 0xaa, 0xf9, 0x1c, 0x65, 0xae, 0xbd, 0xe6, 0x43, 0xa5, 0xb7,
|
||||
0x4b, 0xc5, 0xc4, 0x0a, 0xc8, 0xd7, 0x40, 0x32, 0xcd, 0x74, 0x16, 0xd1, 0x3c, 0x4a, 0x57, 0x57,
|
||||
0x82, 0xad, 0xd9, 0x46, 0xae, 0xa3, 0xb4, 0xba, 0x71, 0x00, 0x1f, 0xa3, 0x58, 0xc8, 0x25, 0x9d,
|
||||
0xa3, 0x56, 0x3c, 0xcc, 0x68, 0x35, 0xee, 0x4a, 0xf8, 0xd4, 0x08, 0x3b, 0x86, 0x74, 0x61, 0x39,
|
||||
0x57, 0x96, 0x52, 0x59, 0xf4, 0xc0, 0x35, 0xeb, 0x4f, 0x59, 0x34, 0xe7, 0x82, 0xa6, 0x52, 0x69,
|
||||
0xaf, 0xd5, 0x75, 0x7a, 0x8f, 0x83, 0xb6, 0xc1, 0x07, 0x05, 0x3c, 0x96, 0x4a, 0x93, 0x3e, 0xec,
|
||||
0xb2, 0x05, 0xe3, 0x09, 0x9b, 0xf2, 0x84, 0xeb, 0x25, 0x7d, 0x2b, 0x05, 0x7a, 0x5b, 0xab, 0x66,
|
||||
0xb8, 0xeb, 0xc1, 0x1b, 0x29, 0x90, 0x44, 0xb0, 0x1f, 0x4a, 0xa1, 0x95, 0x4c, 0x68, 0x9a, 0x30,
|
||||
0x81, 0x94, 0xe5, 0x3a, 0xa6, 0xa9, 0x4c, 0x78, 0xb8, 0xf4, 0xb6, 0xbb, 0x4e, 0xaf, 0x7d, 0xf4,
|
||||
0xfc, 0xde, 0xd5, 0x1e, 0xe4, 0x3a, 0x46, 0xa1, 0x79, 0x68, 0x7a, 0x34, 0x36, 0x82, 0x60, 0xaf,
|
||||
0xf4, 0x1a, 0x17, 0x56, 0x05, 0xc3, 0xe2, 0x45, 0xc7, 0xc2, 0x3c, 0xd3, 0x72, 0x4e, 0xcb, 0x6d,
|
||||
0xb9, 0xe5, 0x09, 0x7a, 0x6d, 0xdb, 0x31, 0x1b, 0xb1, 0x0b, 0xf5, 0x8a, 0x27, 0x58, 0x94, 0x5b,
|
||||
0x74, 0x91, 0x0a, 0x36, 0x47, 0x9a, 0xa0, 0x98, 0xe9, 0xd8, 0xdb, 0xb1, 0xe5, 0x16, 0xf8, 0x25,
|
||||
0x9b, 0xe3, 0xb9, 0x41, 0x49, 0xd7, 0xac, 0x5f, 0x98, 0x2b, 0x85, 0x22, 0x5c, 0x7a, 0xae, 0x21,
|
||||
0xad, 0x43, 0x45, 0xf7, 0x6d, 0xeb, 0xa6, 0x52, 0xea, 0x4c, 0x2b, 0x96, 0x52, 0x8d, 0xf3, 0x34,
|
||||
0x61, 0x1a, 0xed, 0x46, 0xee, 0xda, 0xee, 0x1b, 0xd2, 0xb0, 0xe2, 0x4c, 0x4a, 0x8a, 0xd9, 0x50,
|
||||
0x84, 0x5d, 0x2e, 0x34, 0xaa, 0x10, 0xd3, 0xa2, 0x54, 0x3a, 0x97, 0x11, 0x7a, 0xc4, 0xb4, 0xe6,
|
||||
0xdb, 0x7b, 0x5b, 0xb3, 0xf6, 0x40, 0xf8, 0x23, 0x31, 0x95, 0xb9, 0x88, 0x46, 0x6b, 0x06, 0x17,
|
||||
0x32, 0xc2, 0xc0, 0xe5, 0xff, 0x41, 0xc8, 0x37, 0x50, 0xd7, 0xf6, 0xb9, 0xf4, 0x9e, 0x98, 0x2f,
|
||||
0xf2, 0xa3, 0x0f, 0x3d, 0xa9, 0x41, 0x45, 0x3e, 0x7c, 0x09, 0xcf, 0xde, 0x73, 0x09, 0xd9, 0x82,
|
||||
0x46, 0x70, 0x7a, 0x32, 0x0a, 0x4e, 0x8f, 0x27, 0xee, 0x06, 0x01, 0xa8, 0x4d, 0xc6, 0xc1, 0xeb,
|
||||
0x1f, 0x7f, 0x72, 0x9d, 0x2f, 0xbf, 0x87, 0xa7, 0xf7, 0x0d, 0x90, 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, 0x4d, 0x94, 0xcb,
|
||||
0x3e, 0x4b, 0x79, 0xff, 0x5f, 0xff, 0x5b, 0xd3, 0x9a, 0xd9, 0xa7, 0x97, 0xff, 0x04, 0x00, 0x00,
|
||||
0xff, 0xff, 0x92, 0x7b, 0x1a, 0x92, 0xcf, 0x06, 0x00, 0x00,
|
||||
// 920 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x4d, 0x6f, 0xdb, 0x36,
|
||||
0x18, 0x8e, 0xd2, 0xd6, 0x1f, 0x74, 0xe2, 0x28, 0x6c, 0x9b, 0x2a, 0xc6, 0x96, 0x79, 0x19, 0xb0,
|
||||
0xb9, 0xeb, 0x20, 0xa3, 0x29, 0x30, 0xec, 0xb2, 0x61, 0x76, 0x92, 0x22, 0x06, 0x92, 0xd4, 0x50,
|
||||
0x14, 0x6c, 0xcb, 0x85, 0xa0, 0x29, 0xc6, 0x22, 0x2a, 0x93, 0x02, 0x49, 0xb9, 0x73, 0x6f, 0xfb,
|
||||
0x6b, 0x3b, 0xed, 0xb8, 0x9f, 0x30, 0xe4, 0xb4, 0xf3, 0x7e, 0xc1, 0x40, 0x52, 0x72, 0xbd, 0x21,
|
||||
0x4d, 0x6e, 0xe6, 0xf3, 0x3e, 0xcf, 0xa3, 0xf7, 0x83, 0x2f, 0x0d, 0x76, 0x67, 0x54, 0xa5, 0xfd,
|
||||
0xf9, 0x4b, 0x9c, 0xe5, 0x29, 0x7e, 0xd9, 0xcf, 0xa5, 0xf8, 0x75, 0x11, 0xe6, 0x52, 0x68, 0x01,
|
||||
0x1f, 0x33, 0xa5, 0x99, 0x08, 0x0d, 0x21, 0xac, 0x08, 0x9d, 0xbd, 0xa9, 0x10, 0xd3, 0x8c, 0xf6,
|
||||
0x2d, 0x65, 0x52, 0x5c, 0xf7, 0x93, 0x42, 0x62, 0xcd, 0x04, 0x77, 0xa2, 0xfd, 0xdf, 0xd7, 0x41,
|
||||
0x3d, 0x96, 0x98, 0x30, 0x3e, 0x85, 0xdf, 0x83, 0xda, 0x7b, 0x96, 0xbf, 0x65, 0x3c, 0xf0, 0xba,
|
||||
0x5e, 0xaf, 0x75, 0xf0, 0x45, 0x78, 0x8b, 0x63, 0x58, 0xb2, 0xc3, 0x2b, 0x4b, 0x3d, 0x59, 0x8b,
|
||||
0x4a, 0x11, 0x7c, 0x0d, 0x9a, 0x19, 0x9b, 0xa6, 0x5a, 0x69, 0x9a, 0x07, 0xeb, 0xd6, 0xe1, 0xcb,
|
||||
0x3b, 0x1d, 0x4e, 0x2b, 0xf6, 0xc9, 0x5a, 0xf4, 0x41, 0xda, 0xd9, 0x07, 0x35, 0xe7, 0x0d, 0x03,
|
||||
0x50, 0xc7, 0x49, 0x22, 0xa9, 0x52, 0x36, 0xa3, 0x66, 0x54, 0x1d, 0x3b, 0xbf, 0x79, 0xa0, 0xb9,
|
||||
0x94, 0x7f, 0x9c, 0x07, 0x3f, 0x07, 0x1b, 0x98, 0x10, 0xaa, 0x14, 0xd2, 0xe2, 0x2d, 0xe5, 0x36,
|
||||
0xad, 0x66, 0xd4, 0x72, 0x58, 0x6c, 0x20, 0xb8, 0x03, 0x6a, 0x8a, 0x92, 0x42, 0xd2, 0xe0, 0x41,
|
||||
0xd7, 0xeb, 0x35, 0xa2, 0xf2, 0x04, 0x3f, 0x03, 0x2d, 0x82, 0x09, 0x95, 0x1a, 0xe5, 0x58, 0xa7,
|
||||
0xc1, 0x43, 0xab, 0x04, 0x0e, 0x1a, 0x63, 0x9d, 0x0e, 0x1b, 0xa0, 0xa6, 0xa5, 0x39, 0xee, 0xff,
|
||||
0xd3, 0x04, 0xad, 0xb1, 0x99, 0xc4, 0xa1, 0xe0, 0xd7, 0x6c, 0x6a, 0xa5, 0xf6, 0x97, 0x93, 0x7a,
|
||||
0xa5, 0xd4, 0x42, 0x46, 0x6a, 0x08, 0x13, 0xc6, 0xb1, 0x5c, 0x38, 0x82, 0xcb, 0x0a, 0x38, 0xc8,
|
||||
0x12, 0xbe, 0x02, 0x5b, 0x8a, 0xca, 0x39, 0x23, 0x14, 0x91, 0xac, 0x50, 0x9a, 0x4a, 0x9b, 0x5d,
|
||||
0x33, 0x6a, 0x97, 0xf0, 0xa1, 0x43, 0xe1, 0x8f, 0xa0, 0x9d, 0x48, 0xcc, 0x38, 0xaa, 0xe6, 0x6a,
|
||||
0x13, 0x6d, 0x1d, 0xec, 0x86, 0x6e, 0xf0, 0x61, 0x35, 0xf8, 0xf0, 0xa8, 0x24, 0x44, 0x9b, 0x56,
|
||||
0x50, 0x1d, 0xe1, 0x05, 0x08, 0x72, 0x2c, 0x29, 0xd7, 0x48, 0xa5, 0x85, 0x4e, 0xc4, 0xbb, 0x15,
|
||||
0xaf, 0x47, 0xf7, 0x79, 0xed, 0x38, 0xe9, 0x45, 0xa9, 0x5c, 0x9a, 0xbe, 0x00, 0xdb, 0x09, 0x53,
|
||||
0x44, 0xcc, 0xa9, 0x5c, 0xa0, 0x6a, 0x36, 0x35, 0x5b, 0x81, 0xbf, 0x0c, 0x0c, 0xca, 0x21, 0x5d,
|
||||
0x82, 0x67, 0x1f, 0xc8, 0x92, 0x5e, 0x4b, 0xaa, 0x52, 0x94, 0xd0, 0x0c, 0x2f, 0x82, 0xfa, 0x3d,
|
||||
0x09, 0x0c, 0xd7, 0x03, 0x2f, 0x7a, 0xba, 0x54, 0x47, 0x4e, 0x7c, 0x64, 0xb4, 0xf0, 0x39, 0x68,
|
||||
0xbb, 0x9b, 0xb9, 0x4c, 0xa0, 0x61, 0x12, 0xb0, 0x92, 0x4d, 0x17, 0xa9, 0x32, 0x18, 0x82, 0x2d,
|
||||
0x22, 0x38, 0xa7, 0x44, 0x23, 0xcd, 0x66, 0x54, 0x14, 0x3a, 0x68, 0xde, 0x57, 0x7a, 0xbb, 0x54,
|
||||
0xc4, 0x4e, 0x00, 0xbf, 0x01, 0x50, 0x69, 0xac, 0x55, 0x82, 0x8a, 0x24, 0x5f, 0x7e, 0x12, 0xb8,
|
||||
0x9a, 0x5d, 0xe4, 0x32, 0xc9, 0xab, 0x2f, 0x0e, 0xc0, 0xa7, 0x94, 0xcf, 0xc5, 0x02, 0xcd, 0xa8,
|
||||
0x96, 0x8c, 0x28, 0x54, 0x8d, 0xbb, 0x12, 0x3e, 0xb1, 0xc2, 0x8e, 0x25, 0x9d, 0x39, 0xce, 0x85,
|
||||
0xa3, 0x54, 0x16, 0x3d, 0xe0, 0xdb, 0xf5, 0x47, 0x38, 0x99, 0x31, 0x8e, 0x72, 0x21, 0x75, 0xd0,
|
||||
0xea, 0x7a, 0xbd, 0x47, 0x51, 0xdb, 0xe2, 0x03, 0x03, 0x8f, 0x85, 0xd4, 0xb0, 0x0f, 0xb6, 0xf1,
|
||||
0x1c, 0xb3, 0x0c, 0x4f, 0x58, 0xc6, 0xf4, 0x02, 0xbd, 0x17, 0x9c, 0x06, 0x1b, 0xcb, 0x66, 0xf8,
|
||||
0xab, 0xc1, 0x2b, 0xc1, 0x29, 0x4c, 0xc0, 0x2e, 0x11, 0x5c, 0x4b, 0x91, 0xa1, 0x3c, 0xc3, 0x9c,
|
||||
0x22, 0x5c, 0xe8, 0x14, 0xe5, 0x22, 0x63, 0x64, 0x11, 0x6c, 0x76, 0xbd, 0x5e, 0xfb, 0xe0, 0xf9,
|
||||
0xad, 0xab, 0x3d, 0x28, 0x74, 0x4a, 0xb9, 0x66, 0xc4, 0xf6, 0x68, 0x6c, 0x05, 0xd1, 0x4e, 0xe9,
|
||||
0x35, 0x36, 0x56, 0x86, 0xe1, 0x70, 0xd3, 0x31, 0x52, 0x28, 0x2d, 0x66, 0xa8, 0xdc, 0x96, 0x6b,
|
||||
0x96, 0xd1, 0xa0, 0xed, 0x3a, 0xe6, 0x22, 0x6e, 0xa1, 0x5e, 0xb3, 0x8c, 0x9a, 0x72, 0x4d, 0x17,
|
||||
0x11, 0xc7, 0x33, 0x8a, 0x32, 0xca, 0xa7, 0x3a, 0x0d, 0xb6, 0x5c, 0xb9, 0x06, 0x3f, 0xc7, 0x33,
|
||||
0x7a, 0x6a, 0x51, 0xd8, 0xb5, 0xeb, 0x47, 0x0a, 0x29, 0x29, 0x27, 0x8b, 0xc0, 0xb7, 0xa4, 0x55,
|
||||
0xc8, 0x74, 0xdf, 0xb5, 0x6e, 0x22, 0x84, 0x56, 0x5a, 0xe2, 0x1c, 0x69, 0x3a, 0xcb, 0x33, 0xac,
|
||||
0xa9, 0xdb, 0xc8, 0x6d, 0xd7, 0x7d, 0x4b, 0x1a, 0x56, 0x9c, 0xb8, 0xa4, 0xd8, 0x0d, 0xa5, 0x60,
|
||||
0x9b, 0x71, 0x4d, 0x25, 0xa1, 0xb9, 0x29, 0x15, 0xcd, 0x44, 0x42, 0x03, 0x68, 0x5b, 0xf3, 0xdd,
|
||||
0xad, 0xad, 0x59, 0x79, 0x20, 0xc2, 0x11, 0x9f, 0x88, 0x82, 0x27, 0xa3, 0x15, 0x83, 0x33, 0x91,
|
||||
0xd0, 0xc8, 0x67, 0xff, 0x43, 0xe0, 0xb7, 0xa0, 0xae, 0xdd, 0x73, 0x19, 0x3c, 0xb6, 0x37, 0xf2,
|
||||
0x93, 0xbb, 0x9e, 0xd4, 0xa8, 0x22, 0xc3, 0x17, 0x00, 0xea, 0x4c, 0x21, 0xf3, 0x58, 0x99, 0xb7,
|
||||
0x0f, 0xbd, 0xc3, 0x9a, 0xa4, 0xc1, 0xd3, 0xee, 0x83, 0x5e, 0x33, 0xda, 0xd2, 0x99, 0x3a, 0x34,
|
||||
0x81, 0x58, 0xfc, 0x64, 0xe0, 0xfd, 0x57, 0xe0, 0xd9, 0x47, 0x32, 0x82, 0x1b, 0xa0, 0x11, 0x1d,
|
||||
0x1f, 0x8d, 0xa2, 0xe3, 0xc3, 0xd8, 0x5f, 0x83, 0x00, 0xd4, 0xe2, 0x71, 0xf4, 0xe6, 0xe7, 0x5f,
|
||||
0x7c, 0xef, 0xeb, 0x1f, 0xc0, 0x93, 0xdb, 0xa6, 0x0d, 0x1b, 0xe0, 0xe1, 0xf9, 0x9b, 0xf3, 0x63,
|
||||
0x7f, 0x0d, 0xb6, 0x01, 0x38, 0xbb, 0x8c, 0x2f, 0x07, 0xa7, 0x28, 0x3e, 0xbd, 0xf0, 0x3d, 0xb8,
|
||||
0x01, 0xea, 0xa3, 0xf3, 0x93, 0xe3, 0x68, 0x14, 0xfb, 0x7f, 0xd7, 0x87, 0xbd, 0x3f, 0x6e, 0xf6,
|
||||
0xbc, 0x3f, 0x6f, 0xf6, 0xbc, 0xbf, 0x6e, 0xf6, 0xbc, 0xab, 0x8e, 0xab, 0x8a, 0x89, 0x3e, 0xce,
|
||||
0x59, 0xff, 0x3f, 0x7f, 0x72, 0x93, 0x9a, 0x5d, 0xbe, 0x57, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff,
|
||||
0x65, 0x9b, 0x46, 0xaf, 0xfc, 0x06, 0x00, 0x00,
|
||||
}
|
||||
|
||||
func (m *Tracing) Marshal() (dAtA []byte, err error) {
|
||||
|
|
@ -985,6 +997,23 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) {
|
|||
i = encodeVarintProxy(dAtA, i, uint64(len(m.EnvoyMetricsServiceAddress)))
|
||||
i += copy(dAtA[i:], m.EnvoyMetricsServiceAddress)
|
||||
}
|
||||
if len(m.TlsCertsToWatch) > 0 {
|
||||
for _, s := range m.TlsCertsToWatch {
|
||||
dAtA[i] = 0xaa
|
||||
i++
|
||||
dAtA[i] = 0x1
|
||||
i++
|
||||
l = len(s)
|
||||
for l >= 1<<7 {
|
||||
dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
|
||||
l >>= 7
|
||||
i++
|
||||
}
|
||||
dAtA[i] = uint8(l)
|
||||
i++
|
||||
i += copy(dAtA[i:], s)
|
||||
}
|
||||
}
|
||||
if m.XXX_unrecognized != nil {
|
||||
i += copy(dAtA[i:], m.XXX_unrecognized)
|
||||
}
|
||||
|
|
@ -1163,6 +1192,12 @@ func (m *ProxyConfig) Size() (n int) {
|
|||
if l > 0 {
|
||||
n += 2 + l + sovProxy(uint64(l))
|
||||
}
|
||||
if len(m.TlsCertsToWatch) > 0 {
|
||||
for _, s := range m.TlsCertsToWatch {
|
||||
l = len(s)
|
||||
n += 2 + l + sovProxy(uint64(l))
|
||||
}
|
||||
}
|
||||
if m.XXX_unrecognized != nil {
|
||||
n += len(m.XXX_unrecognized)
|
||||
}
|
||||
|
|
@ -2186,6 +2221,38 @@ func (m *ProxyConfig) Unmarshal(dAtA []byte) error {
|
|||
}
|
||||
m.EnvoyMetricsServiceAddress = string(dAtA[iNdEx:postIndex])
|
||||
iNdEx = postIndex
|
||||
case 21:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field TlsCertsToWatch", 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 < 0 {
|
||||
return ErrInvalidLengthProxy
|
||||
}
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
m.TlsCertsToWatch = append(m.TlsCertsToWatch, string(dAtA[iNdEx:postIndex]))
|
||||
iNdEx = postIndex
|
||||
default:
|
||||
iNdEx = preIndex
|
||||
skippy, err := skipProxy(dAtA[iNdEx:])
|
||||
|
|
|
|||
|
|
@ -169,4 +169,8 @@ message ProxyConfig {
|
|||
|
||||
// Tracing configuration to be used by the proxy.
|
||||
Tracing tracing = 19;
|
||||
|
||||
// Absolute path to certs/key files used for istio mTLS. If omitted, defaults to
|
||||
// /etc/certs/cert-chain.pem,/etc/certs/key.pem,/etc/certs/root-cert.pem
|
||||
repeated string tls_certs_to_watch = 21;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1360,6 +1360,12 @@
|
|||
"id": 19,
|
||||
"name": "tracing",
|
||||
"type": "Tracing"
|
||||
},
|
||||
{
|
||||
"id": 21,
|
||||
"name": "tls_certs_to_watch",
|
||||
"type": "string",
|
||||
"is_repeated": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
|
|||
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\"\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\"\xfc\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\x12\x1a\n\x12tls_certs_to_watch\x18\x15 \x03(\t\"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 @@ _AUTHENTICATIONPOLICY = _descriptor.EnumDescriptor(
|
|||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_start=1203,
|
||||
serialized_end=1265,
|
||||
serialized_start=1231,
|
||||
serialized_end=1293,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_AUTHENTICATIONPOLICY)
|
||||
|
||||
|
|
@ -74,8 +74,8 @@ _PROXYCONFIG_INBOUNDINTERCEPTIONMODE = _descriptor.EnumDescriptor(
|
|||
],
|
||||
containing_type=None,
|
||||
options=None,
|
||||
serialized_start=1150,
|
||||
serialized_end=1201,
|
||||
serialized_start=1178,
|
||||
serialized_end=1229,
|
||||
)
|
||||
_sym_db.RegisterEnumDescriptor(_PROXYCONFIG_INBOUNDINTERCEPTIONMODE)
|
||||
|
||||
|
|
@ -349,6 +349,13 @@ _PROXYCONFIG = _descriptor.Descriptor(
|
|||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None, file=DESCRIPTOR),
|
||||
_descriptor.FieldDescriptor(
|
||||
name='tls_certs_to_watch', full_name='istio.mesh.v1alpha1.ProxyConfig.tls_certs_to_watch', index=20,
|
||||
number=21, type=9, cpp_type=9, label=3,
|
||||
has_default_value=False, default_value=[],
|
||||
message_type=None, enum_type=None, containing_type=None,
|
||||
is_extension=False, extension_scope=None,
|
||||
options=None, file=DESCRIPTOR),
|
||||
],
|
||||
extensions=[
|
||||
],
|
||||
|
|
@ -363,7 +370,7 @@ _PROXYCONFIG = _descriptor.Descriptor(
|
|||
oneofs=[
|
||||
],
|
||||
serialized_start=337,
|
||||
serialized_end=1201,
|
||||
serialized_end=1229,
|
||||
)
|
||||
|
||||
_TRACING_ZIPKIN.containing_type = _TRACING
|
||||
|
|
|
|||
Loading…
Reference in New Issue