diff --git a/OWNERS b/OWNERS
index eae6f42913..019052cac5 100644
--- a/OWNERS
+++ b/OWNERS
@@ -8,6 +8,7 @@ reviewers:
- hklai
- kyessenov
- mandarjog
+ - ozevren
- qiwzhang
- rshriram
- sebastienvas
@@ -21,6 +22,7 @@ approvers:
- hklai
- kyessenov
- mandarjog
+ - ozevren
- qiwzhang
- rshriram
- sebastienvas
diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go
index df48c35359..04cfb65148 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"
@@ -122,6 +124,10 @@ type MeshConfig struct {
// Disable policy checks by the mixer service. Default
// is false, i.e. mixer policy check is enabled by default.
DisablePolicyChecks bool `protobuf:"varint,3,opt,name=disable_policy_checks,json=disablePolicyChecks,proto3" json:"disable_policy_checks,omitempty"`
+ // Allow all traffic in cases when the mixer policy service cannot be reached.
+ // Default is false which means the traffic is denied when the client is unable
+ // to connect to Mixer.
+ PolicyCheckFailOpen bool `protobuf:"varint,25,opt,name=policy_check_fail_open,json=policyCheckFailOpen,proto3" json:"policy_check_fail_open,omitempty"`
// Port on which Envoy should listen for incoming connections from
// other services.
ProxyListenPort int32 `protobuf:"varint,4,opt,name=proxy_listen_port,json=proxyListenPort,proto3" json:"proxy_listen_port,omitempty"`
@@ -159,8 +165,10 @@ 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
@@ -195,6 +203,13 @@ func (m *MeshConfig) GetDisablePolicyChecks() bool {
return false
}
+func (m *MeshConfig) GetPolicyCheckFailOpen() bool {
+ if m != nil {
+ return m.PolicyCheckFailOpen
+ }
+ return false
+}
+
func (m *MeshConfig) GetProxyListenPort() int32 {
if m != nil {
return m.ProxyListenPort
@@ -286,11 +301,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 {
@@ -300,8 +315,42 @@ func (m *MeshConfig) GetEnableSdsTokenMount() bool {
return false
}
+// 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
+ // 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)
}
@@ -430,13 +479,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
@@ -458,6 +513,52 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) {
i = encodeVarintConfig(dAtA, i, uint64(len(m.AccessLogFormat)))
i += copy(dAtA[i:], m.AccessLogFormat)
}
+ if m.PolicyCheckFailOpen {
+ dAtA[i] = 0xc8
+ i++
+ dAtA[i] = 0x1
+ i++
+ if m.PolicyCheckFailOpen {
+ dAtA[i] = 1
+ } else {
+ dAtA[i] = 0
+ }
+ i++
+ }
+ 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
}
@@ -526,9 +627,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
@@ -537,6 +640,23 @@ func (m *MeshConfig) Size() (n int) {
if l > 0 {
n += 2 + l + sovConfig(uint64(l))
}
+ if m.PolicyCheckFailOpen {
+ n += 3
+ }
+ 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
}
@@ -960,9 +1080,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
@@ -972,20 +1092,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 {
@@ -1036,6 +1158,138 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error {
}
m.AccessLogFormat = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
+ case 25:
+ if wireType != 0 {
+ return fmt.Errorf("proto: wrong wireType = %d for field PolicyCheckFailOpen", wireType)
+ }
+ var v int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowConfig
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ v |= (int(b) & 0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ m.PolicyCheckFailOpen = bool(v != 0)
+ 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 +1419,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,
+ // 838 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xdd, 0x4e, 0x23, 0x37,
+ 0x18, 0xdd, 0x81, 0x2c, 0x84, 0x2f, 0x7f, 0x83, 0x53, 0x58, 0x43, 0x25, 0x9a, 0x52, 0x95, 0x46,
+ 0xa8, 0x9a, 0x68, 0x83, 0x7a, 0xd1, 0x4b, 0x08, 0x9b, 0x2e, 0x51, 0x58, 0xd0, 0x64, 0xb8, 0xe9,
+ 0x8d, 0x35, 0xcc, 0x38, 0x33, 0x16, 0x8e, 0x3d, 0x1a, 0x7b, 0xb6, 0xbb, 0xcf, 0xd4, 0x17, 0xe9,
+ 0x65, 0x1f, 0xa1, 0xe2, 0x49, 0xaa, 0xb1, 0x27, 0x24, 0x48, 0x91, 0xf6, 0xd2, 0xe7, 0x1c, 0xfb,
+ 0x3b, 0xfe, 0xce, 0x67, 0xc3, 0xf1, 0x82, 0xaa, 0x74, 0xf0, 0xf9, 0x7d, 0xc8, 0xb3, 0x34, 0x7c,
+ 0x3f, 0x88, 0xa4, 0x98, 0xb3, 0xc4, 0xcb, 0x72, 0xa9, 0x25, 0xea, 0x32, 0xa5, 0x99, 0xf4, 0x4a,
+ 0x85, 0xb7, 0x54, 0x1c, 0x9f, 0x24, 0x52, 0x26, 0x9c, 0x0e, 0x8c, 0xe4, 0xb1, 0x98, 0x0f, 0xe2,
+ 0x22, 0x0f, 0x35, 0x93, 0xc2, 0x6e, 0x3a, 0x3e, 0x7a, 0x7d, 0x60, 0x96, 0xcb, 0x2f, 0x5f, 0x2b,
+ 0xea, 0x5c, 0x50, 0xfd, 0x97, 0xcc, 0x9f, 0x98, 0x48, 0x96, 0x82, 0x8b, 0x41, 0x4c, 0x95, 0x66,
+ 0xc2, 0x9c, 0x40, 0xf2, 0x82, 0x53, 0xab, 0x3d, 0xfd, 0x7b, 0x0f, 0xe0, 0x96, 0xaa, 0x74, 0x64,
+ 0x0c, 0xa1, 0x5f, 0x01, 0x2d, 0xd8, 0x17, 0x9a, 0x93, 0x28, 0xa5, 0xd1, 0x13, 0x51, 0x34, 0xff,
+ 0x4c, 0x73, 0xec, 0xf4, 0x9c, 0xfe, 0x9e, 0xef, 0x1a, 0x66, 0x54, 0x12, 0x33, 0x83, 0x23, 0x0f,
+ 0xba, 0x56, 0x9d, 0xd3, 0x4c, 0xe6, 0x7a, 0x29, 0xdf, 0x32, 0xf2, 0x7d, 0x43, 0xf9, 0x86, 0xa9,
+ 0xf4, 0x43, 0x38, 0x88, 0x99, 0x0a, 0x1f, 0x39, 0x25, 0x99, 0xe4, 0x2c, 0xfa, 0x6a, 0xcb, 0x28,
+ 0xbc, 0xdd, 0x73, 0xfa, 0x75, 0xbf, 0x5b, 0x91, 0xf7, 0x86, 0x33, 0x85, 0x14, 0x3a, 0x87, 0x7d,
+ 0x73, 0x37, 0xc2, 0x99, 0xd2, 0x54, 0x90, 0xf2, 0x38, 0x5c, 0xeb, 0x39, 0xfd, 0xb7, 0x7e, 0xc7,
+ 0x10, 0x53, 0x83, 0xdf, 0xcb, 0x5c, 0xa3, 0x33, 0xb0, 0x10, 0x49, 0xb5, 0xce, 0xac, 0xf2, 0xad,
+ 0x51, 0xb6, 0x0c, 0xfc, 0x51, 0xeb, 0xcc, 0xe8, 0xae, 0xa0, 0x13, 0x49, 0x21, 0x68, 0xa4, 0x89,
+ 0x66, 0x0b, 0x2a, 0x0b, 0x8d, 0x77, 0x7a, 0x4e, 0xbf, 0x31, 0x3c, 0xf2, 0x6c, 0xd7, 0xbd, 0x65,
+ 0xd7, 0xbd, 0xeb, 0xaa, 0xeb, 0x7e, 0xbb, 0xda, 0x11, 0xd8, 0x0d, 0xe8, 0x27, 0x68, 0x31, 0x91,
+ 0xe4, 0x54, 0x29, 0x12, 0xf1, 0x50, 0x29, 0xbc, 0x6b, 0x6e, 0xdd, 0xac, 0xc0, 0x51, 0x89, 0xa1,
+ 0x5f, 0xa0, 0xb3, 0x14, 0x95, 0xbd, 0x61, 0x11, 0xc5, 0x75, 0x23, 0x6b, 0x57, 0xf0, 0xcc, 0xa2,
+ 0x68, 0x01, 0xef, 0x5e, 0x4e, 0x93, 0x42, 0xe7, 0x92, 0x73, 0x9a, 0x93, 0x85, 0x8c, 0x29, 0xde,
+ 0xeb, 0x39, 0xfd, 0xf6, 0xf0, 0x37, 0x6f, 0xc3, 0x90, 0x78, 0xab, 0xe4, 0xbc, 0x9b, 0xaa, 0xee,
+ 0xcb, 0xee, 0x5b, 0x19, 0x53, 0xff, 0x80, 0x6d, 0x82, 0xd1, 0x1d, 0x34, 0xc2, 0x42, 0xa7, 0x55,
+ 0x0a, 0x18, 0x4c, 0x89, 0xf3, 0x6f, 0x95, 0xb8, 0x2c, 0x74, 0x6a, 0xb3, 0xb9, 0xda, 0xc2, 0x8e,
+ 0x0f, 0xe1, 0xcb, 0x1a, 0xfd, 0x0c, 0x6d, 0x2a, 0x4c, 0xb0, 0x3a, 0x0f, 0x23, 0x26, 0x12, 0xdc,
+ 0x34, 0x91, 0xb6, 0x2c, 0x1a, 0x58, 0xb0, 0x0c, 0x28, 0x8c, 0xa2, 0xf2, 0x96, 0x5c, 0x26, 0x64,
+ 0xce, 0x38, 0xc5, 0x2d, 0xd3, 0x8f, 0x96, 0x85, 0xa7, 0x32, 0x19, 0x33, 0x4e, 0xd1, 0x1f, 0xd0,
+ 0x8e, 0xe9, 0x3c, 0x2c, 0xb8, 0x26, 0xf6, 0xa5, 0xe0, 0xb6, 0xc9, 0xa7, 0xb7, 0xd1, 0xe2, 0x7d,
+ 0x19, 0xae, 0xf5, 0xe8, 0xb7, 0xaa, 0x7d, 0xd5, 0x3c, 0x5f, 0xc3, 0x0f, 0x95, 0xaf, 0x88, 0x33,
+ 0x2a, 0x34, 0x51, 0x2c, 0x7e, 0x3d, 0x7c, 0xb8, 0x6b, 0x8c, 0x7e, 0x6f, 0x65, 0x23, 0xa3, 0x9a,
+ 0xb1, 0x78, 0x7d, 0x08, 0x51, 0x0f, 0x9a, 0x2a, 0x56, 0xa4, 0x88, 0x15, 0xc9, 0x42, 0x9d, 0xe2,
+ 0xef, 0x8c, 0x67, 0x50, 0xb1, 0x7a, 0x88, 0xd5, 0x7d, 0xa8, 0x53, 0xf4, 0x11, 0xda, 0xd6, 0x28,
+ 0x51, 0xb2, 0xc8, 0x23, 0xaa, 0xf0, 0x61, 0x6f, 0xbb, 0xdf, 0x18, 0xfe, 0xb8, 0xd1, 0xb0, 0x35,
+ 0x37, 0x33, 0x4a, 0xbf, 0x15, 0xad, 0xad, 0x14, 0xba, 0x80, 0xc3, 0xca, 0x71, 0x59, 0x52, 0xcb,
+ 0x27, 0x2a, 0xc8, 0x42, 0x16, 0x42, 0xe3, 0x77, 0xf6, 0x91, 0x58, 0x76, 0x16, 0xab, 0xa0, 0xe4,
+ 0x6e, 0x4b, 0xaa, 0x7c, 0x24, 0xeb, 0x7d, 0x95, 0xf9, 0x22, 0xd4, 0x18, 0x1b, 0x97, 0x9d, 0x55,
+ 0x67, 0x0d, 0x5c, 0x16, 0x58, 0xbf, 0x3f, 0x99, 0x87, 0x8c, 0x13, 0x99, 0x51, 0x81, 0x8f, 0x6c,
+ 0x81, 0x6c, 0x75, 0xf3, 0x71, 0xc8, 0xf8, 0x5d, 0x46, 0xc5, 0xe9, 0xef, 0x70, 0xb0, 0x71, 0xc0,
+ 0xd0, 0x2e, 0x6c, 0xdf, 0x8d, 0xc7, 0xee, 0x1b, 0xd4, 0x80, 0xdd, 0xeb, 0x0f, 0xe3, 0xcb, 0x87,
+ 0x69, 0xe0, 0x3a, 0x08, 0x60, 0x67, 0x16, 0xf8, 0x37, 0xa3, 0xc0, 0xdd, 0x3a, 0x3d, 0x03, 0x58,
+ 0x0d, 0x0e, 0xaa, 0x43, 0xed, 0xd3, 0xdd, 0xa7, 0x0f, 0xee, 0x1b, 0xd4, 0x06, 0xb8, 0x7d, 0x08,
+ 0x1e, 0x2e, 0xa7, 0x24, 0x98, 0xce, 0x5c, 0x67, 0x52, 0xab, 0x37, 0xdc, 0xe6, 0xa4, 0x56, 0xef,
+ 0xb8, 0xee, 0xa4, 0x56, 0x77, 0xdd, 0xfd, 0x49, 0xad, 0xbe, 0xef, 0xa2, 0x49, 0xad, 0x8e, 0xdc,
+ 0xee, 0xa4, 0x56, 0x3f, 0x70, 0x0f, 0x4f, 0x15, 0x34, 0xd7, 0x7b, 0x87, 0x30, 0xec, 0x86, 0x71,
+ 0x5c, 0xda, 0xaa, 0xfe, 0xa8, 0xe5, 0x12, 0xdd, 0x40, 0x53, 0xf3, 0xf2, 0xd5, 0x69, 0xcd, 0x44,
+ 0xa2, 0xcc, 0x9f, 0xd4, 0x18, 0x9e, 0x55, 0x71, 0xac, 0x3e, 0xc8, 0x65, 0x28, 0x17, 0x5e, 0x30,
+ 0x9d, 0xcd, 0x2a, 0xb5, 0xdf, 0xd0, 0x5c, 0x2d, 0x17, 0x57, 0xfd, 0x7f, 0x9e, 0x4f, 0x9c, 0x7f,
+ 0x9f, 0x4f, 0x9c, 0xff, 0x9e, 0x4f, 0x9c, 0x3f, 0x8f, 0xed, 0x09, 0x4c, 0x0e, 0xc2, 0x8c, 0x0d,
+ 0x5e, 0x7d, 0xc2, 0x8f, 0x3b, 0xe6, 0xdb, 0xb8, 0xf8, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x5f,
+ 0x27, 0x27, 0xed, 0x05, 0x00, 0x00,
}
diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto
index f20e21dffa..4ed253bc91 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.
@@ -55,6 +56,11 @@ message MeshConfig {
// is false, i.e. mixer policy check is enabled by default.
bool disable_policy_checks = 3;
+ // Allow all traffic in cases when the mixer policy service cannot be reached.
+ // Default is false which means the traffic is denied when the client is unable
+ // to connect to Mixer.
+ bool policy_check_fail_open = 25;
+
// Port on which Envoy should listen for incoming connections from
// other services.
int32 proxy_listen_port = 4;
@@ -139,8 +145,10 @@ message MeshConfig {
reserved 21;
- // Address of the galley service exposing the Mesh Control Protocol (MCP).
- string galley_address = 22;
+ // 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,5 +158,20 @@ message MeshConfig {
bool enable_sds_token_mount = 23;
// $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.
+ // 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
+ // 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..c78edc388d 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,44 @@
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.
+
+
+
+
+
Field
+
Type
+
Description
+
+
+
+
+
address
+
string
+
+
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.
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.
+
@@ -98,6 +136,16 @@
MeshConfig
Disable policy checks by the mixer service. Default
is false, i.e. mixer policy check is enabled by default.
+
+
+
+
policyCheckFailOpen
+
bool
+
+
Allow all traffic in cases when the mixer policy service cannot be reached.
+Default is false which means the traffic is denied when the client is unable
+to connect to Mixer.
Address of the galley service exposing the Mesh Control Protocol (MCP).
+
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.