From e282ebded56991b4b74aef588fd4c878c0ac9c3f Mon Sep 17 00:00:00 2001 From: Shriram Rajagopalan Date: Mon, 22 Oct 2018 16:32:43 -0400 Subject: [PATCH 1/2] MCP server configuration Signed-off-by: Shriram Rajagopalan --- mesh/v1alpha1/config.pb.go | 358 ++++++++++++++++--- mesh/v1alpha1/config.proto | 24 +- mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 51 ++- python/istio_api/mesh/v1alpha1/config_pb2.py | 76 +++- 4 files changed, 449 insertions(+), 60 deletions(-) diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go index df48c35359..b554672294 100644 --- a/mesh/v1alpha1/config.pb.go +++ b/mesh/v1alpha1/config.pb.go @@ -11,6 +11,7 @@ It has these top-level messages: MeshConfig + ConfigSource Network MeshNetworks Tracing @@ -22,6 +23,7 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" import google_protobuf "github.com/gogo/protobuf/types" +import istio_networking_v1alpha31 "istio.io/api/networking/v1alpha3" import io "io" @@ -167,6 +169,10 @@ type MeshConfig struct { // for k8s service account JWT, so that K8s API server mounts k8s service account JWT to envoy container, which // will be used to generate key/cert eventually. This isn't supported for non-k8s case. EnableSdsTokenMount bool `protobuf:"varint,23,opt,name=enable_sds_token_mount,json=enableSdsTokenMount,proto3" json:"enable_sds_token_mount,omitempty"` + // ConfigSource describes a source of configuration data for networking + // rules, and other Istio configuration artifacts. Multiple data sources + // can be configured for a single control plane. + ConfigSources []*ConfigSource `protobuf:"bytes,25,rep,name=config_sources,json=configSources" json:"config_sources,omitempty"` } func (m *MeshConfig) Reset() { *m = MeshConfig{} } @@ -300,8 +306,48 @@ func (m *MeshConfig) GetEnableSdsTokenMount() bool { return false } +func (m *MeshConfig) GetConfigSources() []*ConfigSource { + if m != nil { + return m.ConfigSources + } + return nil +} + +// ConfigSource describes information about a configuration store inside a +// mesh. A single control plane instance can interact with one or more data +// sources. +type ConfigSource struct { + // Address of the server implementing the Istio Mesh Configuration + // protocol (MCP). Can be IP address or a fully qualified DNS name. + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + // Use the tls_settings to specify the tls mode to use. If the MCP server + // uses Istio MTLS and shares the root CA with Pilot, specify the TLS + // mode as ISTIO_MUTUAL. + TlsSettings *istio_networking_v1alpha31.TLSSettings `protobuf:"bytes,2,opt,name=tls_settings,json=tlsSettings" json:"tls_settings,omitempty"` +} + +func (m *ConfigSource) Reset() { *m = ConfigSource{} } +func (m *ConfigSource) String() string { return proto.CompactTextString(m) } +func (*ConfigSource) ProtoMessage() {} +func (*ConfigSource) Descriptor() ([]byte, []int) { return fileDescriptorConfig, []int{1} } + +func (m *ConfigSource) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +func (m *ConfigSource) GetTlsSettings() *istio_networking_v1alpha31.TLSSettings { + if m != nil { + return m.TlsSettings + } + return nil +} + func init() { proto.RegisterType((*MeshConfig)(nil), "istio.mesh.v1alpha1.MeshConfig") + proto.RegisterType((*ConfigSource)(nil), "istio.mesh.v1alpha1.ConfigSource") proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_IngressControllerMode", MeshConfig_IngressControllerMode_name, MeshConfig_IngressControllerMode_value) proto.RegisterEnum("istio.mesh.v1alpha1.MeshConfig_AuthPolicy", MeshConfig_AuthPolicy_name, MeshConfig_AuthPolicy_value) } @@ -458,6 +504,54 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintConfig(dAtA, i, uint64(len(m.AccessLogFormat))) i += copy(dAtA[i:], m.AccessLogFormat) } + if len(m.ConfigSources) > 0 { + for _, msg := range m.ConfigSources { + dAtA[i] = 0xca + i++ + dAtA[i] = 0x1 + i++ + i = encodeVarintConfig(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } + } + return i, nil +} + +func (m *ConfigSource) 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 *ConfigSource) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Address) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintConfig(dAtA, i, uint64(len(m.Address))) + i += copy(dAtA[i:], m.Address) + } + if m.TlsSettings != nil { + dAtA[i] = 0x12 + i++ + i = encodeVarintConfig(dAtA, i, uint64(m.TlsSettings.Size())) + n3, err := m.TlsSettings.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n3 + } return i, nil } @@ -537,6 +631,26 @@ func (m *MeshConfig) Size() (n int) { if l > 0 { n += 2 + l + sovConfig(uint64(l)) } + if len(m.ConfigSources) > 0 { + for _, e := range m.ConfigSources { + l = e.Size() + n += 2 + l + sovConfig(uint64(l)) + } + } + return n +} + +func (m *ConfigSource) Size() (n int) { + var l int + _ = l + l = len(m.Address) + if l > 0 { + n += 1 + l + sovConfig(uint64(l)) + } + if m.TlsSettings != nil { + l = m.TlsSettings.Size() + n += 1 + l + sovConfig(uint64(l)) + } return n } @@ -1036,6 +1150,149 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } m.AccessLogFormat = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 25: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConfigSources", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ConfigSources = append(m.ConfigSources, &ConfigSource{}) + if err := m.ConfigSources[len(m.ConfigSources)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipConfig(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthConfig + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *ConfigSource) 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 ErrIntOverflowConfig + } + 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: ConfigSource: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ConfigSource: 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 ErrIntOverflowConfig + } + 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 ErrInvalidLengthConfig + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Address = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TlsSettings", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfig + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.TlsSettings == nil { + m.TlsSettings = &istio_networking_v1alpha31.TLSSettings{} + } + if err := m.TlsSettings.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipConfig(dAtA[iNdEx:]) @@ -1165,51 +1422,58 @@ var ( func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptorConfig) } var fileDescriptorConfig = []byte{ - // 723 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xdd, 0x4e, 0xfb, 0x36, - 0x1c, 0xfd, 0x07, 0x02, 0x04, 0xf7, 0x2b, 0x75, 0x57, 0x30, 0x9d, 0xd4, 0x55, 0x4c, 0x63, 0x15, - 0x9a, 0x52, 0x01, 0xda, 0xc5, 0x2e, 0x4b, 0xa1, 0x1b, 0x55, 0x0b, 0x55, 0x9a, 0xde, 0xec, 0xc6, - 0x32, 0x89, 0x9b, 0x58, 0xa4, 0x71, 0x14, 0x3b, 0x08, 0xde, 0x70, 0x97, 0x93, 0xf6, 0x02, 0x13, - 0x4f, 0x32, 0xc5, 0x4e, 0xf9, 0x90, 0x2a, 0xed, 0x32, 0xe7, 0x9c, 0xdf, 0xe7, 0xf9, 0x39, 0xa0, - 0xb3, 0xa6, 0x22, 0x1a, 0x3c, 0x5f, 0x90, 0x38, 0x8d, 0xc8, 0xc5, 0xc0, 0xe7, 0xc9, 0x8a, 0x85, - 0x4e, 0x9a, 0x71, 0xc9, 0x61, 0x8b, 0x09, 0xc9, 0xb8, 0x53, 0x28, 0x9c, 0x8d, 0xa2, 0xd3, 0x0d, - 0x39, 0x0f, 0x63, 0x3a, 0x50, 0x92, 0xc7, 0x7c, 0x35, 0x08, 0xf2, 0x8c, 0x48, 0xc6, 0x13, 0x1d, - 0xd4, 0x39, 0xf9, 0x9a, 0x30, 0xcd, 0xf8, 0xcb, 0xab, 0xa6, 0x4e, 0xff, 0xb1, 0x00, 0x98, 0x51, - 0x11, 0x8d, 0x54, 0x11, 0xf8, 0x0b, 0x80, 0x6b, 0xf6, 0x42, 0x33, 0xec, 0x47, 0xd4, 0x7f, 0xc2, - 0x82, 0x66, 0xcf, 0x34, 0x43, 0x46, 0xcf, 0xe8, 0x1f, 0xba, 0xb6, 0x62, 0x46, 0x05, 0xb1, 0x50, - 0x38, 0x74, 0x40, 0x4b, 0xab, 0x33, 0x9a, 0xf2, 0x4c, 0x6e, 0xe4, 0x3b, 0x4a, 0xde, 0x54, 0x94, - 0xab, 0x98, 0x52, 0x7f, 0x09, 0xda, 0x01, 0x13, 0xe4, 0x31, 0xa6, 0x38, 0xe5, 0x31, 0xf3, 0x5f, - 0x75, 0x19, 0x81, 0x76, 0x7b, 0x46, 0xdf, 0x72, 0x5b, 0x25, 0x39, 0x57, 0x9c, 0x2a, 0x24, 0xe0, - 0x39, 0x68, 0xaa, 0x7e, 0x71, 0xcc, 0x84, 0xa4, 0x09, 0x2e, 0xd2, 0x21, 0xb3, 0x67, 0xf4, 0xf7, - 0xdc, 0x86, 0x22, 0xa6, 0x0a, 0x9f, 0xf3, 0x4c, 0xc2, 0x33, 0xa0, 0x21, 0x1c, 0x49, 0x99, 0x6a, - 0xe5, 0x9e, 0x52, 0xd6, 0x14, 0xfc, 0x87, 0x94, 0xa9, 0xd2, 0x5d, 0x83, 0x86, 0xcf, 0x93, 0x84, - 0xfa, 0x12, 0x4b, 0xb6, 0xa6, 0x3c, 0x97, 0x68, 0xbf, 0x67, 0xf4, 0x2b, 0x97, 0x27, 0x8e, 0xde, - 0xa4, 0xb3, 0xd9, 0xa4, 0x73, 0x53, 0x6e, 0xd2, 0xad, 0x97, 0x11, 0x9e, 0x0e, 0x80, 0x3f, 0x82, - 0x1a, 0x4b, 0xc2, 0x8c, 0x0a, 0x81, 0xfd, 0x98, 0x08, 0x81, 0x0e, 0xd4, 0xd4, 0xd5, 0x12, 0x1c, - 0x15, 0x18, 0xfc, 0x19, 0x34, 0x36, 0xa2, 0x62, 0x37, 0xcc, 0xa7, 0xc8, 0x52, 0xb2, 0x7a, 0x09, - 0x2f, 0x34, 0x0a, 0xd7, 0xe0, 0xf8, 0x3d, 0x1b, 0x4f, 0x64, 0xc6, 0xe3, 0x98, 0x66, 0x78, 0xcd, - 0x03, 0x8a, 0x0e, 0x7b, 0x46, 0xbf, 0x7e, 0xf9, 0xab, 0xb3, 0xc5, 0x78, 0xe7, 0xc3, 0x39, 0xe7, - 0xae, 0xac, 0xfb, 0x1e, 0x3d, 0xe3, 0x01, 0x75, 0xdb, 0x6c, 0x1b, 0x0c, 0x1f, 0x40, 0x85, 0xe4, - 0x32, 0x2a, 0x5d, 0x40, 0x40, 0x95, 0x38, 0xff, 0xbf, 0x12, 0xc3, 0x5c, 0x46, 0xda, 0x9b, 0xeb, - 0x1d, 0x64, 0xb8, 0x80, 0xbc, 0x7f, 0xc3, 0x9f, 0x40, 0x9d, 0x26, 0xca, 0x58, 0x99, 0x11, 0x9f, - 0x25, 0x21, 0xaa, 0x2a, 0x4b, 0x6b, 0x1a, 0xf5, 0x34, 0x58, 0x18, 0x44, 0x7c, 0xbf, 0x98, 0x32, - 0xe6, 0x21, 0x5e, 0xb1, 0x98, 0xa2, 0x9a, 0xda, 0x47, 0x4d, 0xc3, 0x53, 0x1e, 0x8e, 0x59, 0x4c, - 0xe1, 0xef, 0xa0, 0x1e, 0xd0, 0x15, 0xc9, 0x63, 0x89, 0xf5, 0xf5, 0xa3, 0xba, 0xf2, 0xa7, 0xb7, - 0xb5, 0xc5, 0x79, 0x61, 0xae, 0xee, 0xd1, 0xad, 0x95, 0x71, 0xe5, 0x3d, 0xdf, 0x80, 0x1f, 0xca, - 0xbe, 0xfc, 0x98, 0xd1, 0x44, 0x62, 0xc1, 0x82, 0xaf, 0xc7, 0x87, 0x5a, 0xaa, 0xd1, 0xef, 0xb5, - 0x6c, 0xa4, 0x54, 0x0b, 0x16, 0x7c, 0x3e, 0x42, 0xd8, 0x03, 0x55, 0x11, 0x08, 0x9c, 0x07, 0x02, - 0xa7, 0x44, 0x46, 0xe8, 0x3b, 0xd5, 0x33, 0x10, 0x81, 0x58, 0x06, 0x62, 0x4e, 0x64, 0x54, 0xcc, - 0x1f, 0x92, 0x38, 0xa6, 0xaf, 0x98, 0x04, 0x41, 0xb1, 0x70, 0x74, 0xa4, 0xe7, 0xd2, 0xe8, 0x50, - 0x83, 0xf0, 0x0a, 0x1c, 0x95, 0xed, 0x14, 0xf9, 0x24, 0x7f, 0xa2, 0x09, 0x5e, 0xf3, 0x3c, 0x91, - 0xe8, 0x58, 0xbf, 0x00, 0xcd, 0x2e, 0x02, 0xe1, 0x15, 0xdc, 0xac, 0xa0, 0x8a, 0x17, 0xf0, 0x79, - 0x69, 0x3c, 0x5b, 0x13, 0x89, 0x90, 0x4a, 0xdf, 0xf8, 0x58, 0x9b, 0x82, 0x4f, 0x7f, 0x03, 0xed, - 0xad, 0x87, 0x00, 0x0f, 0xc0, 0xee, 0xc3, 0x78, 0x6c, 0x7f, 0x83, 0x15, 0x70, 0x70, 0x73, 0x3b, - 0x1e, 0x2e, 0xa7, 0x9e, 0x6d, 0x40, 0x00, 0xf6, 0x17, 0x9e, 0x7b, 0x37, 0xf2, 0xec, 0x9d, 0xd3, - 0x33, 0x00, 0x3e, 0x0c, 0x86, 0x16, 0x30, 0xef, 0x1f, 0xee, 0x6f, 0xed, 0x6f, 0xb0, 0x0e, 0xc0, - 0x6c, 0xe9, 0x2d, 0x87, 0x53, 0xec, 0x4d, 0x17, 0xb6, 0x31, 0x31, 0xad, 0x8a, 0x5d, 0x9d, 0x98, - 0x56, 0xc3, 0xb6, 0x27, 0xa6, 0x65, 0xdb, 0xcd, 0x89, 0x69, 0x35, 0x6d, 0x38, 0x31, 0x2d, 0x68, - 0xb7, 0x26, 0xa6, 0xd5, 0xb6, 0x8f, 0xae, 0xfb, 0x7f, 0xbd, 0x75, 0x8d, 0xbf, 0xdf, 0xba, 0xc6, - 0xbf, 0x6f, 0x5d, 0xe3, 0xcf, 0x8e, 0x36, 0x8d, 0xf1, 0x01, 0x49, 0xd9, 0xe0, 0xcb, 0xbf, 0xe8, - 0x71, 0x5f, 0xbd, 0xb4, 0xab, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd9, 0xc9, 0xa0, 0x33, 0xf4, - 0x04, 0x00, 0x00, + // 836 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xdd, 0x4e, 0xe3, 0x46, + 0x14, 0x5e, 0x2f, 0x59, 0x30, 0x27, 0x89, 0x63, 0x26, 0x85, 0x1d, 0xa8, 0x44, 0x53, 0xaa, 0xd2, + 0x14, 0x55, 0x8e, 0x36, 0xa8, 0x17, 0xbd, 0x84, 0xb0, 0x74, 0x89, 0xc2, 0x82, 0x6c, 0x73, 0xd3, + 0x9b, 0x91, 0xb1, 0x07, 0x7b, 0xc4, 0xc4, 0x63, 0x79, 0xc6, 0xdb, 0xe5, 0x71, 0xfa, 0x36, 0xbd, + 0xec, 0x23, 0x54, 0x3c, 0x49, 0xe5, 0x19, 0x9b, 0x1f, 0x29, 0x52, 0x2f, 0xe7, 0xfb, 0xbe, 0x39, + 0x73, 0xce, 0x77, 0xce, 0x1c, 0xd8, 0x5b, 0x52, 0x99, 0x4d, 0xbe, 0x7c, 0x88, 0x78, 0x91, 0x45, + 0x1f, 0x26, 0xb1, 0xc8, 0xef, 0x58, 0xea, 0x15, 0xa5, 0x50, 0x02, 0x0d, 0x99, 0x54, 0x4c, 0x78, + 0xb5, 0xc2, 0x6b, 0x15, 0x7b, 0xfb, 0xa9, 0x10, 0x29, 0xa7, 0x13, 0x2d, 0xb9, 0xad, 0xee, 0x26, + 0x49, 0x55, 0x46, 0x8a, 0x89, 0xdc, 0x5c, 0xda, 0xdb, 0x7d, 0x1d, 0xb0, 0x28, 0xc5, 0xd7, 0x87, + 0x86, 0x3a, 0xca, 0xa9, 0xfa, 0x53, 0x94, 0xf7, 0x2c, 0x4f, 0x5b, 0xc1, 0xf1, 0x24, 0xa1, 0x52, + 0xb1, 0x5c, 0x47, 0x20, 0x65, 0xc5, 0xa9, 0xd1, 0x1e, 0xfc, 0xb5, 0x09, 0x70, 0x49, 0x65, 0x36, + 0xd3, 0x09, 0xa1, 0x5f, 0x00, 0x2d, 0xd9, 0x57, 0x5a, 0x92, 0x38, 0xa3, 0xf1, 0x3d, 0x91, 0xb4, + 0xfc, 0x42, 0x4b, 0x6c, 0x8d, 0xac, 0xf1, 0xa6, 0xef, 0x6a, 0x66, 0x56, 0x13, 0x81, 0xc6, 0x91, + 0x07, 0x43, 0xa3, 0x2e, 0x69, 0x21, 0x4a, 0xd5, 0xca, 0xdf, 0x6a, 0xf9, 0x96, 0xa6, 0x7c, 0xcd, + 0x34, 0xfa, 0x29, 0x6c, 0x27, 0x4c, 0x46, 0xb7, 0x9c, 0x92, 0x42, 0x70, 0x16, 0x3f, 0x98, 0x67, + 0x24, 0x5e, 0x1b, 0x59, 0x63, 0xdb, 0x1f, 0x36, 0xe4, 0xb5, 0xe6, 0xf4, 0x43, 0x12, 0x1d, 0xc1, + 0x96, 0xae, 0x8d, 0x70, 0x26, 0x15, 0xcd, 0x49, 0x1d, 0x0e, 0x77, 0x46, 0xd6, 0xf8, 0x9d, 0x3f, + 0xd0, 0xc4, 0x42, 0xe3, 0xd7, 0xa2, 0x54, 0xe8, 0x10, 0x0c, 0x44, 0x32, 0xa5, 0x0a, 0xa3, 0x7c, + 0xa7, 0x95, 0x7d, 0x0d, 0x7f, 0x52, 0xaa, 0xd0, 0xba, 0x53, 0x18, 0xc4, 0x22, 0xcf, 0x69, 0xac, + 0x88, 0x62, 0x4b, 0x2a, 0x2a, 0x85, 0xd7, 0x47, 0xd6, 0xb8, 0x3b, 0xdd, 0xf5, 0x8c, 0xeb, 0x5e, + 0xeb, 0xba, 0x77, 0xd6, 0xb8, 0xee, 0x3b, 0xcd, 0x8d, 0xd0, 0x5c, 0x40, 0x3f, 0x40, 0x9f, 0xe5, + 0x69, 0x49, 0xa5, 0x24, 0x31, 0x8f, 0xa4, 0xc4, 0x1b, 0xba, 0xea, 0x5e, 0x03, 0xce, 0x6a, 0x0c, + 0xfd, 0x04, 0x83, 0x56, 0x54, 0x7b, 0xc3, 0x62, 0x8a, 0x6d, 0x2d, 0x73, 0x1a, 0x38, 0x30, 0x28, + 0x5a, 0xc2, 0xfb, 0xa7, 0x68, 0x22, 0x57, 0xa5, 0xe0, 0x9c, 0x96, 0x64, 0x29, 0x12, 0x8a, 0x37, + 0x47, 0xd6, 0xd8, 0x99, 0xfe, 0xea, 0xad, 0x18, 0x12, 0xef, 0xb9, 0x73, 0xde, 0x45, 0xf3, 0xee, + 0xd3, 0xed, 0x4b, 0x91, 0x50, 0x7f, 0x9b, 0xad, 0x82, 0xd1, 0x15, 0x74, 0xa3, 0x4a, 0x65, 0x4d, + 0x17, 0x30, 0xe8, 0x27, 0x8e, 0xfe, 0xef, 0x89, 0x93, 0x4a, 0x65, 0xa6, 0x37, 0xa7, 0x6f, 0xb1, + 0xe5, 0x43, 0xf4, 0x74, 0x46, 0x3f, 0x82, 0x43, 0x73, 0xdd, 0x58, 0x55, 0x46, 0x31, 0xcb, 0x53, + 0xdc, 0xd3, 0x2d, 0xed, 0x1b, 0x34, 0x34, 0x60, 0xdd, 0xa0, 0x28, 0x8e, 0xeb, 0x2a, 0xb9, 0x48, + 0xc9, 0x1d, 0xe3, 0x14, 0xf7, 0xb5, 0x1f, 0x7d, 0x03, 0x2f, 0x44, 0x7a, 0xce, 0x38, 0x45, 0xbf, + 0x83, 0x93, 0xd0, 0xbb, 0xa8, 0xe2, 0x8a, 0x98, 0x9f, 0x82, 0x1d, 0xdd, 0x9f, 0xd1, 0xca, 0x14, + 0xaf, 0xeb, 0xe6, 0x9a, 0x1c, 0xfd, 0x7e, 0x73, 0xaf, 0x99, 0xe7, 0x33, 0xf8, 0xae, 0xc9, 0x2b, + 0xe6, 0x8c, 0xe6, 0x8a, 0x48, 0x96, 0xbc, 0x1e, 0x3e, 0x3c, 0xd4, 0x89, 0x7e, 0x6b, 0x64, 0x33, + 0xad, 0x0a, 0x58, 0xf2, 0x72, 0x08, 0xd1, 0x08, 0x7a, 0x32, 0x91, 0xa4, 0x4a, 0x24, 0x29, 0x22, + 0x95, 0xe1, 0x6f, 0x74, 0xce, 0x20, 0x13, 0x79, 0x93, 0xc8, 0xeb, 0x48, 0x65, 0xe8, 0x67, 0x70, + 0xd2, 0x88, 0x73, 0xfa, 0x40, 0xa2, 0x24, 0xa9, 0x0d, 0xc7, 0x3b, 0xb5, 0x46, 0xfb, 0xd4, 0x37, + 0xcc, 0x89, 0x21, 0xd0, 0x31, 0xec, 0x34, 0x29, 0xd5, 0x31, 0x95, 0xb8, 0xa7, 0x39, 0x59, 0x8a, + 0x2a, 0x57, 0xf8, 0xbd, 0xf9, 0x05, 0x86, 0x0d, 0x12, 0x19, 0xd6, 0xdc, 0x65, 0x4d, 0xd5, 0xbf, + 0xe0, 0xa5, 0x71, 0xa2, 0x5c, 0x46, 0x0a, 0x63, 0x9d, 0xc6, 0xe0, 0xd9, 0x3a, 0x0d, 0xa3, 0x4f, + 0xe0, 0x18, 0xd3, 0x88, 0x14, 0x55, 0x19, 0x53, 0x89, 0x77, 0x47, 0x6b, 0xe3, 0xee, 0xf4, 0xfb, + 0x95, 0xe6, 0x19, 0xa3, 0x02, 0xad, 0xf4, 0xfb, 0xf1, 0x8b, 0x93, 0x3c, 0xf8, 0x0d, 0xb6, 0x57, + 0x8e, 0x15, 0xda, 0x80, 0xb5, 0xab, 0xf3, 0x73, 0xf7, 0x0d, 0xea, 0xc2, 0xc6, 0xd9, 0xc7, 0xf3, + 0x93, 0x9b, 0x45, 0xe8, 0x5a, 0x08, 0x60, 0x3d, 0x08, 0xfd, 0x8b, 0x59, 0xe8, 0xbe, 0x3d, 0x38, + 0x04, 0x78, 0x1e, 0x17, 0x64, 0x43, 0xe7, 0xf3, 0xd5, 0xe7, 0x8f, 0xee, 0x1b, 0xe4, 0x00, 0x5c, + 0xde, 0x84, 0x37, 0x27, 0x0b, 0x12, 0x2e, 0x02, 0xd7, 0x9a, 0x77, 0xec, 0xae, 0xdb, 0x9b, 0x77, + 0xec, 0x81, 0xeb, 0xce, 0x3b, 0xb6, 0xeb, 0x6e, 0xcd, 0x3b, 0xf6, 0x96, 0x8b, 0xe6, 0x1d, 0x1b, + 0xb9, 0xc3, 0x79, 0xc7, 0xde, 0x76, 0x77, 0x0e, 0x24, 0xf4, 0x5e, 0x66, 0x89, 0x30, 0x6c, 0xb4, + 0x2e, 0x9b, 0xcd, 0xd4, 0x1e, 0xd1, 0x05, 0xf4, 0x14, 0xaf, 0xff, 0x9a, 0x52, 0x2c, 0x4f, 0xa5, + 0xde, 0x44, 0xdd, 0xe9, 0x61, 0x53, 0xf8, 0xf3, 0x5a, 0x6c, 0xcb, 0x3f, 0xf6, 0xc2, 0x45, 0x10, + 0x34, 0x6a, 0xbf, 0xab, 0xb8, 0x6c, 0x0f, 0xa7, 0xe3, 0xbf, 0x1f, 0xf7, 0xad, 0x7f, 0x1e, 0xf7, + 0xad, 0x7f, 0x1f, 0xf7, 0xad, 0x3f, 0xf6, 0x4c, 0x04, 0x26, 0x26, 0x51, 0xc1, 0x26, 0xaf, 0x56, + 0xef, 0xed, 0xba, 0x5e, 0x16, 0xc7, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x7b, 0xa0, 0xcd, 0x0e, + 0xe3, 0x05, 0x00, 0x00, } diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto index f20e21dffa..3ede93917e 100644 --- a/mesh/v1alpha1/config.proto +++ b/mesh/v1alpha1/config.proto @@ -16,6 +16,7 @@ syntax = "proto3"; import "google/protobuf/duration.proto"; import "mesh/v1alpha1/proxy.proto"; +import "networking/v1alpha3/destination_rule.proto"; // $title: Service Mesh // $description: Configuration affecting the service mesh as a whole. @@ -140,7 +141,7 @@ message MeshConfig { reserved 21; // Address of the galley service exposing the Mesh Control Protocol (MCP). - string galley_address = 22; + string galley_address = 22 [deprecated = true]; // $hide_from_docs // This flag is used by secret discovery service(SDS). @@ -149,6 +150,25 @@ message MeshConfig { // will be used to generate key/cert eventually. This isn't supported for non-k8s case. bool enable_sds_token_mount = 23; + // ConfigSource describes a source of configuration data for networking + // rules, and other Istio configuration artifacts. Multiple data sources + // can be configured for a single control plane. + repeated ConfigSource config_sources = 25; + // $hide_from_docs - // Next available field number: 25 + // Next available field number: 26 +} + +// ConfigSource describes information about a configuration store inside a +// mesh. A single control plane instance can interact with one or more data +// sources. +message ConfigSource { + // Address of the server implementing the Istio Mesh Configuration + // protocol (MCP). Can be IP address or a fully qualified DNS name. + string address = 1; + + // Use the tls_settings to specify the tls mode to use. If the MCP server + // uses Istio MTLS and shares the root CA with Pilot, specify the TLS + // mode as ISTIO_MUTUAL. + istio.networking.v1alpha3.TLSSettings tls_settings = 2; } diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index b91f5001c0..5ce717a05e 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -4,7 +4,7 @@ generator: protoc-gen-docs aliases: - /docs/reference/config/service-mesh.html -number_of_entries: 12 +number_of_entries: 13 ---

AuthenticationPolicy

@@ -41,6 +41,43 @@

AuthenticationPolicy

Use the policy defined by the parent scope. Should not be used for mesh policy.

+ + + + +
+

ConfigSource

+
+

ConfigSource describes information about a configuration store inside a +mesh. A single control plane instance can interact with one or more data +sources.

+ + + + + + + + + + + + + + + + + + + @@ -207,12 +244,22 @@

MeshConfig

- + + + + + + diff --git a/python/istio_api/mesh/v1alpha1/config_pb2.py b/python/istio_api/mesh/v1alpha1/config_pb2.py index 31f46e3adb..5d7826a2f8 100644 --- a/python/istio_api/mesh/v1alpha1/config_pb2.py +++ b/python/istio_api/mesh/v1alpha1/config_pb2.py @@ -15,15 +15,16 @@ from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2 from mesh.v1alpha1 import proxy_pb2 as mesh_dot_v1alpha1_dot_proxy__pb2 +from networking.v1alpha3 import destination_rule_pb2 as networking_dot_v1alpha3_dot_destination__rule__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='mesh/v1alpha1/config.proto', package='istio.mesh.v1alpha1', syntax='proto3', - serialized_pb=_b('\n\x1amesh/v1alpha1/config.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x19mesh/v1alpha1/proxy.proto\"\x9d\x06\n\nMeshConfig\x12\x1a\n\x12mixer_check_server\x18\x01 \x01(\t\x12\x1b\n\x13mixer_report_server\x18\x02 \x01(\t\x12\x1d\n\x15\x64isable_policy_checks\x18\x03 \x01(\x08\x12\x19\n\x11proxy_listen_port\x18\x04 \x01(\x05\x12\x17\n\x0fproxy_http_port\x18\x05 \x01(\x05\x12\x32\n\x0f\x63onnect_timeout\x18\x06 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x15\n\ringress_class\x18\x07 \x01(\t\x12\x17\n\x0fingress_service\x18\x08 \x01(\t\x12V\n\x17ingress_controller_mode\x18\t \x01(\x0e\x32\x35.istio.mesh.v1alpha1.MeshConfig.IngressControllerMode\x12\x43\n\x0b\x61uth_policy\x18\n \x01(\x0e\x32*.istio.mesh.v1alpha1.MeshConfig.AuthPolicyB\x02\x18\x01\x12\x16\n\x0e\x65nable_tracing\x18\x0c \x01(\x08\x12\x17\n\x0f\x61\x63\x63\x65ss_log_file\x18\r \x01(\t\x12\x19\n\x11\x61\x63\x63\x65ss_log_format\x18\x18 \x01(\t\x12\x38\n\x0e\x64\x65\x66\x61ult_config\x18\x0e \x01(\x0b\x32 .istio.mesh.v1alpha1.ProxyConfig\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x16\n\x0egalley_address\x18\x16 \x01(\t\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\"9\n\x15IngressControllerMode\x12\x07\n\x03OFF\x10\x00\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x01\x12\n\n\x06STRICT\x10\x02\"&\n\nAuthPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01J\x04\x08\x0b\x10\x0cJ\x04\x08\x0f\x10\x10J\x04\x08\x10\x10\x11J\x04\x08\x11\x10\x12J\x04\x08\x12\x10\x13J\x04\x08\x15\x10\x16\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') + serialized_pb=_b('\n\x1amesh/v1alpha1/config.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x19mesh/v1alpha1/proxy.proto\x1a*networking/v1alpha3/destination_rule.proto\"\xdc\x06\n\nMeshConfig\x12\x1a\n\x12mixer_check_server\x18\x01 \x01(\t\x12\x1b\n\x13mixer_report_server\x18\x02 \x01(\t\x12\x1d\n\x15\x64isable_policy_checks\x18\x03 \x01(\x08\x12\x19\n\x11proxy_listen_port\x18\x04 \x01(\x05\x12\x17\n\x0fproxy_http_port\x18\x05 \x01(\x05\x12\x32\n\x0f\x63onnect_timeout\x18\x06 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x15\n\ringress_class\x18\x07 \x01(\t\x12\x17\n\x0fingress_service\x18\x08 \x01(\t\x12V\n\x17ingress_controller_mode\x18\t \x01(\x0e\x32\x35.istio.mesh.v1alpha1.MeshConfig.IngressControllerMode\x12\x43\n\x0b\x61uth_policy\x18\n \x01(\x0e\x32*.istio.mesh.v1alpha1.MeshConfig.AuthPolicyB\x02\x18\x01\x12\x16\n\x0e\x65nable_tracing\x18\x0c \x01(\x08\x12\x17\n\x0f\x61\x63\x63\x65ss_log_file\x18\r \x01(\t\x12\x19\n\x11\x61\x63\x63\x65ss_log_format\x18\x18 \x01(\t\x12\x38\n\x0e\x64\x65\x66\x61ult_config\x18\x0e \x01(\x0b\x32 .istio.mesh.v1alpha1.ProxyConfig\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x1a\n\x0egalley_address\x18\x16 \x01(\tB\x02\x18\x01\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\x12\x39\n\x0e\x63onfig_sources\x18\x19 \x03(\x0b\x32!.istio.mesh.v1alpha1.ConfigSource\"9\n\x15IngressControllerMode\x12\x07\n\x03OFF\x10\x00\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x01\x12\n\n\x06STRICT\x10\x02\"&\n\nAuthPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01J\x04\x08\x0b\x10\x0cJ\x04\x08\x0f\x10\x10J\x04\x08\x10\x10\x11J\x04\x08\x11\x10\x12J\x04\x08\x12\x10\x13J\x04\x08\x15\x10\x16\"]\n\x0c\x43onfigSource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12<\n\x0ctls_settings\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.TLSSettingsB\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') , - dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,mesh_dot_v1alpha1_dot_proxy__pb2.DESCRIPTOR,]) + dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,mesh_dot_v1alpha1_dot_proxy__pb2.DESCRIPTOR,networking_dot_v1alpha3_dot_destination__rule__pb2.DESCRIPTOR,]) @@ -48,8 +49,8 @@ ], containing_type=None, options=None, - serialized_start=775, - serialized_end=832, + serialized_start=882, + serialized_end=939, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_INGRESSCONTROLLERMODE) @@ -70,8 +71,8 @@ ], containing_type=None, options=None, - serialized_start=834, - serialized_end=872, + serialized_start=941, + serialized_end=979, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_AUTHPOLICY) @@ -201,7 +202,7 @@ 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), + options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')), file=DESCRIPTOR), _descriptor.FieldDescriptor( name='enable_sds_token_mount', full_name='istio.mesh.v1alpha1.MeshConfig.enable_sds_token_mount', index=17, number=23, type=8, cpp_type=7, label=1, @@ -209,6 +210,13 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='config_sources', full_name='istio.mesh.v1alpha1.MeshConfig.config_sources', index=18, + number=25, type=11, cpp_type=10, 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=[ ], @@ -223,17 +231,58 @@ extension_ranges=[], oneofs=[ ], - serialized_start=111, - serialized_end=908, + serialized_start=155, + serialized_end=1015, +) + + +_CONFIGSOURCE = _descriptor.Descriptor( + name='ConfigSource', + full_name='istio.mesh.v1alpha1.ConfigSource', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='address', full_name='istio.mesh.v1alpha1.ConfigSource.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), + _descriptor.FieldDescriptor( + name='tls_settings', full_name='istio.mesh.v1alpha1.ConfigSource.tls_settings', index=1, + number=2, 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=[], + enum_types=[ + ], + options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=1017, + serialized_end=1110, ) _MESHCONFIG.fields_by_name['connect_timeout'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION _MESHCONFIG.fields_by_name['ingress_controller_mode'].enum_type = _MESHCONFIG_INGRESSCONTROLLERMODE _MESHCONFIG.fields_by_name['auth_policy'].enum_type = _MESHCONFIG_AUTHPOLICY _MESHCONFIG.fields_by_name['default_config'].message_type = mesh_dot_v1alpha1_dot_proxy__pb2._PROXYCONFIG +_MESHCONFIG.fields_by_name['config_sources'].message_type = _CONFIGSOURCE _MESHCONFIG_INGRESSCONTROLLERMODE.containing_type = _MESHCONFIG _MESHCONFIG_AUTHPOLICY.containing_type = _MESHCONFIG +_CONFIGSOURCE.fields_by_name['tls_settings'].message_type = networking_dot_v1alpha3_dot_destination__rule__pb2._TLSSETTINGS DESCRIPTOR.message_types_by_name['MeshConfig'] = _MESHCONFIG +DESCRIPTOR.message_types_by_name['ConfigSource'] = _CONFIGSOURCE _sym_db.RegisterFileDescriptor(DESCRIPTOR) MeshConfig = _reflection.GeneratedProtocolMessageType('MeshConfig', (_message.Message,), dict( @@ -243,9 +292,18 @@ )) _sym_db.RegisterMessage(MeshConfig) +ConfigSource = _reflection.GeneratedProtocolMessageType('ConfigSource', (_message.Message,), dict( + DESCRIPTOR = _CONFIGSOURCE, + __module__ = 'mesh.v1alpha1.config_pb2' + # @@protoc_insertion_point(class_scope:istio.mesh.v1alpha1.ConfigSource) + )) +_sym_db.RegisterMessage(ConfigSource) + DESCRIPTOR.has_options = True DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\032istio.io/api/mesh/v1alpha1')) _MESHCONFIG.fields_by_name['auth_policy'].has_options = True _MESHCONFIG.fields_by_name['auth_policy']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) +_MESHCONFIG.fields_by_name['galley_address'].has_options = True +_MESHCONFIG.fields_by_name['galley_address']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) # @@protoc_insertion_point(module_scope) From 5ee59630ea38fd8ac105d9db25e98302572f25b5 Mon Sep 17 00:00:00 2001 From: Shriram Rajagopalan Date: Mon, 22 Oct 2018 16:37:23 -0400 Subject: [PATCH 2/2] nits Signed-off-by: Shriram Rajagopalan --- mesh/v1alpha1/config.pb.go | 225 +++++++------------ mesh/v1alpha1/config.proto | 14 +- mesh/v1alpha1/istio.mesh.v1alpha1.pb.html | 11 +- python/istio_api/mesh/v1alpha1/config_pb2.py | 33 +-- 4 files changed, 107 insertions(+), 176 deletions(-) diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go index b554672294..d80c94df7c 100644 --- a/mesh/v1alpha1/config.pb.go +++ b/mesh/v1alpha1/config.pb.go @@ -161,18 +161,16 @@ type MeshConfig struct { // Unix Domain Socket through which envoy communicates with NodeAgent SDS to get key/cert for mTLS. // Use secret-mount files instead of SDS if set to empty. SdsUdsPath string `protobuf:"bytes,20,opt,name=sds_uds_path,json=sdsUdsPath,proto3" json:"sds_uds_path,omitempty"` - // Address of the galley service exposing the Mesh Control Protocol (MCP). - GalleyAddress string `protobuf:"bytes,22,opt,name=galley_address,json=galleyAddress,proto3" json:"galley_address,omitempty"` + // ConfigSource describes a source of configuration data for networking + // rules, and other Istio configuration artifacts. Multiple data sources + // can be configured for a single control plane. + ConfigSources []*ConfigSource `protobuf:"bytes,22,rep,name=config_sources,json=configSources" json:"config_sources,omitempty"` // $hide_from_docs // This flag is used by secret discovery service(SDS). // If set to true(prerequisite: https://kubernetes.io/docs/concepts/storage/volumes/#projected), Istio will inject volumes mount // for k8s service account JWT, so that K8s API server mounts k8s service account JWT to envoy container, which // will be used to generate key/cert eventually. This isn't supported for non-k8s case. EnableSdsTokenMount bool `protobuf:"varint,23,opt,name=enable_sds_token_mount,json=enableSdsTokenMount,proto3" json:"enable_sds_token_mount,omitempty"` - // ConfigSource describes a source of configuration data for networking - // rules, and other Istio configuration artifacts. Multiple data sources - // can be configured for a single control plane. - ConfigSources []*ConfigSource `protobuf:"bytes,25,rep,name=config_sources,json=configSources" json:"config_sources,omitempty"` } func (m *MeshConfig) Reset() { *m = MeshConfig{} } @@ -292,11 +290,11 @@ func (m *MeshConfig) GetSdsUdsPath() string { return "" } -func (m *MeshConfig) GetGalleyAddress() string { +func (m *MeshConfig) GetConfigSources() []*ConfigSource { if m != nil { - return m.GalleyAddress + return m.ConfigSources } - return "" + return nil } func (m *MeshConfig) GetEnableSdsTokenMount() bool { @@ -306,19 +304,13 @@ func (m *MeshConfig) GetEnableSdsTokenMount() bool { return false } -func (m *MeshConfig) GetConfigSources() []*ConfigSource { - if m != nil { - return m.ConfigSources - } - return nil -} - // ConfigSource describes information about a configuration store inside a // mesh. A single control plane instance can interact with one or more data // sources. type ConfigSource struct { // Address of the server implementing the Istio Mesh Configuration // protocol (MCP). Can be IP address or a fully qualified DNS name. + // Use file:/// to specify a file-based backend with absolute path to the directory. Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Use the tls_settings to specify the tls mode to use. If the MCP server // uses Istio MTLS and shares the root CA with Pilot, specify the TLS @@ -476,13 +468,19 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintConfig(dAtA, i, uint64(len(m.SdsUdsPath))) i += copy(dAtA[i:], m.SdsUdsPath) } - if len(m.GalleyAddress) > 0 { - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintConfig(dAtA, i, uint64(len(m.GalleyAddress))) - i += copy(dAtA[i:], m.GalleyAddress) + if len(m.ConfigSources) > 0 { + for _, msg := range m.ConfigSources { + dAtA[i] = 0xb2 + i++ + dAtA[i] = 0x1 + i++ + i = encodeVarintConfig(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } } if m.EnableSdsTokenMount { dAtA[i] = 0xb8 @@ -504,20 +502,6 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintConfig(dAtA, i, uint64(len(m.AccessLogFormat))) i += copy(dAtA[i:], m.AccessLogFormat) } - if len(m.ConfigSources) > 0 { - for _, msg := range m.ConfigSources { - dAtA[i] = 0xca - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintConfig(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } - } return i, nil } @@ -620,9 +604,11 @@ func (m *MeshConfig) Size() (n int) { if l > 0 { n += 2 + l + sovConfig(uint64(l)) } - l = len(m.GalleyAddress) - if l > 0 { - n += 2 + l + sovConfig(uint64(l)) + if len(m.ConfigSources) > 0 { + for _, e := range m.ConfigSources { + l = e.Size() + n += 2 + l + sovConfig(uint64(l)) + } } if m.EnableSdsTokenMount { n += 3 @@ -631,12 +617,6 @@ func (m *MeshConfig) Size() (n int) { if l > 0 { n += 2 + l + sovConfig(uint64(l)) } - if len(m.ConfigSources) > 0 { - for _, e := range m.ConfigSources { - l = e.Size() - n += 2 + l + sovConfig(uint64(l)) - } - } return n } @@ -1074,9 +1054,9 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 22: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field GalleyAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ConfigSources", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowConfig @@ -1086,20 +1066,22 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + msglen |= (int(b) & 0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthConfig } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex > l { return io.ErrUnexpectedEOF } - m.GalleyAddress = string(dAtA[iNdEx:postIndex]) + m.ConfigSources = append(m.ConfigSources, &ConfigSource{}) + if err := m.ConfigSources[len(m.ConfigSources)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex case 23: if wireType != 0 { @@ -1150,37 +1132,6 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { } m.AccessLogFormat = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 25: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ConfigSources", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowConfig - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthConfig - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ConfigSources = append(m.ConfigSources, &ConfigSource{}) - if err := m.ConfigSources[len(m.ConfigSources)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipConfig(dAtA[iNdEx:]) @@ -1422,58 +1373,56 @@ var ( func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptorConfig) } var fileDescriptorConfig = []byte{ - // 836 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xdd, 0x4e, 0xe3, 0x46, - 0x14, 0x5e, 0x2f, 0x59, 0x30, 0x27, 0x89, 0x63, 0x26, 0x85, 0x1d, 0xa8, 0x44, 0x53, 0xaa, 0xd2, - 0x14, 0x55, 0x8e, 0x36, 0xa8, 0x17, 0xbd, 0x84, 0xb0, 0x74, 0x89, 0xc2, 0x82, 0x6c, 0x73, 0xd3, - 0x9b, 0x91, 0xb1, 0x07, 0x7b, 0xc4, 0xc4, 0x63, 0x79, 0xc6, 0xdb, 0xe5, 0x71, 0xfa, 0x36, 0xbd, - 0xec, 0x23, 0x54, 0x3c, 0x49, 0xe5, 0x19, 0x9b, 0x1f, 0x29, 0x52, 0x2f, 0xe7, 0xfb, 0xbe, 0x39, - 0x73, 0xce, 0x77, 0xce, 0x1c, 0xd8, 0x5b, 0x52, 0x99, 0x4d, 0xbe, 0x7c, 0x88, 0x78, 0x91, 0x45, - 0x1f, 0x26, 0xb1, 0xc8, 0xef, 0x58, 0xea, 0x15, 0xa5, 0x50, 0x02, 0x0d, 0x99, 0x54, 0x4c, 0x78, - 0xb5, 0xc2, 0x6b, 0x15, 0x7b, 0xfb, 0xa9, 0x10, 0x29, 0xa7, 0x13, 0x2d, 0xb9, 0xad, 0xee, 0x26, - 0x49, 0x55, 0x46, 0x8a, 0x89, 0xdc, 0x5c, 0xda, 0xdb, 0x7d, 0x1d, 0xb0, 0x28, 0xc5, 0xd7, 0x87, - 0x86, 0x3a, 0xca, 0xa9, 0xfa, 0x53, 0x94, 0xf7, 0x2c, 0x4f, 0x5b, 0xc1, 0xf1, 0x24, 0xa1, 0x52, - 0xb1, 0x5c, 0x47, 0x20, 0x65, 0xc5, 0xa9, 0xd1, 0x1e, 0xfc, 0xb5, 0x09, 0x70, 0x49, 0x65, 0x36, - 0xd3, 0x09, 0xa1, 0x5f, 0x00, 0x2d, 0xd9, 0x57, 0x5a, 0x92, 0x38, 0xa3, 0xf1, 0x3d, 0x91, 0xb4, - 0xfc, 0x42, 0x4b, 0x6c, 0x8d, 0xac, 0xf1, 0xa6, 0xef, 0x6a, 0x66, 0x56, 0x13, 0x81, 0xc6, 0x91, - 0x07, 0x43, 0xa3, 0x2e, 0x69, 0x21, 0x4a, 0xd5, 0xca, 0xdf, 0x6a, 0xf9, 0x96, 0xa6, 0x7c, 0xcd, - 0x34, 0xfa, 0x29, 0x6c, 0x27, 0x4c, 0x46, 0xb7, 0x9c, 0x92, 0x42, 0x70, 0x16, 0x3f, 0x98, 0x67, - 0x24, 0x5e, 0x1b, 0x59, 0x63, 0xdb, 0x1f, 0x36, 0xe4, 0xb5, 0xe6, 0xf4, 0x43, 0x12, 0x1d, 0xc1, - 0x96, 0xae, 0x8d, 0x70, 0x26, 0x15, 0xcd, 0x49, 0x1d, 0x0e, 0x77, 0x46, 0xd6, 0xf8, 0x9d, 0x3f, - 0xd0, 0xc4, 0x42, 0xe3, 0xd7, 0xa2, 0x54, 0xe8, 0x10, 0x0c, 0x44, 0x32, 0xa5, 0x0a, 0xa3, 0x7c, - 0xa7, 0x95, 0x7d, 0x0d, 0x7f, 0x52, 0xaa, 0xd0, 0xba, 0x53, 0x18, 0xc4, 0x22, 0xcf, 0x69, 0xac, - 0x88, 0x62, 0x4b, 0x2a, 0x2a, 0x85, 0xd7, 0x47, 0xd6, 0xb8, 0x3b, 0xdd, 0xf5, 0x8c, 0xeb, 0x5e, - 0xeb, 0xba, 0x77, 0xd6, 0xb8, 0xee, 0x3b, 0xcd, 0x8d, 0xd0, 0x5c, 0x40, 0x3f, 0x40, 0x9f, 0xe5, - 0x69, 0x49, 0xa5, 0x24, 0x31, 0x8f, 0xa4, 0xc4, 0x1b, 0xba, 0xea, 0x5e, 0x03, 0xce, 0x6a, 0x0c, - 0xfd, 0x04, 0x83, 0x56, 0x54, 0x7b, 0xc3, 0x62, 0x8a, 0x6d, 0x2d, 0x73, 0x1a, 0x38, 0x30, 0x28, - 0x5a, 0xc2, 0xfb, 0xa7, 0x68, 0x22, 0x57, 0xa5, 0xe0, 0x9c, 0x96, 0x64, 0x29, 0x12, 0x8a, 0x37, - 0x47, 0xd6, 0xd8, 0x99, 0xfe, 0xea, 0xad, 0x18, 0x12, 0xef, 0xb9, 0x73, 0xde, 0x45, 0xf3, 0xee, - 0xd3, 0xed, 0x4b, 0x91, 0x50, 0x7f, 0x9b, 0xad, 0x82, 0xd1, 0x15, 0x74, 0xa3, 0x4a, 0x65, 0x4d, - 0x17, 0x30, 0xe8, 0x27, 0x8e, 0xfe, 0xef, 0x89, 0x93, 0x4a, 0x65, 0xa6, 0x37, 0xa7, 0x6f, 0xb1, - 0xe5, 0x43, 0xf4, 0x74, 0x46, 0x3f, 0x82, 0x43, 0x73, 0xdd, 0x58, 0x55, 0x46, 0x31, 0xcb, 0x53, - 0xdc, 0xd3, 0x2d, 0xed, 0x1b, 0x34, 0x34, 0x60, 0xdd, 0xa0, 0x28, 0x8e, 0xeb, 0x2a, 0xb9, 0x48, - 0xc9, 0x1d, 0xe3, 0x14, 0xf7, 0xb5, 0x1f, 0x7d, 0x03, 0x2f, 0x44, 0x7a, 0xce, 0x38, 0x45, 0xbf, - 0x83, 0x93, 0xd0, 0xbb, 0xa8, 0xe2, 0x8a, 0x98, 0x9f, 0x82, 0x1d, 0xdd, 0x9f, 0xd1, 0xca, 0x14, - 0xaf, 0xeb, 0xe6, 0x9a, 0x1c, 0xfd, 0x7e, 0x73, 0xaf, 0x99, 0xe7, 0x33, 0xf8, 0xae, 0xc9, 0x2b, - 0xe6, 0x8c, 0xe6, 0x8a, 0x48, 0x96, 0xbc, 0x1e, 0x3e, 0x3c, 0xd4, 0x89, 0x7e, 0x6b, 0x64, 0x33, - 0xad, 0x0a, 0x58, 0xf2, 0x72, 0x08, 0xd1, 0x08, 0x7a, 0x32, 0x91, 0xa4, 0x4a, 0x24, 0x29, 0x22, - 0x95, 0xe1, 0x6f, 0x74, 0xce, 0x20, 0x13, 0x79, 0x93, 0xc8, 0xeb, 0x48, 0x65, 0xe8, 0x67, 0x70, - 0xd2, 0x88, 0x73, 0xfa, 0x40, 0xa2, 0x24, 0xa9, 0x0d, 0xc7, 0x3b, 0xb5, 0x46, 0xfb, 0xd4, 0x37, - 0xcc, 0x89, 0x21, 0xd0, 0x31, 0xec, 0x34, 0x29, 0xd5, 0x31, 0x95, 0xb8, 0xa7, 0x39, 0x59, 0x8a, - 0x2a, 0x57, 0xf8, 0xbd, 0xf9, 0x05, 0x86, 0x0d, 0x12, 0x19, 0xd6, 0xdc, 0x65, 0x4d, 0xd5, 0xbf, - 0xe0, 0xa5, 0x71, 0xa2, 0x5c, 0x46, 0x0a, 0x63, 0x9d, 0xc6, 0xe0, 0xd9, 0x3a, 0x0d, 0xa3, 0x4f, - 0xe0, 0x18, 0xd3, 0x88, 0x14, 0x55, 0x19, 0x53, 0x89, 0x77, 0x47, 0x6b, 0xe3, 0xee, 0xf4, 0xfb, - 0x95, 0xe6, 0x19, 0xa3, 0x02, 0xad, 0xf4, 0xfb, 0xf1, 0x8b, 0x93, 0x3c, 0xf8, 0x0d, 0xb6, 0x57, - 0x8e, 0x15, 0xda, 0x80, 0xb5, 0xab, 0xf3, 0x73, 0xf7, 0x0d, 0xea, 0xc2, 0xc6, 0xd9, 0xc7, 0xf3, - 0x93, 0x9b, 0x45, 0xe8, 0x5a, 0x08, 0x60, 0x3d, 0x08, 0xfd, 0x8b, 0x59, 0xe8, 0xbe, 0x3d, 0x38, - 0x04, 0x78, 0x1e, 0x17, 0x64, 0x43, 0xe7, 0xf3, 0xd5, 0xe7, 0x8f, 0xee, 0x1b, 0xe4, 0x00, 0x5c, - 0xde, 0x84, 0x37, 0x27, 0x0b, 0x12, 0x2e, 0x02, 0xd7, 0x9a, 0x77, 0xec, 0xae, 0xdb, 0x9b, 0x77, - 0xec, 0x81, 0xeb, 0xce, 0x3b, 0xb6, 0xeb, 0x6e, 0xcd, 0x3b, 0xf6, 0x96, 0x8b, 0xe6, 0x1d, 0x1b, - 0xb9, 0xc3, 0x79, 0xc7, 0xde, 0x76, 0x77, 0x0e, 0x24, 0xf4, 0x5e, 0x66, 0x89, 0x30, 0x6c, 0xb4, - 0x2e, 0x9b, 0xcd, 0xd4, 0x1e, 0xd1, 0x05, 0xf4, 0x14, 0xaf, 0xff, 0x9a, 0x52, 0x2c, 0x4f, 0xa5, - 0xde, 0x44, 0xdd, 0xe9, 0x61, 0x53, 0xf8, 0xf3, 0x5a, 0x6c, 0xcb, 0x3f, 0xf6, 0xc2, 0x45, 0x10, - 0x34, 0x6a, 0xbf, 0xab, 0xb8, 0x6c, 0x0f, 0xa7, 0xe3, 0xbf, 0x1f, 0xf7, 0xad, 0x7f, 0x1e, 0xf7, - 0xad, 0x7f, 0x1f, 0xf7, 0xad, 0x3f, 0xf6, 0x4c, 0x04, 0x26, 0x26, 0x51, 0xc1, 0x26, 0xaf, 0x56, - 0xef, 0xed, 0xba, 0x5e, 0x16, 0xc7, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x7b, 0xa0, 0xcd, 0x0e, - 0xe3, 0x05, 0x00, 0x00, + // 814 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x5d, 0x4f, 0xe4, 0x36, + 0x14, 0xdd, 0xc0, 0x2c, 0x64, 0xef, 0x7c, 0x05, 0x4f, 0x61, 0xbd, 0x54, 0xa2, 0x53, 0xaa, 0xd2, + 0x11, 0xaa, 0x32, 0xda, 0x41, 0x7d, 0xe8, 0x23, 0x0c, 0x4b, 0x97, 0xd1, 0xb0, 0xa0, 0x24, 0xbc, + 0xf4, 0xc5, 0x0a, 0x89, 0x49, 0x2c, 0x32, 0x71, 0x64, 0x3b, 0xdb, 0xdd, 0x7f, 0xd8, 0xc7, 0xfe, + 0x84, 0x8a, 0x1f, 0xd1, 0xe7, 0x2a, 0xb6, 0x07, 0x06, 0x69, 0xa4, 0x7d, 0xf4, 0x39, 0xc7, 0xbe, + 0xc7, 0xe7, 0x5e, 0x1b, 0xf6, 0x17, 0x54, 0xe6, 0xe3, 0xcf, 0xef, 0xe3, 0xa2, 0xca, 0xe3, 0xf7, + 0xe3, 0x84, 0x97, 0xf7, 0x2c, 0xf3, 0x2b, 0xc1, 0x15, 0x47, 0x03, 0x26, 0x15, 0xe3, 0x7e, 0xa3, + 0xf0, 0x97, 0x8a, 0xfd, 0x83, 0x8c, 0xf3, 0xac, 0xa0, 0x63, 0x2d, 0xb9, 0xab, 0xef, 0xc7, 0x69, + 0x2d, 0x62, 0xc5, 0x78, 0x69, 0x36, 0xed, 0xbf, 0x7b, 0x79, 0x60, 0x25, 0xf8, 0x97, 0xaf, 0x96, + 0x3a, 0x2e, 0xa9, 0xfa, 0x8b, 0x8b, 0x07, 0x56, 0x66, 0x4b, 0xc1, 0xc9, 0x38, 0xa5, 0x52, 0xb1, + 0x52, 0x9f, 0x40, 0x44, 0x5d, 0x50, 0xa3, 0x3d, 0xfc, 0xcf, 0x05, 0xb8, 0xa2, 0x32, 0x9f, 0x6a, + 0x43, 0xe8, 0x57, 0x40, 0x0b, 0xf6, 0x85, 0x0a, 0x92, 0xe4, 0x34, 0x79, 0x20, 0x92, 0x8a, 0xcf, + 0x54, 0x60, 0x67, 0xe8, 0x8c, 0xde, 0x04, 0x9e, 0x66, 0xa6, 0x0d, 0x11, 0x6a, 0x1c, 0xf9, 0x30, + 0x30, 0x6a, 0x41, 0x2b, 0x2e, 0xd4, 0x52, 0xbe, 0xa1, 0xe5, 0x3b, 0x9a, 0x0a, 0x34, 0x63, 0xf5, + 0x13, 0xd8, 0x4d, 0x99, 0x8c, 0xef, 0x0a, 0x4a, 0x2a, 0x5e, 0xb0, 0xe4, 0xab, 0x29, 0x23, 0xf1, + 0xe6, 0xd0, 0x19, 0xb9, 0xc1, 0xc0, 0x92, 0x37, 0x9a, 0xd3, 0x85, 0x24, 0x3a, 0x86, 0x1d, 0x7d, + 0x37, 0x52, 0x30, 0xa9, 0x68, 0x49, 0x9a, 0xe3, 0x70, 0x6b, 0xe8, 0x8c, 0x5e, 0x07, 0x7d, 0x4d, + 0xcc, 0x35, 0x7e, 0xc3, 0x85, 0x42, 0x47, 0x60, 0x20, 0x92, 0x2b, 0x55, 0x19, 0xe5, 0x6b, 0xad, + 0xec, 0x6a, 0xf8, 0xa3, 0x52, 0x95, 0xd6, 0x9d, 0x41, 0x3f, 0xe1, 0x65, 0x49, 0x13, 0x45, 0x14, + 0x5b, 0x50, 0x5e, 0x2b, 0xbc, 0x35, 0x74, 0x46, 0xed, 0xc9, 0x3b, 0xdf, 0xa4, 0xee, 0x2f, 0x53, + 0xf7, 0xcf, 0x6d, 0xea, 0x41, 0xcf, 0xee, 0x88, 0xcc, 0x06, 0xf4, 0x13, 0x74, 0x59, 0x99, 0x09, + 0x2a, 0x25, 0x49, 0x8a, 0x58, 0x4a, 0xbc, 0xad, 0x6f, 0xdd, 0xb1, 0xe0, 0xb4, 0xc1, 0xd0, 0x2f, + 0xd0, 0x5f, 0x8a, 0x9a, 0x6c, 0x58, 0x42, 0xb1, 0xab, 0x65, 0x3d, 0x0b, 0x87, 0x06, 0x45, 0x0b, + 0x78, 0xfb, 0x74, 0x1a, 0x2f, 0x95, 0xe0, 0x45, 0x41, 0x05, 0x59, 0xf0, 0x94, 0xe2, 0x37, 0x43, + 0x67, 0xd4, 0x9b, 0xfc, 0xe6, 0xaf, 0x19, 0x12, 0xff, 0xb9, 0x73, 0xfe, 0xa5, 0xad, 0xfb, 0xb4, + 0xfb, 0x8a, 0xa7, 0x34, 0xd8, 0x65, 0xeb, 0x60, 0x74, 0x0d, 0xed, 0xb8, 0x56, 0xb9, 0xed, 0x02, + 0x06, 0x5d, 0xe2, 0xf8, 0x5b, 0x25, 0x4e, 0x6b, 0x95, 0x9b, 0xde, 0x9c, 0x6d, 0x60, 0x27, 0x80, + 0xf8, 0x69, 0x8d, 0x7e, 0x86, 0x1e, 0x2d, 0x75, 0x63, 0x95, 0x88, 0x13, 0x56, 0x66, 0xb8, 0xa3, + 0x5b, 0xda, 0x35, 0x68, 0x64, 0xc0, 0xa6, 0x41, 0x71, 0x92, 0x34, 0xb7, 0x2c, 0x78, 0x46, 0xee, + 0x59, 0x41, 0x71, 0x57, 0xe7, 0xd1, 0x35, 0xf0, 0x9c, 0x67, 0x17, 0xac, 0xa0, 0xe8, 0x0f, 0xe8, + 0xa5, 0xf4, 0x3e, 0xae, 0x0b, 0x45, 0xcc, 0x4b, 0xc1, 0x3d, 0xdd, 0x9f, 0xe1, 0x5a, 0x8b, 0x37, + 0x4d, 0x73, 0x8d, 0xc7, 0xa0, 0x6b, 0xf7, 0xd9, 0x79, 0x3e, 0x87, 0x1f, 0xac, 0xaf, 0xa4, 0x60, + 0xb4, 0x54, 0x44, 0xb2, 0xf4, 0xe5, 0xf0, 0xe1, 0x81, 0x36, 0xfa, 0xbd, 0x91, 0x4d, 0xb5, 0x2a, + 0x64, 0xe9, 0xea, 0x10, 0xa2, 0x21, 0x74, 0x64, 0x2a, 0x49, 0x9d, 0x4a, 0x52, 0xc5, 0x2a, 0xc7, + 0xdf, 0x69, 0xcf, 0x20, 0x53, 0x79, 0x9b, 0xca, 0x9b, 0x58, 0xe5, 0xe8, 0x23, 0xf4, 0x8c, 0x51, + 0x22, 0x79, 0x2d, 0x12, 0x2a, 0xf1, 0xde, 0x70, 0x73, 0xd4, 0x9e, 0xfc, 0xb8, 0xd6, 0xb0, 0x31, + 0x17, 0x6a, 0x65, 0xd0, 0x4d, 0x56, 0x56, 0x12, 0x9d, 0xc0, 0x9e, 0x75, 0xdc, 0x94, 0x54, 0xfc, + 0x81, 0x96, 0x64, 0xc1, 0xeb, 0x52, 0xe1, 0xb7, 0xe6, 0x91, 0x18, 0x36, 0x4c, 0x65, 0xd4, 0x70, + 0x57, 0x0d, 0xd5, 0x3c, 0x92, 0xd5, 0x5c, 0xb9, 0x58, 0xc4, 0x0a, 0x63, 0xed, 0xb2, 0xff, 0x9c, + 0xac, 0x86, 0x0f, 0x7f, 0x87, 0xdd, 0xb5, 0xb3, 0x82, 0xb6, 0x61, 0xf3, 0xfa, 0xe2, 0xc2, 0x7b, + 0x85, 0xda, 0xb0, 0x7d, 0xfe, 0xe1, 0xe2, 0xf4, 0x76, 0x1e, 0x79, 0x0e, 0x02, 0xd8, 0x0a, 0xa3, + 0xe0, 0x72, 0x1a, 0x79, 0x1b, 0x87, 0x47, 0x00, 0xcf, 0x33, 0x80, 0x5c, 0x68, 0x7d, 0xba, 0xfe, + 0xf4, 0xc1, 0x7b, 0x85, 0x7a, 0x00, 0x57, 0xb7, 0xd1, 0xed, 0xe9, 0x9c, 0x44, 0xf3, 0xd0, 0x73, + 0x66, 0x2d, 0xb7, 0xed, 0x75, 0x66, 0x2d, 0xb7, 0xef, 0x79, 0xb3, 0x96, 0xeb, 0x79, 0x3b, 0xb3, + 0x96, 0xbb, 0xe3, 0xa1, 0x59, 0xcb, 0x45, 0xde, 0x60, 0xd6, 0x72, 0x77, 0xbd, 0xbd, 0x43, 0x09, + 0x9d, 0xd5, 0x18, 0x10, 0x86, 0xed, 0x38, 0x4d, 0x1b, 0x5b, 0xf6, 0xbb, 0x59, 0x2e, 0xd1, 0x25, + 0x74, 0x54, 0xd1, 0x3c, 0x20, 0xa5, 0x58, 0x99, 0x49, 0xfd, 0xbd, 0xb4, 0x27, 0x47, 0x36, 0xd9, + 0xe7, 0xbf, 0x6e, 0x99, 0xef, 0x89, 0x1f, 0xcd, 0xc3, 0xd0, 0xaa, 0x83, 0xb6, 0x2a, 0xe4, 0x72, + 0x71, 0x36, 0xfa, 0xfb, 0xf1, 0xc0, 0xf9, 0xe7, 0xf1, 0xc0, 0xf9, 0xf7, 0xf1, 0xc0, 0xf9, 0x73, + 0xdf, 0x9c, 0xc0, 0xf8, 0x38, 0xae, 0xd8, 0xf8, 0xc5, 0x7f, 0x7a, 0xb7, 0xa5, 0x7f, 0x80, 0x93, + 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x12, 0xda, 0x0b, 0xab, 0xb8, 0x05, 0x00, 0x00, } diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto index 3ede93917e..997669f648 100644 --- a/mesh/v1alpha1/config.proto +++ b/mesh/v1alpha1/config.proto @@ -140,8 +140,10 @@ message MeshConfig { reserved 21; - // Address of the galley service exposing the Mesh Control Protocol (MCP). - string galley_address = 22 [deprecated = true]; + // ConfigSource describes a source of configuration data for networking + // rules, and other Istio configuration artifacts. Multiple data sources + // can be configured for a single control plane. + repeated ConfigSource config_sources = 22; // $hide_from_docs // This flag is used by secret discovery service(SDS). @@ -150,13 +152,8 @@ message MeshConfig { // will be used to generate key/cert eventually. This isn't supported for non-k8s case. bool enable_sds_token_mount = 23; - // ConfigSource describes a source of configuration data for networking - // rules, and other Istio configuration artifacts. Multiple data sources - // can be configured for a single control plane. - repeated ConfigSource config_sources = 25; - // $hide_from_docs - // Next available field number: 26 + // Next available field number: 25 } // ConfigSource describes information about a configuration store inside a @@ -165,6 +162,7 @@ message MeshConfig { message ConfigSource { // Address of the server implementing the Istio Mesh Configuration // protocol (MCP). Can be IP address or a fully qualified DNS name. + // Use file:/// to specify a file-based backend with absolute path to the directory. string address = 1; // Use the tls_settings to specify the tls mode to use. If the MCP server diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html index 5ce717a05e..c8e07f12bf 100644 --- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html +++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html @@ -66,7 +66,8 @@

ConfigSource

 @@ -242,14 +243,6 @@

MeshConfig

Unix Domain Socket through which envoy communicates with NodeAgent SDS to get key/cert for mTLS. Use secret-mount files instead of SDS if set to empty.

- - - - - - diff --git a/python/istio_api/mesh/v1alpha1/config_pb2.py b/python/istio_api/mesh/v1alpha1/config_pb2.py index 5d7826a2f8..98825c8ae9 100644 --- a/python/istio_api/mesh/v1alpha1/config_pb2.py +++ b/python/istio_api/mesh/v1alpha1/config_pb2.py @@ -22,7 +22,7 @@ name='mesh/v1alpha1/config.proto', package='istio.mesh.v1alpha1', syntax='proto3', - serialized_pb=_b('\n\x1amesh/v1alpha1/config.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x19mesh/v1alpha1/proxy.proto\x1a*networking/v1alpha3/destination_rule.proto\"\xdc\x06\n\nMeshConfig\x12\x1a\n\x12mixer_check_server\x18\x01 \x01(\t\x12\x1b\n\x13mixer_report_server\x18\x02 \x01(\t\x12\x1d\n\x15\x64isable_policy_checks\x18\x03 \x01(\x08\x12\x19\n\x11proxy_listen_port\x18\x04 \x01(\x05\x12\x17\n\x0fproxy_http_port\x18\x05 \x01(\x05\x12\x32\n\x0f\x63onnect_timeout\x18\x06 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x15\n\ringress_class\x18\x07 \x01(\t\x12\x17\n\x0fingress_service\x18\x08 \x01(\t\x12V\n\x17ingress_controller_mode\x18\t \x01(\x0e\x32\x35.istio.mesh.v1alpha1.MeshConfig.IngressControllerMode\x12\x43\n\x0b\x61uth_policy\x18\n \x01(\x0e\x32*.istio.mesh.v1alpha1.MeshConfig.AuthPolicyB\x02\x18\x01\x12\x16\n\x0e\x65nable_tracing\x18\x0c \x01(\x08\x12\x17\n\x0f\x61\x63\x63\x65ss_log_file\x18\r \x01(\t\x12\x19\n\x11\x61\x63\x63\x65ss_log_format\x18\x18 \x01(\t\x12\x38\n\x0e\x64\x65\x66\x61ult_config\x18\x0e \x01(\x0b\x32 .istio.mesh.v1alpha1.ProxyConfig\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x1a\n\x0egalley_address\x18\x16 \x01(\tB\x02\x18\x01\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\x12\x39\n\x0e\x63onfig_sources\x18\x19 \x03(\x0b\x32!.istio.mesh.v1alpha1.ConfigSource\"9\n\x15IngressControllerMode\x12\x07\n\x03OFF\x10\x00\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x01\x12\n\n\x06STRICT\x10\x02\"&\n\nAuthPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01J\x04\x08\x0b\x10\x0cJ\x04\x08\x0f\x10\x10J\x04\x08\x10\x10\x11J\x04\x08\x11\x10\x12J\x04\x08\x12\x10\x13J\x04\x08\x15\x10\x16\"]\n\x0c\x43onfigSource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12<\n\x0ctls_settings\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.TLSSettingsB\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') + serialized_pb=_b('\n\x1amesh/v1alpha1/config.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\x1a\x19mesh/v1alpha1/proxy.proto\x1a*networking/v1alpha3/destination_rule.proto\"\xc0\x06\n\nMeshConfig\x12\x1a\n\x12mixer_check_server\x18\x01 \x01(\t\x12\x1b\n\x13mixer_report_server\x18\x02 \x01(\t\x12\x1d\n\x15\x64isable_policy_checks\x18\x03 \x01(\x08\x12\x19\n\x11proxy_listen_port\x18\x04 \x01(\x05\x12\x17\n\x0fproxy_http_port\x18\x05 \x01(\x05\x12\x32\n\x0f\x63onnect_timeout\x18\x06 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x15\n\ringress_class\x18\x07 \x01(\t\x12\x17\n\x0fingress_service\x18\x08 \x01(\t\x12V\n\x17ingress_controller_mode\x18\t \x01(\x0e\x32\x35.istio.mesh.v1alpha1.MeshConfig.IngressControllerMode\x12\x43\n\x0b\x61uth_policy\x18\n \x01(\x0e\x32*.istio.mesh.v1alpha1.MeshConfig.AuthPolicyB\x02\x18\x01\x12\x16\n\x0e\x65nable_tracing\x18\x0c \x01(\x08\x12\x17\n\x0f\x61\x63\x63\x65ss_log_file\x18\r \x01(\t\x12\x19\n\x11\x61\x63\x63\x65ss_log_format\x18\x18 \x01(\t\x12\x38\n\x0e\x64\x65\x66\x61ult_config\x18\x0e \x01(\x0b\x32 .istio.mesh.v1alpha1.ProxyConfig\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x39\n\x0e\x63onfig_sources\x18\x16 \x03(\x0b\x32!.istio.mesh.v1alpha1.ConfigSource\x12\x1e\n\x16\x65nable_sds_token_mount\x18\x17 \x01(\x08\"9\n\x15IngressControllerMode\x12\x07\n\x03OFF\x10\x00\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x01\x12\n\n\x06STRICT\x10\x02\"&\n\nAuthPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01J\x04\x08\x0b\x10\x0cJ\x04\x08\x0f\x10\x10J\x04\x08\x10\x10\x11J\x04\x08\x11\x10\x12J\x04\x08\x12\x10\x13J\x04\x08\x15\x10\x16\"]\n\x0c\x43onfigSource\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12<\n\x0ctls_settings\x18\x02 \x01(\x0b\x32&.istio.networking.v1alpha3.TLSSettingsB\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3') , dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,mesh_dot_v1alpha1_dot_proxy__pb2.DESCRIPTOR,networking_dot_v1alpha3_dot_destination__rule__pb2.DESCRIPTOR,]) @@ -49,8 +49,8 @@ ], containing_type=None, options=None, - serialized_start=882, - serialized_end=939, + serialized_start=854, + serialized_end=911, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_INGRESSCONTROLLERMODE) @@ -71,8 +71,8 @@ ], containing_type=None, options=None, - serialized_start=941, - serialized_end=979, + serialized_start=913, + serialized_end=951, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_AUTHPOLICY) @@ -197,12 +197,12 @@ is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='galley_address', full_name='istio.mesh.v1alpha1.MeshConfig.galley_address', index=16, - number=22, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + name='config_sources', full_name='istio.mesh.v1alpha1.MeshConfig.config_sources', index=16, + number=22, type=11, cpp_type=10, label=3, + has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=_descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')), file=DESCRIPTOR), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='enable_sds_token_mount', full_name='istio.mesh.v1alpha1.MeshConfig.enable_sds_token_mount', index=17, number=23, type=8, cpp_type=7, label=1, @@ -210,13 +210,6 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='config_sources', full_name='istio.mesh.v1alpha1.MeshConfig.config_sources', index=18, - number=25, type=11, cpp_type=10, 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=[ ], @@ -232,7 +225,7 @@ oneofs=[ ], serialized_start=155, - serialized_end=1015, + serialized_end=987, ) @@ -269,8 +262,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1017, - serialized_end=1110, + serialized_start=989, + serialized_end=1082, ) _MESHCONFIG.fields_by_name['connect_timeout'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION @@ -304,6 +297,4 @@ DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('Z\032istio.io/api/mesh/v1alpha1')) _MESHCONFIG.fields_by_name['auth_policy'].has_options = True _MESHCONFIG.fields_by_name['auth_policy']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) -_MESHCONFIG.fields_by_name['galley_address'].has_options = True -_MESHCONFIG.fields_by_name['galley_address']._options = _descriptor._ParseOptions(descriptor_pb2.FieldOptions(), _b('\030\001')) # @@protoc_insertion_point(module_scope)
FieldTypeDescription
addressstring +

Address of the server implementing the Istio Mesh Configuration +protocol (MCP). Can be IP address or a fully qualified DNS name.

+ +
tlsSettingsistio.networking.v1alpha3.TLSSettings +

Use the tlssettings to specify the tls mode to use. If the MCP server +uses Istio MTLS and shares the root CA with Pilot, specify the TLS +mode as ISTIOMUTUAL.

+
galleyAddress string

Address of the galley service exposing the Mesh Control Protocol (MCP).

+
configSourcesConfigSource[] +

ConfigSource describes a source of configuration data for networking +rules, and other Istio configuration artifacts. Multiple data sources +can be configured for a single control plane.

+
string

Address of the server implementing the Istio Mesh Configuration -protocol (MCP). Can be IP address or a fully qualified DNS name.

+protocol (MCP). Can be IP address or a fully qualified DNS name. +Use file:/// to specify a file-based backend with absolute path to the directory.
galleyAddressstring -

Address of the galley service exposing the Mesh Control Protocol (MCP).

-