From 16405089fd5ce6ce904ed161ae5cd501e1cc74aa Mon Sep 17 00:00:00 2001 From: Quanjie Lin Date: Tue, 11 Dec 2018 10:47:50 -0800 Subject: [PATCH 1/3] add enable_sds_k8s_sa_jwt flag to meshconfig --- mesh/v1alpha1/config.pb.go | 213 ++++++++++++------- mesh/v1alpha1/config.proto | 15 +- python/istio_api/mesh/v1alpha1/config_pb2.py | 47 ++-- 3 files changed, 171 insertions(+), 104 deletions(-) diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go index 4552e43de2..36fc2cd9e1 100644 --- a/mesh/v1alpha1/config.pb.go +++ b/mesh/v1alpha1/config.pb.go @@ -271,9 +271,17 @@ type MeshConfig struct { // $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. + // for k8s service account trustworthy JWT(which is avaialbe for k8s 1.12 or higher), 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"` + // $hide_from_docs + // This flag is used by secret discovery service(SDS). + // If set to true, envoy will fetch normal k8s service account JWT from '/var/run/secrets/kubernetes.io/serviceaccount/token' + // (https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod) + // and pass to sds server, which will be used to generate key/cert eventually. + // This isn't supported for non-k8s case. + EnableSdsK8SSaJwt bool `protobuf:"varint,30,opt,name=enable_sds_k8s_sa_jwt,json=enableSdsK8sSaJwt,proto3" json:"enable_sds_k8s_sa_jwt,omitempty"` // The trust domain corresponds to the trust root of a system. // Refer to https://github.com/spiffe/spiffe/blob/master/standards/SPIFFE-ID.md#21-trust-domain // Fallback to old identity format(without trust domain) if not set. @@ -466,6 +474,13 @@ func (m *MeshConfig) GetEnableSdsTokenMount() bool { return false } +func (m *MeshConfig) GetEnableSdsK8SSaJwt() bool { + if m != nil { + return m.EnableSdsK8SSaJwt + } + return false +} + func (m *MeshConfig) GetTrustDomain() string { if m != nil { return m.TrustDomain @@ -829,6 +844,18 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { } i += n7 } + if m.EnableSdsK8SSaJwt { + dAtA[i] = 0xf0 + i++ + dAtA[i] = 0x1 + i++ + if m.EnableSdsK8SSaJwt { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i++ + } return i, nil } @@ -1039,6 +1066,9 @@ func (m *MeshConfig) Size() (n int) { l = m.DefaultServiceDependency.Size() n += 2 + l + sovConfig(uint64(l)) } + if m.EnableSdsK8SSaJwt { + n += 3 + } return n } @@ -1840,6 +1870,26 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 30: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field EnableSdsK8SSaJwt", 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.EnableSdsK8SSaJwt = bool(v != 0) default: iNdEx = preIndex skippy, err := skipConfig(dAtA[iNdEx:]) @@ -2248,83 +2298,84 @@ var ( func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptorConfig) } var fileDescriptorConfig = []byte{ - // 1235 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x5d, 0x6f, 0xdb, 0xb6, - 0x1a, 0x8e, 0x92, 0xb4, 0x49, 0x5f, 0x7f, 0x44, 0x66, 0x9a, 0x96, 0x75, 0x7b, 0x72, 0xdc, 0x1c, - 0x9c, 0xd6, 0xe8, 0x39, 0xb0, 0xd1, 0x04, 0x03, 0xb6, 0x01, 0xbb, 0x70, 0x6d, 0xa7, 0x75, 0xe6, - 0xd8, 0x86, 0xa4, 0x74, 0xeb, 0x2e, 0x46, 0x28, 0x12, 0x6d, 0x13, 0x91, 0x45, 0x4d, 0xa4, 0xb3, - 0xe6, 0xb7, 0xed, 0x0f, 0xec, 0x72, 0x77, 0xbb, 0x1d, 0xfa, 0x1f, 0x76, 0x3f, 0x90, 0x94, 0x62, - 0xb7, 0x75, 0x97, 0xa1, 0x77, 0xe2, 0xf3, 0x7e, 0xf1, 0x7d, 0xde, 0x0f, 0x0a, 0xaa, 0x33, 0x2a, - 0xa6, 0xcd, 0xcb, 0xe7, 0x7e, 0x94, 0x4c, 0xfd, 0xe7, 0xcd, 0x80, 0xc7, 0x63, 0x36, 0x69, 0x24, - 0x29, 0x97, 0x1c, 0xed, 0x32, 0x21, 0x19, 0x6f, 0x28, 0x8d, 0x46, 0xae, 0x51, 0xdd, 0x9f, 0x70, - 0x3e, 0x89, 0x68, 0x53, 0xab, 0x9c, 0xcf, 0xc7, 0xcd, 0x70, 0x9e, 0xfa, 0x92, 0xf1, 0xd8, 0x18, - 0x55, 0x1f, 0xbc, 0xef, 0x30, 0x49, 0xf9, 0xdb, 0xab, 0x4c, 0xf4, 0x2c, 0xa6, 0xf2, 0x67, 0x9e, - 0x5e, 0xb0, 0x78, 0x92, 0x2b, 0x1c, 0x35, 0x43, 0x2a, 0x24, 0x8b, 0xb5, 0x07, 0x92, 0xce, 0x23, - 0x6a, 0x74, 0x0f, 0xfe, 0xac, 0x00, 0x9c, 0x52, 0x31, 0x6d, 0xeb, 0x0b, 0xa1, 0xff, 0x03, 0x9a, - 0xb1, 0xb7, 0x34, 0x25, 0xc1, 0x94, 0x06, 0x17, 0x44, 0xd0, 0xf4, 0x92, 0xa6, 0xd8, 0xaa, 0x59, - 0xf5, 0x3b, 0x8e, 0xad, 0x25, 0x6d, 0x25, 0x70, 0x35, 0x8e, 0x1a, 0xb0, 0x6b, 0xb4, 0x53, 0x9a, - 0xf0, 0x54, 0xe6, 0xea, 0xeb, 0x5a, 0xbd, 0xa2, 0x45, 0x8e, 0x96, 0x64, 0xfa, 0x87, 0xb0, 0x17, - 0x32, 0xe1, 0x9f, 0x47, 0x94, 0x24, 0x3c, 0x62, 0xc1, 0x95, 0x09, 0x23, 0xf0, 0x46, 0xcd, 0xaa, - 0x6f, 0x3b, 0xbb, 0x99, 0x70, 0xa4, 0x65, 0x3a, 0x90, 0x40, 0xcf, 0xa0, 0xa2, 0x73, 0x23, 0x11, - 0x13, 0x92, 0xc6, 0x44, 0xb9, 0xc3, 0x9b, 0x35, 0xab, 0x7e, 0xcb, 0xd9, 0xd1, 0x82, 0xbe, 0xc6, - 0x47, 0x3c, 0x95, 0xe8, 0x09, 0x18, 0x88, 0x4c, 0xa5, 0x4c, 0x8c, 0xe6, 0x2d, 0xad, 0x59, 0xd2, - 0xf0, 0x2b, 0x29, 0x13, 0xad, 0xf7, 0x02, 0x76, 0x02, 0x1e, 0xc7, 0x34, 0x90, 0x44, 0xb2, 0x19, - 0xe5, 0x73, 0x89, 0x6f, 0xd7, 0xac, 0x7a, 0xe1, 0xf0, 0x41, 0xc3, 0xb0, 0xde, 0xc8, 0x59, 0x6f, - 0x74, 0x32, 0xd6, 0x9d, 0x72, 0x66, 0xe1, 0x19, 0x03, 0xf4, 0x1f, 0x28, 0xb1, 0x78, 0x92, 0x52, - 0x21, 0x48, 0x10, 0xf9, 0x42, 0xe0, 0x2d, 0x9d, 0x75, 0x31, 0x03, 0xdb, 0x0a, 0x43, 0x4f, 0x61, - 0x27, 0x57, 0x52, 0xdc, 0xb0, 0x80, 0xe2, 0x6d, 0xad, 0x56, 0xce, 0x60, 0xd7, 0xa0, 0x68, 0x06, - 0xf7, 0xaf, 0xbd, 0xf1, 0x58, 0xa6, 0x3c, 0x8a, 0x68, 0x4a, 0x66, 0x3c, 0xa4, 0xf8, 0x4e, 0xcd, - 0xaa, 0x97, 0x0f, 0xbf, 0x68, 0xac, 0x68, 0x92, 0xc6, 0xa2, 0x72, 0x8d, 0x5e, 0x16, 0xf7, 0xda, - 0xfa, 0x94, 0x87, 0xd4, 0xd9, 0x63, 0xab, 0x60, 0x34, 0x84, 0x82, 0x3f, 0x97, 0xd3, 0xac, 0x0a, - 0x18, 0x74, 0x88, 0x67, 0x37, 0x85, 0x68, 0xcd, 0xe5, 0xd4, 0xd4, 0xe6, 0xc5, 0x3a, 0xb6, 0x1c, - 0xf0, 0xaf, 0xcf, 0xa8, 0x07, 0x95, 0x34, 0x14, 0x24, 0xa5, 0xe3, 0x94, 0x8a, 0x29, 0x09, 0x69, - 0xe4, 0x5f, 0xe1, 0xc2, 0x0d, 0x9c, 0x6a, 0x2f, 0x3b, 0x69, 0x28, 0x1c, 0x63, 0xd6, 0x51, 0x56, - 0xe8, 0xbf, 0x50, 0xa6, 0xb1, 0xee, 0x11, 0x99, 0xfa, 0x01, 0x8b, 0x27, 0xb8, 0xa8, 0xbb, 0xa3, - 0x64, 0x50, 0xcf, 0x80, 0xaa, 0xd6, 0x7e, 0x10, 0x28, 0xc2, 0x22, 0x3e, 0x21, 0x63, 0x16, 0x51, - 0x5c, 0xd2, 0xd4, 0x96, 0x0c, 0xdc, 0xe7, 0x93, 0x63, 0x16, 0x51, 0xf4, 0x12, 0xca, 0x21, 0x1d, - 0xfb, 0xf3, 0x48, 0x12, 0x33, 0x74, 0xb8, 0xac, 0xaf, 0x55, 0x5b, 0x99, 0xed, 0x48, 0xf5, 0x89, - 0x49, 0xd7, 0x29, 0x65, 0x76, 0xd9, 0x68, 0x3c, 0x85, 0x92, 0x69, 0x76, 0x3f, 0x0c, 0x15, 0xa5, - 0xd8, 0x56, 0xe1, 0x74, 0x0e, 0x45, 0x2d, 0x68, 0x19, 0x1c, 0xfd, 0x04, 0xf7, 0xf9, 0x5c, 0x9e, - 0xf3, 0x79, 0x1c, 0xaa, 0x14, 0xc6, 0x63, 0x16, 0xe4, 0x44, 0x57, 0x74, 0xe8, 0x1b, 0x6b, 0x39, - 0xcc, 0xcc, 0x3d, 0x63, 0xbd, 0xc4, 0xf9, 0x1e, 0x5f, 0x25, 0x42, 0x1d, 0xf8, 0x77, 0xc6, 0x59, - 0x10, 0x31, 0x1a, 0x4b, 0x22, 0x58, 0xf8, 0xfe, 0x8c, 0xe1, 0x5d, 0x4d, 0xe2, 0x43, 0xa3, 0xd6, - 0xd6, 0x5a, 0x2e, 0x0b, 0x97, 0x67, 0x0d, 0xd5, 0xa0, 0x28, 0x42, 0x41, 0xe6, 0xa1, 0x20, 0x89, - 0x2f, 0xa7, 0xf8, 0xae, 0xe6, 0x13, 0x44, 0x28, 0xce, 0x42, 0x31, 0xf2, 0xe5, 0x54, 0x95, 0x59, - 0x7c, 0x54, 0xe6, 0xbd, 0x7f, 0x54, 0x66, 0xf1, 0x41, 0x99, 0x5f, 0x41, 0xd9, 0xd4, 0x83, 0x08, - 0x3e, 0x4f, 0x03, 0x2a, 0xf0, 0xbd, 0xda, 0x46, 0xbd, 0x70, 0xf8, 0x78, 0x25, 0x39, 0x86, 0x18, - 0x57, 0x6b, 0x3a, 0xa5, 0x60, 0xe9, 0x24, 0xd0, 0x11, 0xdc, 0xcb, 0x92, 0x57, 0x77, 0x93, 0xfc, - 0x82, 0xc6, 0x64, 0xc6, 0xe7, 0xb1, 0xc4, 0xf7, 0xcd, 0x5a, 0x31, 0x52, 0x37, 0x14, 0x9e, 0x92, - 0x9d, 0x2a, 0x91, 0x5a, 0x2b, 0xcb, 0xed, 0xc3, 0xd3, 0x99, 0x2f, 0x31, 0xd6, 0x09, 0xef, 0x2c, - 0x1a, 0x48, 0xc3, 0x2a, 0xc0, 0x32, 0x95, 0x64, 0xec, 0xb3, 0x88, 0xf0, 0x84, 0xc6, 0xf8, 0x81, - 0x09, 0x90, 0x2c, 0x48, 0x3c, 0xf6, 0x59, 0x34, 0x4c, 0x68, 0x8c, 0x1e, 0x43, 0x51, 0xa6, 0x73, - 0x21, 0x49, 0xc8, 0x67, 0x3e, 0x8b, 0x71, 0x55, 0xfb, 0x2e, 0x68, 0xac, 0xa3, 0x21, 0xe4, 0xc3, - 0xee, 0xd2, 0x1d, 0x68, 0x1c, 0xf0, 0x50, 0xb5, 0xfb, 0x43, 0x3d, 0x8d, 0xcf, 0x6f, 0x9c, 0xc6, - 0xfc, 0x96, 0xdd, 0xcc, 0xd0, 0xa9, 0xf8, 0x1f, 0x42, 0x88, 0x43, 0x49, 0x06, 0x09, 0xb9, 0xa0, - 0x34, 0xf1, 0x23, 0x76, 0x49, 0xf1, 0x23, 0x5d, 0xac, 0x93, 0xcc, 0xf9, 0xe2, 0xa1, 0xc8, 0x43, - 0x1c, 0x29, 0xaa, 0xd5, 0x9e, 0x63, 0x3c, 0x1e, 0x71, 0x1e, 0xb9, 0x54, 0x4a, 0x16, 0x4f, 0x44, - 0xc3, 0x6b, 0x8f, 0x16, 0xdf, 0x41, 0xf2, 0x6d, 0xee, 0xd1, 0x29, 0xca, 0xa5, 0x13, 0xba, 0x84, - 0x6a, 0x3e, 0x6e, 0xd9, 0xc6, 0x23, 0x21, 0x4d, 0x68, 0x1c, 0xd2, 0x38, 0xb8, 0xc2, 0xff, 0xd2, - 0xd1, 0xbf, 0xbc, 0x29, 0xb5, 0x8e, 0xf1, 0x90, 0x2d, 0xc7, 0xce, 0xb5, 0xbd, 0x83, 0xc3, 0x4f, - 0x48, 0xaa, 0xbf, 0x58, 0xb0, 0xb7, 0x72, 0x6c, 0x90, 0x03, 0x9b, 0x7a, 0x8f, 0x5a, 0x9a, 0xd6, - 0xaf, 0x3f, 0x6b, 0xf6, 0x1a, 0x6a, 0x6b, 0xea, 0x3e, 0xd6, 0xbe, 0x0e, 0x06, 0xb0, 0xa9, 0xf7, - 0xe8, 0x1e, 0x94, 0x9c, 0xee, 0xcb, 0x9e, 0xeb, 0x39, 0x6f, 0xc8, 0x70, 0xd0, 0x7f, 0x63, 0xaf, - 0x55, 0xd7, 0xb7, 0x2d, 0x54, 0x81, 0x3b, 0xad, 0x7e, 0x7f, 0xf8, 0x1d, 0x69, 0x0d, 0xde, 0xd8, - 0x96, 0x86, 0x1e, 0xc1, 0xdd, 0xd7, 0x3d, 0xc7, 0x3b, 0x6b, 0xf5, 0x89, 0xdb, 0x75, 0x5e, 0xf7, - 0xda, 0x5d, 0x63, 0xb0, 0xae, 0xa4, 0xd5, 0xdf, 0x2d, 0xc0, 0x9f, 0x4a, 0x1a, 0xfd, 0x08, 0x05, - 0x36, 0xd3, 0xef, 0xeb, 0x52, 0x1e, 0xdf, 0x7c, 0x2e, 0x87, 0x3a, 0x15, 0x07, 0x8c, 0x47, 0x9d, - 0xc4, 0xff, 0xa0, 0x92, 0xf9, 0x8f, 0xfd, 0x19, 0x15, 0x89, 0xaf, 0x86, 0x71, 0xbd, 0xb6, 0xa1, - 0x9e, 0x7c, 0x23, 0x18, 0x5c, 0xe3, 0x07, 0x8d, 0x2c, 0x73, 0x04, 0xe5, 0x56, 0xbf, 0x4f, 0x06, - 0xad, 0xd3, 0xae, 0x3b, 0x6a, 0xb5, 0xbb, 0xae, 0xbd, 0xa6, 0x30, 0xb7, 0x75, 0xda, 0x5d, 0x80, - 0xb6, 0x75, 0xf0, 0x15, 0xec, 0xad, 0x7c, 0x99, 0xd0, 0x16, 0x6c, 0x0c, 0x8f, 0x8f, 0xed, 0x35, - 0x54, 0x80, 0xad, 0x4e, 0xf7, 0xb8, 0x75, 0xd6, 0xf7, 0x6c, 0x0b, 0x01, 0xdc, 0x76, 0x3d, 0xa7, - 0xd7, 0xf6, 0xec, 0xf5, 0x83, 0x27, 0x00, 0x8b, 0x17, 0x07, 0x6d, 0xc3, 0xe6, 0x60, 0x38, 0xe8, - 0xda, 0x6b, 0xa8, 0x0c, 0x70, 0x7a, 0xa6, 0x99, 0xf4, 0xfa, 0xae, 0x6d, 0x1d, 0x3c, 0x85, 0xca, - 0x47, 0xb3, 0xa0, 0xd4, 0xbd, 0xee, 0xf7, 0x9e, 0xbd, 0xa6, 0xbe, 0x4e, 0xdc, 0xe1, 0xc0, 0xb6, - 0x4e, 0x36, 0xb7, 0x77, 0x6c, 0xfb, 0x64, 0x73, 0x1b, 0xd9, 0xbb, 0x07, 0x02, 0x8a, 0xcb, 0x3b, - 0x05, 0x61, 0xd8, 0xca, 0xf7, 0xba, 0xf9, 0xdb, 0xc9, 0x8f, 0xa8, 0x07, 0x45, 0x19, 0xa9, 0xf7, - 0xdb, 0x34, 0xbf, 0xfe, 0xbb, 0x29, 0x1c, 0x3e, 0xf9, 0x9b, 0x09, 0xf2, 0xfa, 0x6e, 0x3e, 0x2a, - 0x4e, 0x41, 0x46, 0x22, 0x3f, 0xbc, 0xa8, 0xff, 0xfa, 0x6e, 0xdf, 0xfa, 0xed, 0xdd, 0xbe, 0xf5, - 0xc7, 0xbb, 0x7d, 0xeb, 0x87, 0xaa, 0xf1, 0xc0, 0x78, 0xd3, 0x4f, 0x58, 0xf3, 0xbd, 0xdf, 0xb9, - 0xf3, 0xdb, 0x7a, 0x8b, 0x1e, 0xfd, 0x15, 0x00, 0x00, 0xff, 0xff, 0xa2, 0xcc, 0xca, 0xe8, 0x37, - 0x0a, 0x00, 0x00, + // 1262 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x72, 0xd3, 0x46, + 0x14, 0x8e, 0x92, 0x40, 0xc2, 0xf1, 0x4f, 0xe4, 0x0d, 0x86, 0xc5, 0xd0, 0xd4, 0xa4, 0x53, 0xc8, + 0xd0, 0x8e, 0x53, 0x92, 0xe9, 0x0c, 0xed, 0x4c, 0x2f, 0x8c, 0xe3, 0x80, 0x83, 0x63, 0x7b, 0x24, + 0x85, 0x96, 0x5e, 0x74, 0x47, 0x91, 0xd6, 0xf6, 0x36, 0xb2, 0x56, 0xd5, 0xae, 0x03, 0x79, 0xa2, + 0x3e, 0x44, 0x5f, 0xa0, 0x97, 0xbd, 0xeb, 0x6d, 0x87, 0x27, 0xe9, 0xec, 0xae, 0x14, 0x1b, 0x30, + 0x4d, 0x87, 0x3b, 0xed, 0x77, 0xfe, 0xf6, 0x7c, 0xe7, 0x67, 0x05, 0xb5, 0x09, 0x15, 0xe3, 0xdd, + 0xf3, 0xc7, 0x7e, 0x94, 0x8c, 0xfd, 0xc7, 0xbb, 0x01, 0x8f, 0x87, 0x6c, 0xd4, 0x48, 0x52, 0x2e, + 0x39, 0xda, 0x64, 0x42, 0x32, 0xde, 0x50, 0x1a, 0x8d, 0x5c, 0xa3, 0xb6, 0x35, 0xe2, 0x7c, 0x14, + 0xd1, 0x5d, 0xad, 0x72, 0x3a, 0x1d, 0xee, 0x86, 0xd3, 0xd4, 0x97, 0x8c, 0xc7, 0xc6, 0xa8, 0x76, + 0xe7, 0x5d, 0x87, 0x49, 0xca, 0xdf, 0x5c, 0x64, 0xa2, 0x47, 0x31, 0x95, 0xaf, 0x79, 0x7a, 0xc6, + 0xe2, 0x51, 0xae, 0xb0, 0xbf, 0x1b, 0x52, 0x21, 0x59, 0xac, 0x3d, 0x90, 0x74, 0x1a, 0x51, 0xa3, + 0xbb, 0xfd, 0x3b, 0x02, 0x38, 0xa6, 0x62, 0xdc, 0xd2, 0x17, 0x42, 0x5f, 0x03, 0x9a, 0xb0, 0x37, + 0x34, 0x25, 0xc1, 0x98, 0x06, 0x67, 0x44, 0xd0, 0xf4, 0x9c, 0xa6, 0xd8, 0xaa, 0x5b, 0x3b, 0x37, + 0x1c, 0x5b, 0x4b, 0x5a, 0x4a, 0xe0, 0x6a, 0x1c, 0x35, 0x60, 0xd3, 0x68, 0xa7, 0x34, 0xe1, 0xa9, + 0xcc, 0xd5, 0x97, 0xb5, 0x7a, 0x45, 0x8b, 0x1c, 0x2d, 0xc9, 0xf4, 0xf7, 0xa0, 0x1a, 0x32, 0xe1, + 0x9f, 0x46, 0x94, 0x24, 0x3c, 0x62, 0xc1, 0x85, 0x09, 0x23, 0xf0, 0x4a, 0xdd, 0xda, 0x59, 0x77, + 0x36, 0x33, 0xe1, 0x40, 0xcb, 0x74, 0x20, 0x81, 0x1e, 0x41, 0x45, 0xe7, 0x46, 0x22, 0x26, 0x24, + 0x8d, 0x89, 0x72, 0x87, 0x57, 0xeb, 0xd6, 0xce, 0x35, 0x67, 0x43, 0x0b, 0xba, 0x1a, 0x1f, 0xf0, + 0x54, 0xa2, 0x07, 0x60, 0x20, 0x32, 0x96, 0x32, 0x31, 0x9a, 0xd7, 0xb4, 0x66, 0x49, 0xc3, 0xcf, + 0xa5, 0x4c, 0xb4, 0xde, 0x53, 0xd8, 0x08, 0x78, 0x1c, 0xd3, 0x40, 0x12, 0xc9, 0x26, 0x94, 0x4f, + 0x25, 0xbe, 0x5e, 0xb7, 0x76, 0x0a, 0x7b, 0x77, 0x1a, 0x86, 0xf5, 0x46, 0xce, 0x7a, 0xe3, 0x20, + 0x63, 0xdd, 0x29, 0x67, 0x16, 0x9e, 0x31, 0x40, 0x5f, 0x40, 0x89, 0xc5, 0xa3, 0x94, 0x0a, 0x41, + 0x82, 0xc8, 0x17, 0x02, 0xaf, 0xe9, 0xac, 0x8b, 0x19, 0xd8, 0x52, 0x18, 0x7a, 0x08, 0x1b, 0xb9, + 0x92, 0xe2, 0x86, 0x05, 0x14, 0xaf, 0x6b, 0xb5, 0x72, 0x06, 0xbb, 0x06, 0x45, 0x13, 0xb8, 0x7d, + 0xe9, 0x8d, 0xc7, 0x32, 0xe5, 0x51, 0x44, 0x53, 0x32, 0xe1, 0x21, 0xc5, 0x37, 0xea, 0xd6, 0x4e, + 0x79, 0xef, 0xdb, 0xc6, 0x82, 0x26, 0x69, 0xcc, 0x2a, 0xd7, 0xe8, 0x64, 0x71, 0x2f, 0xad, 0x8f, + 0x79, 0x48, 0x9d, 0x2a, 0x5b, 0x04, 0xa3, 0x3e, 0x14, 0xfc, 0xa9, 0x1c, 0x67, 0x55, 0xc0, 0xa0, + 0x43, 0x3c, 0xba, 0x2a, 0x44, 0x73, 0x2a, 0xc7, 0xa6, 0x36, 0x4f, 0x97, 0xb1, 0xe5, 0x80, 0x7f, + 0x79, 0x46, 0x1d, 0xa8, 0xa4, 0xa1, 0x20, 0x29, 0x1d, 0xa6, 0x54, 0x8c, 0x49, 0x48, 0x23, 0xff, + 0x02, 0x17, 0xae, 0xe0, 0x54, 0x7b, 0xd9, 0x48, 0x43, 0xe1, 0x18, 0xb3, 0x03, 0x65, 0x85, 0xbe, + 0x84, 0x32, 0x8d, 0x75, 0x8f, 0xc8, 0xd4, 0x0f, 0x58, 0x3c, 0xc2, 0x45, 0xdd, 0x1d, 0x25, 0x83, + 0x7a, 0x06, 0x54, 0xb5, 0xf6, 0x83, 0x40, 0x11, 0x16, 0xf1, 0x11, 0x19, 0xb2, 0x88, 0xe2, 0x92, + 0xa6, 0xb6, 0x64, 0xe0, 0x2e, 0x1f, 0x1d, 0xb2, 0x88, 0xa2, 0x67, 0x50, 0x0e, 0xe9, 0xd0, 0x9f, + 0x46, 0x92, 0x98, 0xa1, 0xc3, 0x65, 0x7d, 0xad, 0xfa, 0xc2, 0x6c, 0x07, 0xaa, 0x4f, 0x4c, 0xba, + 0x4e, 0x29, 0xb3, 0xcb, 0x46, 0xe3, 0x21, 0x94, 0x4c, 0xb3, 0xfb, 0x61, 0xa8, 0x28, 0xc5, 0xb6, + 0x0a, 0xa7, 0x73, 0x28, 0x6a, 0x41, 0xd3, 0xe0, 0xe8, 0x37, 0xb8, 0xcd, 0xa7, 0xf2, 0x94, 0x4f, + 0xe3, 0x50, 0xa5, 0x30, 0x1c, 0xb2, 0x20, 0x27, 0xba, 0xa2, 0x43, 0x5f, 0x59, 0xcb, 0x7e, 0x66, + 0xee, 0x19, 0xeb, 0x39, 0xce, 0xab, 0x7c, 0x91, 0x08, 0x1d, 0xc0, 0xe7, 0x19, 0x67, 0x41, 0xc4, + 0x68, 0x2c, 0x89, 0x60, 0xe1, 0xbb, 0x33, 0x86, 0x37, 0x35, 0x89, 0x77, 0x8d, 0x5a, 0x4b, 0x6b, + 0xb9, 0x2c, 0x9c, 0x9f, 0x35, 0x54, 0x87, 0xa2, 0x08, 0x05, 0x99, 0x86, 0x82, 0x24, 0xbe, 0x1c, + 0xe3, 0x9b, 0x9a, 0x4f, 0x10, 0xa1, 0x38, 0x09, 0xc5, 0xc0, 0x97, 0x63, 0x55, 0x66, 0xf1, 0x41, + 0x99, 0xab, 0xff, 0xab, 0xcc, 0xe2, 0xbd, 0x32, 0x3f, 0x87, 0xb2, 0xa9, 0x07, 0x11, 0x7c, 0x9a, + 0x06, 0x54, 0xe0, 0x5b, 0xf5, 0x95, 0x9d, 0xc2, 0xde, 0xfd, 0x85, 0xe4, 0x18, 0x62, 0x5c, 0xad, + 0xe9, 0x94, 0x82, 0xb9, 0x93, 0x40, 0xfb, 0x70, 0x2b, 0x4b, 0x5e, 0xdd, 0x4d, 0xf2, 0x33, 0x1a, + 0x93, 0x09, 0x9f, 0xc6, 0x12, 0xdf, 0x36, 0x6b, 0xc5, 0x48, 0xdd, 0x50, 0x78, 0x4a, 0x76, 0xac, + 0x44, 0x6a, 0xad, 0xcc, 0xb7, 0x0f, 0x4f, 0x27, 0xbe, 0xc4, 0x58, 0x27, 0xbc, 0x31, 0x6b, 0x20, + 0x0d, 0xab, 0x00, 0xf3, 0x54, 0x92, 0xa1, 0xcf, 0x22, 0xc2, 0x13, 0x1a, 0xe3, 0x3b, 0x26, 0x40, + 0x32, 0x23, 0xf1, 0xd0, 0x67, 0x51, 0x3f, 0xa1, 0x31, 0xba, 0x0f, 0x45, 0x99, 0x4e, 0x85, 0x24, + 0x21, 0x9f, 0xf8, 0x2c, 0xc6, 0x35, 0xed, 0xbb, 0xa0, 0xb1, 0x03, 0x0d, 0x21, 0x1f, 0x36, 0xe7, + 0xee, 0x40, 0xe3, 0x80, 0x87, 0xaa, 0xdd, 0xef, 0xea, 0x69, 0x7c, 0x7c, 0xe5, 0x34, 0xe6, 0xb7, + 0x6c, 0x67, 0x86, 0x4e, 0xc5, 0x7f, 0x1f, 0x42, 0x1c, 0x4a, 0x32, 0x48, 0xc8, 0x19, 0xa5, 0x89, + 0x1f, 0xb1, 0x73, 0x8a, 0xef, 0xe9, 0x62, 0x1d, 0x65, 0xce, 0x67, 0x0f, 0x45, 0x1e, 0x62, 0x5f, + 0x51, 0xad, 0xf6, 0x1c, 0xe3, 0xf1, 0x80, 0xf3, 0xc8, 0xa5, 0x52, 0xb2, 0x78, 0x24, 0x1a, 0x5e, + 0x6b, 0x30, 0xfb, 0x0e, 0x92, 0x17, 0xb9, 0x47, 0xa7, 0x28, 0xe7, 0x4e, 0xe8, 0x1c, 0x6a, 0xf9, + 0xb8, 0x65, 0x1b, 0x8f, 0x84, 0x34, 0xa1, 0x71, 0x48, 0xe3, 0xe0, 0x02, 0x7f, 0xa6, 0xa3, 0x3f, + 0xb9, 0x2a, 0xb5, 0x03, 0xe3, 0x21, 0x5b, 0x8e, 0x07, 0x97, 0xf6, 0x0e, 0x0e, 0x3f, 0x22, 0x41, + 0xdf, 0x40, 0x75, 0xae, 0x09, 0xce, 0x9e, 0x08, 0x22, 0x7c, 0xf2, 0xeb, 0x6b, 0x89, 0xb7, 0x74, + 0x89, 0x2a, 0x97, 0x3d, 0xf0, 0xe2, 0x89, 0x70, 0xfd, 0xa3, 0xd7, 0xb2, 0xf6, 0x87, 0x05, 0xd5, + 0x85, 0x83, 0x86, 0x1c, 0x58, 0xd5, 0x9b, 0xd7, 0xd2, 0x85, 0xf8, 0xfe, 0x93, 0xa6, 0xb5, 0xa1, + 0xf6, 0xac, 0xee, 0x7c, 0xed, 0x6b, 0xbb, 0x07, 0xab, 0x7a, 0xf3, 0x56, 0xa1, 0xe4, 0xb4, 0x9f, + 0x75, 0x5c, 0xcf, 0x79, 0x45, 0xfa, 0xbd, 0xee, 0x2b, 0x7b, 0xa9, 0xb6, 0xbc, 0x6e, 0xa1, 0x0a, + 0xdc, 0x68, 0x76, 0xbb, 0xfd, 0x1f, 0x49, 0xb3, 0xf7, 0xca, 0xb6, 0x34, 0x74, 0x0f, 0x6e, 0xbe, + 0xec, 0x38, 0xde, 0x49, 0xb3, 0x4b, 0xdc, 0xb6, 0xf3, 0xb2, 0xd3, 0x6a, 0x1b, 0x83, 0x65, 0x25, + 0xad, 0xfd, 0x6d, 0x01, 0xfe, 0x18, 0x4d, 0xe8, 0x17, 0x28, 0xb0, 0x89, 0x7e, 0x91, 0xe7, 0xf2, + 0xf8, 0xe1, 0x53, 0x59, 0xd7, 0xa9, 0x38, 0x60, 0x3c, 0xea, 0x24, 0xbe, 0x82, 0x4a, 0xe6, 0x3f, + 0xf6, 0x27, 0x54, 0x24, 0xbe, 0x1a, 0xdf, 0xe5, 0xfa, 0x8a, 0xfa, 0x49, 0x30, 0x82, 0xde, 0x25, + 0xbe, 0xdd, 0xc8, 0x32, 0x47, 0x50, 0x6e, 0x76, 0xbb, 0xa4, 0xd7, 0x3c, 0x6e, 0xbb, 0x83, 0x66, + 0xab, 0xed, 0xda, 0x4b, 0x0a, 0x73, 0x9b, 0xc7, 0xed, 0x19, 0x68, 0x5b, 0xdb, 0xdf, 0x41, 0x75, + 0xe1, 0x5b, 0x86, 0xd6, 0x60, 0xa5, 0x7f, 0x78, 0x68, 0x2f, 0xa1, 0x02, 0xac, 0x1d, 0xb4, 0x0f, + 0x9b, 0x27, 0x5d, 0xcf, 0xb6, 0x10, 0xc0, 0x75, 0xd7, 0x73, 0x3a, 0x2d, 0xcf, 0x5e, 0xde, 0x7e, + 0x00, 0x30, 0x7b, 0xa3, 0xd0, 0x3a, 0xac, 0xf6, 0xfa, 0xbd, 0xb6, 0xbd, 0x84, 0xca, 0x00, 0xc7, + 0x27, 0x9a, 0x49, 0xaf, 0xeb, 0xda, 0xd6, 0xf6, 0x43, 0xa8, 0x7c, 0x30, 0x3d, 0x4a, 0xdd, 0x6b, + 0xff, 0xe4, 0xd9, 0x4b, 0xea, 0xeb, 0xc8, 0xed, 0xf7, 0x6c, 0xeb, 0x68, 0x75, 0x7d, 0xc3, 0xb6, + 0x8f, 0x56, 0xd7, 0x91, 0xbd, 0xb9, 0x2d, 0xa0, 0x38, 0xbf, 0x85, 0x10, 0x86, 0xb5, 0xfc, 0x25, + 0x30, 0xff, 0x47, 0xf9, 0x11, 0x75, 0xa0, 0x28, 0x23, 0xf5, 0xe2, 0x9b, 0x71, 0xd1, 0xff, 0x43, + 0x85, 0xbd, 0x07, 0xff, 0x31, 0x73, 0x5e, 0xd7, 0xcd, 0x87, 0xcb, 0x29, 0xc8, 0x48, 0xe4, 0x87, + 0xa7, 0x3b, 0x7f, 0xbe, 0xdd, 0xb2, 0xfe, 0x7a, 0xbb, 0x65, 0xfd, 0xf3, 0x76, 0xcb, 0xfa, 0xb9, + 0x66, 0x3c, 0x30, 0xbe, 0xeb, 0x27, 0x6c, 0xf7, 0x9d, 0x1f, 0xc0, 0xd3, 0xeb, 0x7a, 0xef, 0xee, + 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xbd, 0xe9, 0x00, 0x3b, 0x69, 0x0a, 0x00, 0x00, } diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto index b2bd4b9956..9ffb8f5ebb 100644 --- a/mesh/v1alpha1/config.proto +++ b/mesh/v1alpha1/config.proto @@ -190,10 +190,19 @@ message MeshConfig { // $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. + // for k8s service account trustworthy JWT(which is avaialbe for k8s 1.12 or higher), 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. bool enable_sds_token_mount = 23; + // $hide_from_docs + // This flag is used by secret discovery service(SDS). + // If set to true, envoy will fetch normal k8s service account JWT from '/var/run/secrets/kubernetes.io/serviceaccount/token' + // (https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod) + // and pass to sds server, which will be used to generate key/cert eventually. + // This isn't supported for non-k8s case. + bool enable_sds_k8s_sa_jwt = 30; + // The trust domain corresponds to the trust root of a system. // Refer to https://github.com/spiffe/spiffe/blob/master/standards/SPIFFE-ID.md#21-trust-domain // Fallback to old identity format(without trust domain) if not set. @@ -233,7 +242,7 @@ message MeshConfig { DefaultServiceDependency default_service_dependency = 29; // $hide_from_docs - // Next available field number: 30 + // Next available field number: 31 } // ConfigSource describes information about a configuration store inside a diff --git a/python/istio_api/mesh/v1alpha1/config_pb2.py b/python/istio_api/mesh/v1alpha1/config_pb2.py index 5c7f884e8f..a680bbdaec 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\"\xf7\r\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\x1e\n\x16policy_check_fail_open\x18\x19 \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\x61\n\rtcp_keepalive\x18\x1c \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive\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\x38\n\x11rds_refresh_delay\x18\x0b \x01(\x0b\x32\x19.google.protobuf.DurationB\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\x12N\n\x13\x61\x63\x63\x65ss_log_encoding\x18\x1b \x01(\x0e\x32\x31.istio.mesh.v1alpha1.MeshConfig.AccessLogEncoding\x12\x38\n\x0e\x64\x65\x66\x61ult_config\x18\x0e \x01(\x0b\x32 .istio.mesh.v1alpha1.ProxyConfig\x12\x19\n\rmixer_address\x18\x10 \x01(\tB\x02\x18\x01\x12Z\n\x17outbound_traffic_policy\x18\x11 \x01(\x0b\x32\x35.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicyB\x02\x18\x01\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x38\n\x11sds_refresh_delay\x18\x15 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\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\x12\x14\n\x0ctrust_domain\x18\x1a \x01(\t\x12\\\n\x1a\x64\x65\x66\x61ult_service_dependency\x18\x1d \x01(\x0b\x32\x38.istio.mesh.v1alpha1.MeshConfig.DefaultServiceDependency\x1a\xb5\x01\n\x15OutboundTrafficPolicy\x12L\n\x04mode\x18\x01 \x01(\x0e\x32:.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy.ModeB\x02\x18\x01\"N\n\x04Mode\x12\x15\n\rREGISTRY_ONLY\x10\x00\x1a\x02\x08\x01\x12\x11\n\tALLOW_ANY\x10\x01\x1a\x02\x08\x01\x12\x1c\n\x14VIRTUAL_SERVICE_ONLY\x10\x02\x1a\x02\x08\x01\x1a\xb9\x01\n\x18\x44\x65\x66\x61ultServiceDependency\x12R\n\x0bimport_mode\x18\x01 \x01(\x0e\x32=.istio.mesh.v1alpha1.MeshConfig.DefaultServiceDependency.Mode\x12\x19\n\x11import_namespaces\x18\x02 \x03(\t\".\n\x04Mode\x12\x12\n\x0e\x41LL_NAMESPACES\x10\x00\x12\x12\n\x0eSAME_NAMESPACE\x10\x01\"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\x01\"\'\n\x11\x41\x63\x63\x65ssLogEncoding\x12\x08\n\x04TEXT\x10\x00\x12\x08\n\x04JSON\x10\x01J\x04\x08\x0f\x10\x10J\x04\x08\x12\x10\x13\"]\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\"\x96\x0e\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\x1e\n\x16policy_check_fail_open\x18\x19 \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\x61\n\rtcp_keepalive\x18\x1c \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive\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\x38\n\x11rds_refresh_delay\x18\x0b \x01(\x0b\x32\x19.google.protobuf.DurationB\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\x12N\n\x13\x61\x63\x63\x65ss_log_encoding\x18\x1b \x01(\x0e\x32\x31.istio.mesh.v1alpha1.MeshConfig.AccessLogEncoding\x12\x38\n\x0e\x64\x65\x66\x61ult_config\x18\x0e \x01(\x0b\x32 .istio.mesh.v1alpha1.ProxyConfig\x12\x19\n\rmixer_address\x18\x10 \x01(\tB\x02\x18\x01\x12Z\n\x17outbound_traffic_policy\x18\x11 \x01(\x0b\x32\x35.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicyB\x02\x18\x01\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x38\n\x11sds_refresh_delay\x18\x15 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\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\x12\x1d\n\x15\x65nable_sds_k8s_sa_jwt\x18\x1e \x01(\x08\x12\x14\n\x0ctrust_domain\x18\x1a \x01(\t\x12\\\n\x1a\x64\x65\x66\x61ult_service_dependency\x18\x1d \x01(\x0b\x32\x38.istio.mesh.v1alpha1.MeshConfig.DefaultServiceDependency\x1a\xb5\x01\n\x15OutboundTrafficPolicy\x12L\n\x04mode\x18\x01 \x01(\x0e\x32:.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy.ModeB\x02\x18\x01\"N\n\x04Mode\x12\x15\n\rREGISTRY_ONLY\x10\x00\x1a\x02\x08\x01\x12\x11\n\tALLOW_ANY\x10\x01\x1a\x02\x08\x01\x12\x1c\n\x14VIRTUAL_SERVICE_ONLY\x10\x02\x1a\x02\x08\x01\x1a\xb9\x01\n\x18\x44\x65\x66\x61ultServiceDependency\x12R\n\x0bimport_mode\x18\x01 \x01(\x0e\x32=.istio.mesh.v1alpha1.MeshConfig.DefaultServiceDependency.Mode\x12\x19\n\x11import_namespaces\x18\x02 \x03(\t\".\n\x04Mode\x12\x12\n\x0e\x41LL_NAMESPACES\x10\x00\x12\x12\n\x0eSAME_NAMESPACE\x10\x01\"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\x01\"\'\n\x11\x41\x63\x63\x65ssLogEncoding\x12\x08\n\x04TEXT\x10\x00\x12\x08\n\x04JSON\x10\x01J\x04\x08\x0f\x10\x10J\x04\x08\x12\x10\x13\"]\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=1520, - serialized_end=1598, + serialized_start=1551, + serialized_end=1629, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE) @@ -71,8 +71,8 @@ ], containing_type=None, options=None, - serialized_start=1740, - serialized_end=1786, + serialized_start=1771, + serialized_end=1817, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_DEFAULTSERVICEDEPENDENCY_MODE) @@ -97,8 +97,8 @@ ], containing_type=None, options=None, - serialized_start=1788, - serialized_end=1845, + serialized_start=1819, + serialized_end=1876, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_INGRESSCONTROLLERMODE) @@ -119,8 +119,8 @@ ], containing_type=None, options=None, - serialized_start=1847, - serialized_end=1885, + serialized_start=1878, + serialized_end=1916, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_AUTHPOLICY) @@ -141,8 +141,8 @@ ], containing_type=None, options=None, - serialized_start=1887, - serialized_end=1926, + serialized_start=1918, + serialized_end=1957, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_ACCESSLOGENCODING) @@ -174,8 +174,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1417, - serialized_end=1598, + serialized_start=1448, + serialized_end=1629, ) _MESHCONFIG_DEFAULTSERVICEDEPENDENCY = _descriptor.Descriptor( @@ -212,8 +212,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1601, - serialized_end=1786, + serialized_start=1632, + serialized_end=1817, ) _MESHCONFIG = _descriptor.Descriptor( @@ -399,14 +399,21 @@ is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='trust_domain', full_name='istio.mesh.v1alpha1.MeshConfig.trust_domain', index=25, + name='enable_sds_k8s_sa_jwt', full_name='istio.mesh.v1alpha1.MeshConfig.enable_sds_k8s_sa_jwt', index=25, + number=30, type=8, cpp_type=7, label=1, + has_default_value=False, default_value=False, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='trust_domain', full_name='istio.mesh.v1alpha1.MeshConfig.trust_domain', index=26, number=26, 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='default_service_dependency', full_name='istio.mesh.v1alpha1.MeshConfig.default_service_dependency', index=26, + name='default_service_dependency', full_name='istio.mesh.v1alpha1.MeshConfig.default_service_dependency', index=27, number=29, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -428,7 +435,7 @@ oneofs=[ ], serialized_start=155, - serialized_end=1938, + serialized_end=1969, ) @@ -465,8 +472,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1940, - serialized_end=2033, + serialized_start=1971, + serialized_end=2064, ) _MESHCONFIG_OUTBOUNDTRAFFICPOLICY.fields_by_name['mode'].enum_type = _MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE From 058dc10f43c339f36460368a02b0949e70235a1a Mon Sep 17 00:00:00 2001 From: Quanjie Lin Date: Tue, 11 Dec 2018 10:59:49 -0800 Subject: [PATCH 2/3] fix build --- proto.lock | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/proto.lock b/proto.lock index c1288ae658..9262940137 100644 --- a/proto.lock +++ b/proto.lock @@ -835,6 +835,11 @@ "name": "enable_sds_token_mount", "type": "bool" }, + { + "id": 30, + "name": "enable_sds_k8s_sa_jwt", + "type": "bool" + }, { "id": 26, "name": "trust_domain", From 2314c84b539ea4af330d256499d3bf20f553f54a Mon Sep 17 00:00:00 2001 From: Quanjie Lin Date: Tue, 11 Dec 2018 13:47:20 -0800 Subject: [PATCH 3/3] update comment and rename --- mesh/v1alpha1/config.pb.go | 182 ++++++++++--------- mesh/v1alpha1/config.proto | 7 +- proto.lock | 2 +- python/istio_api/mesh/v1alpha1/config_pb2.py | 38 ++-- 4 files changed, 116 insertions(+), 113 deletions(-) diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go index 36fc2cd9e1..32a1caa43b 100644 --- a/mesh/v1alpha1/config.pb.go +++ b/mesh/v1alpha1/config.pb.go @@ -272,16 +272,17 @@ type MeshConfig struct { // 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 trustworthy JWT(which is avaialbe for k8s 1.12 or higher), so that K8s API server - // mounts k8s service account JWT to envoy container, which will be used to generate key/cert eventually. + // mounts k8s service account trustworthy JWT to envoy container, which will be used to request 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"` // $hide_from_docs // This flag is used by secret discovery service(SDS). // If set to true, envoy will fetch normal k8s service account JWT from '/var/run/secrets/kubernetes.io/serviceaccount/token' // (https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod) - // and pass to sds server, which will be used to generate key/cert eventually. + // and pass to sds server, which will be used to request key/cert eventually. + // If both enable_sds_token_mount and sds_use_k8s_sa_jwt are set to true, enable_sds_token_mount(trustworthy jwt) takes precedence. // This isn't supported for non-k8s case. - EnableSdsK8SSaJwt bool `protobuf:"varint,30,opt,name=enable_sds_k8s_sa_jwt,json=enableSdsK8sSaJwt,proto3" json:"enable_sds_k8s_sa_jwt,omitempty"` + SdsUseK8SSaJwt bool `protobuf:"varint,30,opt,name=sds_use_k8s_sa_jwt,json=sdsUseK8sSaJwt,proto3" json:"sds_use_k8s_sa_jwt,omitempty"` // The trust domain corresponds to the trust root of a system. // Refer to https://github.com/spiffe/spiffe/blob/master/standards/SPIFFE-ID.md#21-trust-domain // Fallback to old identity format(without trust domain) if not set. @@ -474,9 +475,9 @@ func (m *MeshConfig) GetEnableSdsTokenMount() bool { return false } -func (m *MeshConfig) GetEnableSdsK8SSaJwt() bool { +func (m *MeshConfig) GetSdsUseK8SSaJwt() bool { if m != nil { - return m.EnableSdsK8SSaJwt + return m.SdsUseK8SSaJwt } return false } @@ -844,12 +845,12 @@ func (m *MeshConfig) MarshalTo(dAtA []byte) (int, error) { } i += n7 } - if m.EnableSdsK8SSaJwt { + if m.SdsUseK8SSaJwt { dAtA[i] = 0xf0 i++ dAtA[i] = 0x1 i++ - if m.EnableSdsK8SSaJwt { + if m.SdsUseK8SSaJwt { dAtA[i] = 1 } else { dAtA[i] = 0 @@ -1066,7 +1067,7 @@ func (m *MeshConfig) Size() (n int) { l = m.DefaultServiceDependency.Size() n += 2 + l + sovConfig(uint64(l)) } - if m.EnableSdsK8SSaJwt { + if m.SdsUseK8SSaJwt { n += 3 } return n @@ -1872,7 +1873,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 30: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EnableSdsK8SSaJwt", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SdsUseK8SSaJwt", wireType) } var v int for shift := uint(0); ; shift += 7 { @@ -1889,7 +1890,7 @@ func (m *MeshConfig) Unmarshal(dAtA []byte) error { break } } - m.EnableSdsK8SSaJwt = bool(v != 0) + m.SdsUseK8SSaJwt = bool(v != 0) default: iNdEx = preIndex skippy, err := skipConfig(dAtA[iNdEx:]) @@ -2298,84 +2299,85 @@ var ( func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptorConfig) } var fileDescriptorConfig = []byte{ - // 1262 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x72, 0xd3, 0x46, - 0x14, 0x8e, 0x92, 0x40, 0xc2, 0xf1, 0x4f, 0xe4, 0x0d, 0x86, 0xc5, 0xd0, 0xd4, 0xa4, 0x53, 0xc8, - 0xd0, 0x8e, 0x53, 0x92, 0xe9, 0x0c, 0xed, 0x4c, 0x2f, 0x8c, 0xe3, 0x80, 0x83, 0x63, 0x7b, 0x24, - 0x85, 0x96, 0x5e, 0x74, 0x47, 0x91, 0xd6, 0xf6, 0x36, 0xb2, 0x56, 0xd5, 0xae, 0x03, 0x79, 0xa2, - 0x3e, 0x44, 0x5f, 0xa0, 0x97, 0xbd, 0xeb, 0x6d, 0x87, 0x27, 0xe9, 0xec, 0xae, 0x14, 0x1b, 0x30, - 0x4d, 0x87, 0x3b, 0xed, 0x77, 0xfe, 0xf6, 0x7c, 0xe7, 0x67, 0x05, 0xb5, 0x09, 0x15, 0xe3, 0xdd, - 0xf3, 0xc7, 0x7e, 0x94, 0x8c, 0xfd, 0xc7, 0xbb, 0x01, 0x8f, 0x87, 0x6c, 0xd4, 0x48, 0x52, 0x2e, - 0x39, 0xda, 0x64, 0x42, 0x32, 0xde, 0x50, 0x1a, 0x8d, 0x5c, 0xa3, 0xb6, 0x35, 0xe2, 0x7c, 0x14, - 0xd1, 0x5d, 0xad, 0x72, 0x3a, 0x1d, 0xee, 0x86, 0xd3, 0xd4, 0x97, 0x8c, 0xc7, 0xc6, 0xa8, 0x76, - 0xe7, 0x5d, 0x87, 0x49, 0xca, 0xdf, 0x5c, 0x64, 0xa2, 0x47, 0x31, 0x95, 0xaf, 0x79, 0x7a, 0xc6, - 0xe2, 0x51, 0xae, 0xb0, 0xbf, 0x1b, 0x52, 0x21, 0x59, 0xac, 0x3d, 0x90, 0x74, 0x1a, 0x51, 0xa3, - 0xbb, 0xfd, 0x3b, 0x02, 0x38, 0xa6, 0x62, 0xdc, 0xd2, 0x17, 0x42, 0x5f, 0x03, 0x9a, 0xb0, 0x37, - 0x34, 0x25, 0xc1, 0x98, 0x06, 0x67, 0x44, 0xd0, 0xf4, 0x9c, 0xa6, 0xd8, 0xaa, 0x5b, 0x3b, 0x37, - 0x1c, 0x5b, 0x4b, 0x5a, 0x4a, 0xe0, 0x6a, 0x1c, 0x35, 0x60, 0xd3, 0x68, 0xa7, 0x34, 0xe1, 0xa9, - 0xcc, 0xd5, 0x97, 0xb5, 0x7a, 0x45, 0x8b, 0x1c, 0x2d, 0xc9, 0xf4, 0xf7, 0xa0, 0x1a, 0x32, 0xe1, - 0x9f, 0x46, 0x94, 0x24, 0x3c, 0x62, 0xc1, 0x85, 0x09, 0x23, 0xf0, 0x4a, 0xdd, 0xda, 0x59, 0x77, - 0x36, 0x33, 0xe1, 0x40, 0xcb, 0x74, 0x20, 0x81, 0x1e, 0x41, 0x45, 0xe7, 0x46, 0x22, 0x26, 0x24, - 0x8d, 0x89, 0x72, 0x87, 0x57, 0xeb, 0xd6, 0xce, 0x35, 0x67, 0x43, 0x0b, 0xba, 0x1a, 0x1f, 0xf0, - 0x54, 0xa2, 0x07, 0x60, 0x20, 0x32, 0x96, 0x32, 0x31, 0x9a, 0xd7, 0xb4, 0x66, 0x49, 0xc3, 0xcf, - 0xa5, 0x4c, 0xb4, 0xde, 0x53, 0xd8, 0x08, 0x78, 0x1c, 0xd3, 0x40, 0x12, 0xc9, 0x26, 0x94, 0x4f, - 0x25, 0xbe, 0x5e, 0xb7, 0x76, 0x0a, 0x7b, 0x77, 0x1a, 0x86, 0xf5, 0x46, 0xce, 0x7a, 0xe3, 0x20, - 0x63, 0xdd, 0x29, 0x67, 0x16, 0x9e, 0x31, 0x40, 0x5f, 0x40, 0x89, 0xc5, 0xa3, 0x94, 0x0a, 0x41, - 0x82, 0xc8, 0x17, 0x02, 0xaf, 0xe9, 0xac, 0x8b, 0x19, 0xd8, 0x52, 0x18, 0x7a, 0x08, 0x1b, 0xb9, - 0x92, 0xe2, 0x86, 0x05, 0x14, 0xaf, 0x6b, 0xb5, 0x72, 0x06, 0xbb, 0x06, 0x45, 0x13, 0xb8, 0x7d, - 0xe9, 0x8d, 0xc7, 0x32, 0xe5, 0x51, 0x44, 0x53, 0x32, 0xe1, 0x21, 0xc5, 0x37, 0xea, 0xd6, 0x4e, - 0x79, 0xef, 0xdb, 0xc6, 0x82, 0x26, 0x69, 0xcc, 0x2a, 0xd7, 0xe8, 0x64, 0x71, 0x2f, 0xad, 0x8f, - 0x79, 0x48, 0x9d, 0x2a, 0x5b, 0x04, 0xa3, 0x3e, 0x14, 0xfc, 0xa9, 0x1c, 0x67, 0x55, 0xc0, 0xa0, - 0x43, 0x3c, 0xba, 0x2a, 0x44, 0x73, 0x2a, 0xc7, 0xa6, 0x36, 0x4f, 0x97, 0xb1, 0xe5, 0x80, 0x7f, - 0x79, 0x46, 0x1d, 0xa8, 0xa4, 0xa1, 0x20, 0x29, 0x1d, 0xa6, 0x54, 0x8c, 0x49, 0x48, 0x23, 0xff, - 0x02, 0x17, 0xae, 0xe0, 0x54, 0x7b, 0xd9, 0x48, 0x43, 0xe1, 0x18, 0xb3, 0x03, 0x65, 0x85, 0xbe, - 0x84, 0x32, 0x8d, 0x75, 0x8f, 0xc8, 0xd4, 0x0f, 0x58, 0x3c, 0xc2, 0x45, 0xdd, 0x1d, 0x25, 0x83, - 0x7a, 0x06, 0x54, 0xb5, 0xf6, 0x83, 0x40, 0x11, 0x16, 0xf1, 0x11, 0x19, 0xb2, 0x88, 0xe2, 0x92, - 0xa6, 0xb6, 0x64, 0xe0, 0x2e, 0x1f, 0x1d, 0xb2, 0x88, 0xa2, 0x67, 0x50, 0x0e, 0xe9, 0xd0, 0x9f, - 0x46, 0x92, 0x98, 0xa1, 0xc3, 0x65, 0x7d, 0xad, 0xfa, 0xc2, 0x6c, 0x07, 0xaa, 0x4f, 0x4c, 0xba, - 0x4e, 0x29, 0xb3, 0xcb, 0x46, 0xe3, 0x21, 0x94, 0x4c, 0xb3, 0xfb, 0x61, 0xa8, 0x28, 0xc5, 0xb6, - 0x0a, 0xa7, 0x73, 0x28, 0x6a, 0x41, 0xd3, 0xe0, 0xe8, 0x37, 0xb8, 0xcd, 0xa7, 0xf2, 0x94, 0x4f, - 0xe3, 0x50, 0xa5, 0x30, 0x1c, 0xb2, 0x20, 0x27, 0xba, 0xa2, 0x43, 0x5f, 0x59, 0xcb, 0x7e, 0x66, - 0xee, 0x19, 0xeb, 0x39, 0xce, 0xab, 0x7c, 0x91, 0x08, 0x1d, 0xc0, 0xe7, 0x19, 0x67, 0x41, 0xc4, - 0x68, 0x2c, 0x89, 0x60, 0xe1, 0xbb, 0x33, 0x86, 0x37, 0x35, 0x89, 0x77, 0x8d, 0x5a, 0x4b, 0x6b, - 0xb9, 0x2c, 0x9c, 0x9f, 0x35, 0x54, 0x87, 0xa2, 0x08, 0x05, 0x99, 0x86, 0x82, 0x24, 0xbe, 0x1c, - 0xe3, 0x9b, 0x9a, 0x4f, 0x10, 0xa1, 0x38, 0x09, 0xc5, 0xc0, 0x97, 0x63, 0x55, 0x66, 0xf1, 0x41, - 0x99, 0xab, 0xff, 0xab, 0xcc, 0xe2, 0xbd, 0x32, 0x3f, 0x87, 0xb2, 0xa9, 0x07, 0x11, 0x7c, 0x9a, - 0x06, 0x54, 0xe0, 0x5b, 0xf5, 0x95, 0x9d, 0xc2, 0xde, 0xfd, 0x85, 0xe4, 0x18, 0x62, 0x5c, 0xad, - 0xe9, 0x94, 0x82, 0xb9, 0x93, 0x40, 0xfb, 0x70, 0x2b, 0x4b, 0x5e, 0xdd, 0x4d, 0xf2, 0x33, 0x1a, - 0x93, 0x09, 0x9f, 0xc6, 0x12, 0xdf, 0x36, 0x6b, 0xc5, 0x48, 0xdd, 0x50, 0x78, 0x4a, 0x76, 0xac, - 0x44, 0x6a, 0xad, 0xcc, 0xb7, 0x0f, 0x4f, 0x27, 0xbe, 0xc4, 0x58, 0x27, 0xbc, 0x31, 0x6b, 0x20, - 0x0d, 0xab, 0x00, 0xf3, 0x54, 0x92, 0xa1, 0xcf, 0x22, 0xc2, 0x13, 0x1a, 0xe3, 0x3b, 0x26, 0x40, - 0x32, 0x23, 0xf1, 0xd0, 0x67, 0x51, 0x3f, 0xa1, 0x31, 0xba, 0x0f, 0x45, 0x99, 0x4e, 0x85, 0x24, - 0x21, 0x9f, 0xf8, 0x2c, 0xc6, 0x35, 0xed, 0xbb, 0xa0, 0xb1, 0x03, 0x0d, 0x21, 0x1f, 0x36, 0xe7, - 0xee, 0x40, 0xe3, 0x80, 0x87, 0xaa, 0xdd, 0xef, 0xea, 0x69, 0x7c, 0x7c, 0xe5, 0x34, 0xe6, 0xb7, - 0x6c, 0x67, 0x86, 0x4e, 0xc5, 0x7f, 0x1f, 0x42, 0x1c, 0x4a, 0x32, 0x48, 0xc8, 0x19, 0xa5, 0x89, - 0x1f, 0xb1, 0x73, 0x8a, 0xef, 0xe9, 0x62, 0x1d, 0x65, 0xce, 0x67, 0x0f, 0x45, 0x1e, 0x62, 0x5f, - 0x51, 0xad, 0xf6, 0x1c, 0xe3, 0xf1, 0x80, 0xf3, 0xc8, 0xa5, 0x52, 0xb2, 0x78, 0x24, 0x1a, 0x5e, - 0x6b, 0x30, 0xfb, 0x0e, 0x92, 0x17, 0xb9, 0x47, 0xa7, 0x28, 0xe7, 0x4e, 0xe8, 0x1c, 0x6a, 0xf9, - 0xb8, 0x65, 0x1b, 0x8f, 0x84, 0x34, 0xa1, 0x71, 0x48, 0xe3, 0xe0, 0x02, 0x7f, 0xa6, 0xa3, 0x3f, - 0xb9, 0x2a, 0xb5, 0x03, 0xe3, 0x21, 0x5b, 0x8e, 0x07, 0x97, 0xf6, 0x0e, 0x0e, 0x3f, 0x22, 0x41, - 0xdf, 0x40, 0x75, 0xae, 0x09, 0xce, 0x9e, 0x08, 0x22, 0x7c, 0xf2, 0xeb, 0x6b, 0x89, 0xb7, 0x74, - 0x89, 0x2a, 0x97, 0x3d, 0xf0, 0xe2, 0x89, 0x70, 0xfd, 0xa3, 0xd7, 0xb2, 0xf6, 0x87, 0x05, 0xd5, - 0x85, 0x83, 0x86, 0x1c, 0x58, 0xd5, 0x9b, 0xd7, 0xd2, 0x85, 0xf8, 0xfe, 0x93, 0xa6, 0xb5, 0xa1, - 0xf6, 0xac, 0xee, 0x7c, 0xed, 0x6b, 0xbb, 0x07, 0xab, 0x7a, 0xf3, 0x56, 0xa1, 0xe4, 0xb4, 0x9f, - 0x75, 0x5c, 0xcf, 0x79, 0x45, 0xfa, 0xbd, 0xee, 0x2b, 0x7b, 0xa9, 0xb6, 0xbc, 0x6e, 0xa1, 0x0a, - 0xdc, 0x68, 0x76, 0xbb, 0xfd, 0x1f, 0x49, 0xb3, 0xf7, 0xca, 0xb6, 0x34, 0x74, 0x0f, 0x6e, 0xbe, - 0xec, 0x38, 0xde, 0x49, 0xb3, 0x4b, 0xdc, 0xb6, 0xf3, 0xb2, 0xd3, 0x6a, 0x1b, 0x83, 0x65, 0x25, - 0xad, 0xfd, 0x6d, 0x01, 0xfe, 0x18, 0x4d, 0xe8, 0x17, 0x28, 0xb0, 0x89, 0x7e, 0x91, 0xe7, 0xf2, - 0xf8, 0xe1, 0x53, 0x59, 0xd7, 0xa9, 0x38, 0x60, 0x3c, 0xea, 0x24, 0xbe, 0x82, 0x4a, 0xe6, 0x3f, - 0xf6, 0x27, 0x54, 0x24, 0xbe, 0x1a, 0xdf, 0xe5, 0xfa, 0x8a, 0xfa, 0x49, 0x30, 0x82, 0xde, 0x25, - 0xbe, 0xdd, 0xc8, 0x32, 0x47, 0x50, 0x6e, 0x76, 0xbb, 0xa4, 0xd7, 0x3c, 0x6e, 0xbb, 0x83, 0x66, - 0xab, 0xed, 0xda, 0x4b, 0x0a, 0x73, 0x9b, 0xc7, 0xed, 0x19, 0x68, 0x5b, 0xdb, 0xdf, 0x41, 0x75, - 0xe1, 0x5b, 0x86, 0xd6, 0x60, 0xa5, 0x7f, 0x78, 0x68, 0x2f, 0xa1, 0x02, 0xac, 0x1d, 0xb4, 0x0f, - 0x9b, 0x27, 0x5d, 0xcf, 0xb6, 0x10, 0xc0, 0x75, 0xd7, 0x73, 0x3a, 0x2d, 0xcf, 0x5e, 0xde, 0x7e, - 0x00, 0x30, 0x7b, 0xa3, 0xd0, 0x3a, 0xac, 0xf6, 0xfa, 0xbd, 0xb6, 0xbd, 0x84, 0xca, 0x00, 0xc7, - 0x27, 0x9a, 0x49, 0xaf, 0xeb, 0xda, 0xd6, 0xf6, 0x43, 0xa8, 0x7c, 0x30, 0x3d, 0x4a, 0xdd, 0x6b, - 0xff, 0xe4, 0xd9, 0x4b, 0xea, 0xeb, 0xc8, 0xed, 0xf7, 0x6c, 0xeb, 0x68, 0x75, 0x7d, 0xc3, 0xb6, - 0x8f, 0x56, 0xd7, 0x91, 0xbd, 0xb9, 0x2d, 0xa0, 0x38, 0xbf, 0x85, 0x10, 0x86, 0xb5, 0xfc, 0x25, - 0x30, 0xff, 0x47, 0xf9, 0x11, 0x75, 0xa0, 0x28, 0x23, 0xf5, 0xe2, 0x9b, 0x71, 0xd1, 0xff, 0x43, - 0x85, 0xbd, 0x07, 0xff, 0x31, 0x73, 0x5e, 0xd7, 0xcd, 0x87, 0xcb, 0x29, 0xc8, 0x48, 0xe4, 0x87, - 0xa7, 0x3b, 0x7f, 0xbe, 0xdd, 0xb2, 0xfe, 0x7a, 0xbb, 0x65, 0xfd, 0xf3, 0x76, 0xcb, 0xfa, 0xb9, - 0x66, 0x3c, 0x30, 0xbe, 0xeb, 0x27, 0x6c, 0xf7, 0x9d, 0x1f, 0xc0, 0xd3, 0xeb, 0x7a, 0xef, 0xee, - 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xbd, 0xe9, 0x00, 0x3b, 0x69, 0x0a, 0x00, 0x00, + // 1266 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x72, 0xd3, 0xc6, + 0x17, 0x8f, 0x92, 0x40, 0xc2, 0xf1, 0x47, 0xe4, 0x0d, 0x81, 0xc5, 0xf0, 0xcf, 0xdf, 0xa4, 0x53, + 0xc8, 0xa4, 0x1d, 0x67, 0x48, 0xa6, 0x33, 0xb4, 0x33, 0xbd, 0x30, 0xb6, 0x03, 0x0e, 0x8e, 0xed, + 0x91, 0x14, 0x5a, 0x7a, 0xd1, 0x1d, 0x45, 0x5a, 0xdb, 0xdb, 0xc8, 0x5a, 0x55, 0xbb, 0x0e, 0xe4, + 0x71, 0xfa, 0x1c, 0x7d, 0x81, 0x5e, 0xf6, 0xae, 0xb7, 0x1d, 0x9e, 0xa4, 0xb3, 0xbb, 0x52, 0x6c, + 0xc0, 0x34, 0x1d, 0xee, 0xb4, 0xbf, 0xf3, 0xb5, 0xe7, 0x77, 0x3e, 0x56, 0x50, 0x9d, 0x50, 0x31, + 0xde, 0xbf, 0x78, 0xe2, 0x47, 0xc9, 0xd8, 0x7f, 0xb2, 0x1f, 0xf0, 0x78, 0xc8, 0x46, 0xf5, 0x24, + 0xe5, 0x92, 0xa3, 0x4d, 0x26, 0x24, 0xe3, 0x75, 0xa5, 0x51, 0xcf, 0x35, 0xaa, 0xdb, 0x23, 0xce, + 0x47, 0x11, 0xdd, 0xd7, 0x2a, 0x67, 0xd3, 0xe1, 0x7e, 0x38, 0x4d, 0x7d, 0xc9, 0x78, 0x6c, 0x8c, + 0xaa, 0xf7, 0xde, 0x77, 0x98, 0xa4, 0xfc, 0xed, 0x65, 0x26, 0xda, 0x8b, 0xa9, 0x7c, 0xc3, 0xd3, + 0x73, 0x16, 0x8f, 0x72, 0x85, 0xc3, 0xfd, 0x90, 0x0a, 0xc9, 0x62, 0xed, 0x81, 0xa4, 0xd3, 0x88, + 0x1a, 0xdd, 0x9d, 0xdf, 0x10, 0xc0, 0x09, 0x15, 0xe3, 0xa6, 0xbe, 0x10, 0xfa, 0x1a, 0xd0, 0x84, + 0xbd, 0xa5, 0x29, 0x09, 0xc6, 0x34, 0x38, 0x27, 0x82, 0xa6, 0x17, 0x34, 0xc5, 0x56, 0xcd, 0xda, + 0xbd, 0xe5, 0xd8, 0x5a, 0xd2, 0x54, 0x02, 0x57, 0xe3, 0xa8, 0x0e, 0x9b, 0x46, 0x3b, 0xa5, 0x09, + 0x4f, 0x65, 0xae, 0xbe, 0xac, 0xd5, 0x2b, 0x5a, 0xe4, 0x68, 0x49, 0xa6, 0x7f, 0x00, 0x5b, 0x21, + 0x13, 0xfe, 0x59, 0x44, 0x49, 0xc2, 0x23, 0x16, 0x5c, 0x9a, 0x30, 0x02, 0xaf, 0xd4, 0xac, 0xdd, + 0x75, 0x67, 0x33, 0x13, 0x0e, 0xb4, 0x4c, 0x07, 0x12, 0x68, 0x0f, 0x2a, 0x3a, 0x37, 0x12, 0x31, + 0x21, 0x69, 0x4c, 0x94, 0x3b, 0xbc, 0x5a, 0xb3, 0x76, 0x6f, 0x38, 0x1b, 0x5a, 0xd0, 0xd5, 0xf8, + 0x80, 0xa7, 0x12, 0x3d, 0x02, 0x03, 0x91, 0xb1, 0x94, 0x89, 0xd1, 0xbc, 0xa1, 0x35, 0x4b, 0x1a, + 0x7e, 0x21, 0x65, 0xa2, 0xf5, 0x9e, 0xc1, 0x46, 0xc0, 0xe3, 0x98, 0x06, 0x92, 0x48, 0x36, 0xa1, + 0x7c, 0x2a, 0xf1, 0xcd, 0x9a, 0xb5, 0x5b, 0x38, 0xb8, 0x57, 0x37, 0xac, 0xd7, 0x73, 0xd6, 0xeb, + 0xad, 0x8c, 0x75, 0xa7, 0x9c, 0x59, 0x78, 0xc6, 0x00, 0x7d, 0x01, 0x25, 0x16, 0x8f, 0x52, 0x2a, + 0x04, 0x09, 0x22, 0x5f, 0x08, 0xbc, 0xa6, 0xb3, 0x2e, 0x66, 0x60, 0x53, 0x61, 0xe8, 0x31, 0x6c, + 0xe4, 0x4a, 0x8a, 0x1b, 0x16, 0x50, 0xbc, 0xae, 0xd5, 0xca, 0x19, 0xec, 0x1a, 0x14, 0x4d, 0xe0, + 0xee, 0x95, 0x37, 0x1e, 0xcb, 0x94, 0x47, 0x11, 0x4d, 0xc9, 0x84, 0x87, 0x14, 0xdf, 0xaa, 0x59, + 0xbb, 0xe5, 0x83, 0x6f, 0xea, 0x0b, 0x9a, 0xa4, 0x3e, 0xab, 0x5c, 0xbd, 0x93, 0xc5, 0xbd, 0xb2, + 0x3e, 0xe1, 0x21, 0x75, 0xb6, 0xd8, 0x22, 0x18, 0xf5, 0xa1, 0xe0, 0x4f, 0xe5, 0x38, 0xab, 0x02, + 0x06, 0x1d, 0x62, 0xef, 0xba, 0x10, 0x8d, 0xa9, 0x1c, 0x9b, 0xda, 0x3c, 0x5b, 0xc6, 0x96, 0x03, + 0xfe, 0xd5, 0x19, 0x75, 0xa0, 0x92, 0x86, 0x82, 0xa4, 0x74, 0x98, 0x52, 0x31, 0x26, 0x21, 0x8d, + 0xfc, 0x4b, 0x5c, 0xb8, 0x86, 0x53, 0xed, 0x65, 0x23, 0x0d, 0x85, 0x63, 0xcc, 0x5a, 0xca, 0x0a, + 0x7d, 0x09, 0x65, 0x1a, 0xeb, 0x1e, 0x91, 0xa9, 0x1f, 0xb0, 0x78, 0x84, 0x8b, 0xba, 0x3b, 0x4a, + 0x06, 0xf5, 0x0c, 0xa8, 0x6a, 0xed, 0x07, 0x81, 0x22, 0x2c, 0xe2, 0x23, 0x32, 0x64, 0x11, 0xc5, + 0x25, 0x4d, 0x6d, 0xc9, 0xc0, 0x5d, 0x3e, 0x3a, 0x62, 0x11, 0x45, 0xcf, 0xa1, 0x1c, 0xd2, 0xa1, + 0x3f, 0x8d, 0x24, 0x31, 0x43, 0x87, 0xcb, 0xfa, 0x5a, 0xb5, 0x85, 0xd9, 0x0e, 0x54, 0x9f, 0x98, + 0x74, 0x9d, 0x52, 0x66, 0x97, 0x8d, 0xc6, 0x63, 0x28, 0x99, 0x66, 0xf7, 0xc3, 0x50, 0x51, 0x8a, + 0x6d, 0x15, 0x4e, 0xe7, 0x50, 0xd4, 0x82, 0x86, 0xc1, 0xd1, 0xaf, 0x70, 0x97, 0x4f, 0xe5, 0x19, + 0x9f, 0xc6, 0xa1, 0x4a, 0x61, 0x38, 0x64, 0x41, 0x4e, 0x74, 0x45, 0x87, 0xbe, 0xb6, 0x96, 0xfd, + 0xcc, 0xdc, 0x33, 0xd6, 0x73, 0x9c, 0x6f, 0xf1, 0x45, 0x22, 0xd4, 0x82, 0xff, 0x67, 0x9c, 0x05, + 0x11, 0xa3, 0xb1, 0x24, 0x82, 0x85, 0xef, 0xcf, 0x18, 0xde, 0xd4, 0x24, 0xde, 0x37, 0x6a, 0x4d, + 0xad, 0xe5, 0xb2, 0x70, 0x7e, 0xd6, 0x50, 0x0d, 0x8a, 0x22, 0x14, 0x64, 0x1a, 0x0a, 0x92, 0xf8, + 0x72, 0x8c, 0x6f, 0x6b, 0x3e, 0x41, 0x84, 0xe2, 0x34, 0x14, 0x03, 0x5f, 0x8e, 0x55, 0x99, 0xc5, + 0x47, 0x65, 0xde, 0xfa, 0x4f, 0x65, 0x16, 0x1f, 0x94, 0xf9, 0x05, 0x94, 0x4d, 0x3d, 0x88, 0xe0, + 0xd3, 0x34, 0xa0, 0x02, 0xdf, 0xa9, 0xad, 0xec, 0x16, 0x0e, 0x1e, 0x2e, 0x24, 0xc7, 0x10, 0xe3, + 0x6a, 0x4d, 0xa7, 0x14, 0xcc, 0x9d, 0x04, 0x3a, 0x84, 0x3b, 0x59, 0xf2, 0xea, 0x6e, 0x92, 0x9f, + 0xd3, 0x98, 0x4c, 0xf8, 0x34, 0x96, 0xf8, 0xae, 0x59, 0x2b, 0x46, 0xea, 0x86, 0xc2, 0x53, 0xb2, + 0x13, 0x25, 0x52, 0x6b, 0x65, 0xbe, 0x7d, 0x78, 0x3a, 0xf1, 0x25, 0xc6, 0x3a, 0xe1, 0x8d, 0x59, + 0x03, 0x69, 0x58, 0x05, 0x98, 0xa7, 0x92, 0x0c, 0x7d, 0x16, 0x11, 0x9e, 0xd0, 0x18, 0xdf, 0x33, + 0x01, 0x92, 0x19, 0x89, 0x47, 0x3e, 0x8b, 0xfa, 0x09, 0x8d, 0xd1, 0x43, 0x28, 0xca, 0x74, 0x2a, + 0x24, 0x09, 0xf9, 0xc4, 0x67, 0x31, 0xae, 0x6a, 0xdf, 0x05, 0x8d, 0xb5, 0x34, 0x84, 0x7c, 0xd8, + 0x9c, 0xbb, 0x03, 0x8d, 0x03, 0x1e, 0xaa, 0x76, 0xbf, 0xaf, 0xa7, 0xf1, 0xc9, 0xb5, 0xd3, 0x98, + 0xdf, 0xb2, 0x9d, 0x19, 0x3a, 0x15, 0xff, 0x43, 0x08, 0x71, 0x28, 0xc9, 0x20, 0x21, 0xe7, 0x94, + 0x26, 0x7e, 0xc4, 0x2e, 0x28, 0x7e, 0xa0, 0x8b, 0x75, 0x9c, 0x39, 0x9f, 0x3d, 0x14, 0x79, 0x88, + 0x43, 0x45, 0xb5, 0xda, 0x73, 0x8c, 0xc7, 0x03, 0xce, 0x23, 0x97, 0x4a, 0xc9, 0xe2, 0x91, 0xa8, + 0x7b, 0xcd, 0xc1, 0xec, 0x3b, 0x48, 0x5e, 0xe6, 0x1e, 0x9d, 0xa2, 0x9c, 0x3b, 0xa1, 0x0b, 0xa8, + 0xe6, 0xe3, 0x96, 0x6d, 0x3c, 0x12, 0xd2, 0x84, 0xc6, 0x21, 0x8d, 0x83, 0x4b, 0xfc, 0x3f, 0x1d, + 0xfd, 0xe9, 0x75, 0xa9, 0xb5, 0x8c, 0x87, 0x6c, 0x39, 0xb6, 0xae, 0xec, 0x1d, 0x1c, 0x7e, 0x42, + 0x82, 0xf6, 0x00, 0xe9, 0xde, 0x15, 0x94, 0x9c, 0x3f, 0x15, 0x44, 0xf8, 0xe4, 0x97, 0x37, 0x12, + 0x6f, 0xeb, 0xfa, 0x94, 0x55, 0x07, 0x0b, 0xfa, 0xf2, 0xa9, 0x70, 0xfd, 0xe3, 0x37, 0xb2, 0xfa, + 0xbb, 0x05, 0x5b, 0x0b, 0x47, 0x0c, 0x39, 0xb0, 0xaa, 0x77, 0xae, 0xa5, 0x4b, 0xf0, 0xdd, 0x67, + 0xcd, 0x69, 0x5d, 0x6d, 0x58, 0xdd, 0xf3, 0xda, 0xd7, 0x4e, 0x0f, 0x56, 0xf5, 0xce, 0xdd, 0x82, + 0x92, 0xd3, 0x7e, 0xde, 0x71, 0x3d, 0xe7, 0x35, 0xe9, 0xf7, 0xba, 0xaf, 0xed, 0xa5, 0xea, 0xf2, + 0xba, 0x85, 0x2a, 0x70, 0xab, 0xd1, 0xed, 0xf6, 0x7f, 0x20, 0x8d, 0xde, 0x6b, 0xdb, 0xd2, 0xd0, + 0x03, 0xb8, 0xfd, 0xaa, 0xe3, 0x78, 0xa7, 0x8d, 0x2e, 0x71, 0xdb, 0xce, 0xab, 0x4e, 0xb3, 0x6d, + 0x0c, 0x96, 0x95, 0xb4, 0xfa, 0x97, 0x05, 0xf8, 0x53, 0x04, 0xa1, 0x9f, 0xa1, 0xc0, 0x26, 0xfa, + 0x2d, 0x9e, 0xcb, 0xe3, 0xfb, 0xcf, 0xe5, 0x5b, 0xa7, 0xe2, 0x80, 0xf1, 0xa8, 0x93, 0xf8, 0x0a, + 0x2a, 0x99, 0xff, 0xd8, 0x9f, 0x50, 0x91, 0xf8, 0x6a, 0x70, 0x97, 0x6b, 0x2b, 0xea, 0xf7, 0xc0, + 0x08, 0x7a, 0x57, 0xf8, 0x4e, 0x3d, 0xcb, 0x1c, 0x41, 0xb9, 0xd1, 0xed, 0x92, 0x5e, 0xe3, 0xa4, + 0xed, 0x0e, 0x1a, 0xcd, 0xb6, 0x6b, 0x2f, 0x29, 0xcc, 0x6d, 0x9c, 0xb4, 0x67, 0xa0, 0x6d, 0xed, + 0x7c, 0x0b, 0x5b, 0x0b, 0x5f, 0x31, 0xb4, 0x06, 0x2b, 0xfd, 0xa3, 0x23, 0x7b, 0x09, 0x15, 0x60, + 0xad, 0xd5, 0x3e, 0x6a, 0x9c, 0x76, 0x3d, 0xdb, 0x42, 0x00, 0x37, 0x5d, 0xcf, 0xe9, 0x34, 0x3d, + 0x7b, 0x79, 0xe7, 0x11, 0xc0, 0xec, 0x75, 0x42, 0xeb, 0xb0, 0xda, 0xeb, 0xf7, 0xda, 0xf6, 0x12, + 0x2a, 0x03, 0x9c, 0x9c, 0x6a, 0x26, 0xbd, 0xae, 0x6b, 0x5b, 0x3b, 0x8f, 0xa1, 0xf2, 0xd1, 0xdc, + 0x28, 0x75, 0xaf, 0xfd, 0xa3, 0x67, 0x2f, 0xa9, 0xaf, 0x63, 0xb7, 0xdf, 0xb3, 0xad, 0xe3, 0xd5, + 0xf5, 0x0d, 0xdb, 0x3e, 0x5e, 0x5d, 0x47, 0xf6, 0xe6, 0x8e, 0x80, 0xe2, 0xfc, 0xfe, 0x41, 0x18, + 0xd6, 0xf2, 0x37, 0xc0, 0xfc, 0x19, 0xe5, 0x47, 0xd4, 0x81, 0xa2, 0x8c, 0xd4, 0x5b, 0x6f, 0x06, + 0x45, 0xff, 0x09, 0x15, 0x0e, 0x1e, 0xfd, 0xcb, 0xb4, 0x79, 0x5d, 0x37, 0x1f, 0x2b, 0xa7, 0x20, + 0x23, 0x91, 0x1f, 0x9e, 0xed, 0xfe, 0xf1, 0x6e, 0xdb, 0xfa, 0xf3, 0xdd, 0xb6, 0xf5, 0xf7, 0xbb, + 0x6d, 0xeb, 0xa7, 0xaa, 0xf1, 0xc0, 0xf8, 0xbe, 0x9f, 0xb0, 0xfd, 0xf7, 0x7e, 0xfd, 0xce, 0x6e, + 0xea, 0x8d, 0x7b, 0xf8, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x5b, 0xd8, 0x2c, 0x63, 0x0a, + 0x00, 0x00, } diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto index 9ffb8f5ebb..789141debd 100644 --- a/mesh/v1alpha1/config.proto +++ b/mesh/v1alpha1/config.proto @@ -191,7 +191,7 @@ message MeshConfig { // 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 trustworthy JWT(which is avaialbe for k8s 1.12 or higher), so that K8s API server - // mounts k8s service account JWT to envoy container, which will be used to generate key/cert eventually. + // mounts k8s service account trustworthy JWT to envoy container, which will be used to request key/cert eventually. // This isn't supported for non-k8s case. bool enable_sds_token_mount = 23; @@ -199,9 +199,10 @@ message MeshConfig { // This flag is used by secret discovery service(SDS). // If set to true, envoy will fetch normal k8s service account JWT from '/var/run/secrets/kubernetes.io/serviceaccount/token' // (https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod) - // and pass to sds server, which will be used to generate key/cert eventually. + // and pass to sds server, which will be used to request key/cert eventually. + // If both enable_sds_token_mount and sds_use_k8s_sa_jwt are set to true, enable_sds_token_mount(trustworthy jwt) takes precedence. // This isn't supported for non-k8s case. - bool enable_sds_k8s_sa_jwt = 30; + bool sds_use_k8s_sa_jwt = 30; // The trust domain corresponds to the trust root of a system. // Refer to https://github.com/spiffe/spiffe/blob/master/standards/SPIFFE-ID.md#21-trust-domain diff --git a/proto.lock b/proto.lock index 9262940137..b9415c777f 100644 --- a/proto.lock +++ b/proto.lock @@ -837,7 +837,7 @@ }, { "id": 30, - "name": "enable_sds_k8s_sa_jwt", + "name": "sds_use_k8s_sa_jwt", "type": "bool" }, { diff --git a/python/istio_api/mesh/v1alpha1/config_pb2.py b/python/istio_api/mesh/v1alpha1/config_pb2.py index a680bbdaec..45d2e7a478 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\"\x96\x0e\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\x1e\n\x16policy_check_fail_open\x18\x19 \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\x61\n\rtcp_keepalive\x18\x1c \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive\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\x38\n\x11rds_refresh_delay\x18\x0b \x01(\x0b\x32\x19.google.protobuf.DurationB\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\x12N\n\x13\x61\x63\x63\x65ss_log_encoding\x18\x1b \x01(\x0e\x32\x31.istio.mesh.v1alpha1.MeshConfig.AccessLogEncoding\x12\x38\n\x0e\x64\x65\x66\x61ult_config\x18\x0e \x01(\x0b\x32 .istio.mesh.v1alpha1.ProxyConfig\x12\x19\n\rmixer_address\x18\x10 \x01(\tB\x02\x18\x01\x12Z\n\x17outbound_traffic_policy\x18\x11 \x01(\x0b\x32\x35.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicyB\x02\x18\x01\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x38\n\x11sds_refresh_delay\x18\x15 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\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\x12\x1d\n\x15\x65nable_sds_k8s_sa_jwt\x18\x1e \x01(\x08\x12\x14\n\x0ctrust_domain\x18\x1a \x01(\t\x12\\\n\x1a\x64\x65\x66\x61ult_service_dependency\x18\x1d \x01(\x0b\x32\x38.istio.mesh.v1alpha1.MeshConfig.DefaultServiceDependency\x1a\xb5\x01\n\x15OutboundTrafficPolicy\x12L\n\x04mode\x18\x01 \x01(\x0e\x32:.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy.ModeB\x02\x18\x01\"N\n\x04Mode\x12\x15\n\rREGISTRY_ONLY\x10\x00\x1a\x02\x08\x01\x12\x11\n\tALLOW_ANY\x10\x01\x1a\x02\x08\x01\x12\x1c\n\x14VIRTUAL_SERVICE_ONLY\x10\x02\x1a\x02\x08\x01\x1a\xb9\x01\n\x18\x44\x65\x66\x61ultServiceDependency\x12R\n\x0bimport_mode\x18\x01 \x01(\x0e\x32=.istio.mesh.v1alpha1.MeshConfig.DefaultServiceDependency.Mode\x12\x19\n\x11import_namespaces\x18\x02 \x03(\t\".\n\x04Mode\x12\x12\n\x0e\x41LL_NAMESPACES\x10\x00\x12\x12\n\x0eSAME_NAMESPACE\x10\x01\"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\x01\"\'\n\x11\x41\x63\x63\x65ssLogEncoding\x12\x08\n\x04TEXT\x10\x00\x12\x08\n\x04JSON\x10\x01J\x04\x08\x0f\x10\x10J\x04\x08\x12\x10\x13\"]\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\"\x93\x0e\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\x1e\n\x16policy_check_fail_open\x18\x19 \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\x61\n\rtcp_keepalive\x18\x1c \x01(\x0b\x32J.istio.networking.v1alpha3.ConnectionPoolSettings.TCPSettings.TcpKeepalive\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\x38\n\x11rds_refresh_delay\x18\x0b \x01(\x0b\x32\x19.google.protobuf.DurationB\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\x12N\n\x13\x61\x63\x63\x65ss_log_encoding\x18\x1b \x01(\x0e\x32\x31.istio.mesh.v1alpha1.MeshConfig.AccessLogEncoding\x12\x38\n\x0e\x64\x65\x66\x61ult_config\x18\x0e \x01(\x0b\x32 .istio.mesh.v1alpha1.ProxyConfig\x12\x19\n\rmixer_address\x18\x10 \x01(\tB\x02\x18\x01\x12Z\n\x17outbound_traffic_policy\x18\x11 \x01(\x0b\x32\x35.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicyB\x02\x18\x01\x12\'\n\x1f\x65nable_client_side_policy_check\x18\x13 \x01(\x08\x12\x14\n\x0csds_uds_path\x18\x14 \x01(\t\x12\x38\n\x11sds_refresh_delay\x18\x15 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\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\x12\x1a\n\x12sds_use_k8s_sa_jwt\x18\x1e \x01(\x08\x12\x14\n\x0ctrust_domain\x18\x1a \x01(\t\x12\\\n\x1a\x64\x65\x66\x61ult_service_dependency\x18\x1d \x01(\x0b\x32\x38.istio.mesh.v1alpha1.MeshConfig.DefaultServiceDependency\x1a\xb5\x01\n\x15OutboundTrafficPolicy\x12L\n\x04mode\x18\x01 \x01(\x0e\x32:.istio.mesh.v1alpha1.MeshConfig.OutboundTrafficPolicy.ModeB\x02\x18\x01\"N\n\x04Mode\x12\x15\n\rREGISTRY_ONLY\x10\x00\x1a\x02\x08\x01\x12\x11\n\tALLOW_ANY\x10\x01\x1a\x02\x08\x01\x12\x1c\n\x14VIRTUAL_SERVICE_ONLY\x10\x02\x1a\x02\x08\x01\x1a\xb9\x01\n\x18\x44\x65\x66\x61ultServiceDependency\x12R\n\x0bimport_mode\x18\x01 \x01(\x0e\x32=.istio.mesh.v1alpha1.MeshConfig.DefaultServiceDependency.Mode\x12\x19\n\x11import_namespaces\x18\x02 \x03(\t\".\n\x04Mode\x12\x12\n\x0e\x41LL_NAMESPACES\x10\x00\x12\x12\n\x0eSAME_NAMESPACE\x10\x01\"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\x01\"\'\n\x11\x41\x63\x63\x65ssLogEncoding\x12\x08\n\x04TEXT\x10\x00\x12\x08\n\x04JSON\x10\x01J\x04\x08\x0f\x10\x10J\x04\x08\x12\x10\x13\"]\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=1551, - serialized_end=1629, + serialized_start=1548, + serialized_end=1626, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE) @@ -71,8 +71,8 @@ ], containing_type=None, options=None, - serialized_start=1771, - serialized_end=1817, + serialized_start=1768, + serialized_end=1814, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_DEFAULTSERVICEDEPENDENCY_MODE) @@ -97,8 +97,8 @@ ], containing_type=None, options=None, - serialized_start=1819, - serialized_end=1876, + serialized_start=1816, + serialized_end=1873, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_INGRESSCONTROLLERMODE) @@ -119,8 +119,8 @@ ], containing_type=None, options=None, - serialized_start=1878, - serialized_end=1916, + serialized_start=1875, + serialized_end=1913, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_AUTHPOLICY) @@ -141,8 +141,8 @@ ], containing_type=None, options=None, - serialized_start=1918, - serialized_end=1957, + serialized_start=1915, + serialized_end=1954, ) _sym_db.RegisterEnumDescriptor(_MESHCONFIG_ACCESSLOGENCODING) @@ -174,8 +174,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1448, - serialized_end=1629, + serialized_start=1445, + serialized_end=1626, ) _MESHCONFIG_DEFAULTSERVICEDEPENDENCY = _descriptor.Descriptor( @@ -212,8 +212,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1632, - serialized_end=1817, + serialized_start=1629, + serialized_end=1814, ) _MESHCONFIG = _descriptor.Descriptor( @@ -399,7 +399,7 @@ is_extension=False, extension_scope=None, options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='enable_sds_k8s_sa_jwt', full_name='istio.mesh.v1alpha1.MeshConfig.enable_sds_k8s_sa_jwt', index=25, + name='sds_use_k8s_sa_jwt', full_name='istio.mesh.v1alpha1.MeshConfig.sds_use_k8s_sa_jwt', index=25, number=30, type=8, cpp_type=7, label=1, has_default_value=False, default_value=False, message_type=None, enum_type=None, containing_type=None, @@ -435,7 +435,7 @@ oneofs=[ ], serialized_start=155, - serialized_end=1969, + serialized_end=1966, ) @@ -472,8 +472,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=1971, - serialized_end=2064, + serialized_start=1968, + serialized_end=2061, ) _MESHCONFIG_OUTBOUNDTRAFFICPOLICY.fields_by_name['mode'].enum_type = _MESHCONFIG_OUTBOUNDTRAFFICPOLICY_MODE