From 8a03dcdf763bf848c5a7c65b3720147a3aa30642 Mon Sep 17 00:00:00 2001 From: llcao Date: Wed, 8 Jan 2020 18:59:53 -0800 Subject: [PATCH] add service annotation to KubernetesResourcesSpec in operator api. --- operator/v1alpha1/component.pb.go | 167 ++++++++++-------- operator/v1alpha1/component.proto | 3 + .../v1alpha1/istio.operator.v1alpha1.pb.html | 12 ++ proto.lock | 8 + .../operator/v1alpha1/component_pb2.py | 91 ++++++++-- 5 files changed, 186 insertions(+), 95 deletions(-) diff --git a/operator/v1alpha1/component.pb.go b/operator/v1alpha1/component.pb.go index 11978b1d2f..98e2c0ee22 100644 --- a/operator/v1alpha1/component.pb.go +++ b/operator/v1alpha1/component.pb.go @@ -467,6 +467,9 @@ type KubernetesResourcesSpec struct { // k8s toleration // https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ Tolerations *Toleration `protobuf:"bytes,14,opt,name=tolerations,proto3" json:"tolerations,omitempty"` + // k8s service annotations. + // https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + ServiceAnnotations map[string]string `protobuf:"bytes,15,rep,name=service_annotations,json=serviceAnnotations,proto3" json:"service_annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Overlays for k8s resources in rendered manifests. Overlays []*K8SObjectOverlay `protobuf:"bytes,100,rep,name=overlays,proto3" json:"overlays,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -597,6 +600,13 @@ func (m *KubernetesResourcesSpec) GetTolerations() *Toleration { return nil } +func (m *KubernetesResourcesSpec) GetServiceAnnotations() map[string]string { + if m != nil { + return m.ServiceAnnotations + } + return nil +} + func (m *KubernetesResourcesSpec) GetOverlays() []*K8SObjectOverlay { if m != nil { return m.Overlays @@ -736,6 +746,7 @@ func init() { proto.RegisterType((*KubernetesResourcesSpec)(nil), "istio.operator.v1alpha1.KubernetesResourcesSpec") proto.RegisterMapType((map[string]string)(nil), "istio.operator.v1alpha1.KubernetesResourcesSpec.NodeSelectorEntry") proto.RegisterMapType((map[string]string)(nil), "istio.operator.v1alpha1.KubernetesResourcesSpec.PodAnnotationsEntry") + proto.RegisterMapType((map[string]string)(nil), "istio.operator.v1alpha1.KubernetesResourcesSpec.ServiceAnnotationsEntry") proto.RegisterType((*K8SObjectOverlay)(nil), "istio.operator.v1alpha1.K8sObjectOverlay") proto.RegisterType((*K8SObjectOverlay_PathValue)(nil), "istio.operator.v1alpha1.K8sObjectOverlay.PathValue") } @@ -743,81 +754,83 @@ func init() { func init() { proto.RegisterFile("operator/v1alpha1/component.proto", fileDescriptor_6ed34a579e9b43a2) } var fileDescriptor_6ed34a579e9b43a2 = []byte{ - // 1213 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x97, 0x6d, 0x73, 0xdb, 0x44, - 0x10, 0xc7, 0x27, 0x76, 0x9e, 0xbc, 0x6e, 0x9e, 0xae, 0x2d, 0x15, 0x19, 0xda, 0xa6, 0x6e, 0x29, - 0x69, 0x61, 0x64, 0x92, 0xbe, 0xf1, 0x14, 0x28, 0x8d, 0x1b, 0x53, 0x3a, 0xd0, 0xd6, 0x28, 0x4c, - 0x5e, 0x74, 0x86, 0xf1, 0x9c, 0xa5, 0x8d, 0x7c, 0xe4, 0x7c, 0x77, 0x73, 0x77, 0x36, 0x15, 0xdf, - 0x80, 0x6f, 0xc0, 0x57, 0xe2, 0x15, 0xc3, 0x27, 0xe1, 0x2b, 0x30, 0x77, 0x92, 0xed, 0xa4, 0xa9, - 0x49, 0xcc, 0x14, 0x78, 0x27, 0xad, 0xf6, 0xf7, 0xbf, 0xdd, 0xd5, 0x9e, 0xf6, 0x04, 0xb7, 0xa4, - 0x42, 0x4d, 0xad, 0xd4, 0xf5, 0xe1, 0x0e, 0xe5, 0xaa, 0x47, 0x77, 0xea, 0xb1, 0xec, 0x2b, 0x29, - 0x50, 0xd8, 0x50, 0x69, 0x69, 0x25, 0xb9, 0xc6, 0x8c, 0x65, 0x32, 0x1c, 0x39, 0x86, 0x23, 0xc7, - 0xcd, 0xf7, 0x53, 0x29, 0x53, 0x8e, 0x75, 0xef, 0xd6, 0x1d, 0x1c, 0xd5, 0xa9, 0xc8, 0x72, 0x66, - 0x33, 0x3c, 0x6e, 0x98, 0x90, 0xc9, 0x3a, 0x55, 0xac, 0x4e, 0x07, 0x56, 0x9a, 0x98, 0x72, 0x26, - 0xd2, 0xfa, 0x70, 0xb7, 0x8b, 0x96, 0xee, 0xd4, 0x53, 0x14, 0x4e, 0x0d, 0x93, 0xc2, 0xbf, 0x76, - 0x36, 0x8c, 0xe3, 0x41, 0x17, 0xb5, 0x40, 0x8b, 0x26, 0xf7, 0xa9, 0xfd, 0xbe, 0x08, 0x57, 0x9f, - 0xb9, 0x50, 0x9e, 0x8c, 0x02, 0x3c, 0x40, 0x7b, 0xa0, 0x30, 0x26, 0x8f, 0x60, 0xbe, 0x4b, 0x0d, - 0x06, 0xd7, 0xb7, 0xe6, 0xb6, 0xab, 0xbb, 0xf7, 0xc3, 0x29, 0x01, 0x87, 0x4d, 0x6a, 0x70, 0x02, - 0x2b, 0x8c, 0x23, 0xcf, 0x91, 0xcf, 0x61, 0x41, 0x31, 0x2e, 0x6d, 0x70, 0xc3, 0x0b, 0xdc, 0x9d, - 0x2a, 0x70, 0x1a, 0xce, 0x21, 0x4f, 0x6b, 0xf9, 0x3a, 0x0b, 0x6e, 0xce, 0x48, 0x3b, 0x88, 0x7c, - 0x07, 0xeb, 0x86, 0x25, 0x18, 0x53, 0xdd, 0x61, 0xe2, 0x47, 0x8c, 0xad, 0xd4, 0xc1, 0xd6, 0x4c, - 0x42, 0x6b, 0x05, 0xff, 0xac, 0xc0, 0xc9, 0x23, 0x58, 0x54, 0x92, 0xb3, 0x38, 0x0b, 0x6e, 0xcd, - 0x24, 0x54, 0x50, 0x64, 0x1f, 0x2a, 0x16, 0x39, 0xf6, 0xd1, 0xea, 0x2c, 0xa8, 0xcd, 0x24, 0x31, - 0x01, 0xc9, 0x63, 0x58, 0x8a, 0x99, 0xa5, 0x09, 0xf2, 0xe0, 0xf6, 0x4c, 0x1a, 0x23, 0x8c, 0xb4, - 0x00, 0x84, 0x4c, 0xb0, 0x43, 0x53, 0x14, 0x36, 0xb8, 0x33, 0x5b, 0x20, 0x8e, 0xdc, 0x73, 0xa0, - 0x2b, 0x47, 0x4a, 0x39, 0xc7, 0x2c, 0xf8, 0x70, 0xb6, 0x72, 0xe4, 0x14, 0x69, 0x40, 0x39, 0x16, - 0x2c, 0xb8, 0x3b, 0x13, 0xec, 0x10, 0xf2, 0x12, 0xd6, 0x99, 0x48, 0x35, 0x1a, 0xd3, 0x49, 0xa9, - 0xc5, 0x9f, 0x68, 0x66, 0x82, 0xed, 0xad, 0xf2, 0x76, 0x75, 0xf7, 0xce, 0x54, 0x99, 0xa7, 0xb9, - 0x63, 0xfe, 0x66, 0x0b, 0xba, 0xb0, 0x19, 0xf2, 0x1c, 0xd6, 0xf0, 0x0d, 0xbd, 0x7b, 0x33, 0xe8, - 0xad, 0xe2, 0x29, 0xb9, 0xda, 0x2b, 0xd8, 0x38, 0xb3, 0x25, 0x48, 0x0b, 0x96, 0x50, 0xd0, 0x2e, - 0xc7, 0x24, 0x98, 0xf3, 0x29, 0x7f, 0x3c, 0x55, 0xfb, 0xfb, 0x4c, 0x61, 0x53, 0x4a, 0x7e, 0x48, - 0xf9, 0x00, 0xbf, 0x92, 0xba, 0xdd, 0x8c, 0x46, 0x6c, 0xed, 0xd7, 0x12, 0xac, 0xfc, 0x1b, 0xc2, - 0xe4, 0x03, 0xa8, 0x08, 0xda, 0x47, 0xa3, 0x68, 0x8c, 0x41, 0x69, 0x6b, 0x6e, 0xbb, 0x12, 0x4d, - 0x0c, 0x64, 0x1d, 0xca, 0xbd, 0x41, 0x37, 0x00, 0x6f, 0x77, 0x97, 0xce, 0x62, 0x69, 0x1a, 0x54, - 0x73, 0x8b, 0xa5, 0x29, 0x79, 0x08, 0xf3, 0x46, 0x61, 0x7c, 0xee, 0x6e, 0x77, 0x51, 0x3c, 0x13, - 0x16, 0xf5, 0x11, 0x8d, 0x31, 0xf2, 0x0c, 0x69, 0x42, 0xf9, 0xb8, 0x61, 0x82, 0x5d, 0x8f, 0x7e, - 0x3a, 0x15, 0xfd, 0x66, 0xfc, 0xf1, 0x8a, 0xd0, 0xc8, 0x81, 0x8e, 0xd1, 0xe4, 0x6d, 0x71, 0xdc, - 0x30, 0xb5, 0xdf, 0x4a, 0x70, 0xb5, 0xf5, 0xda, 0xa2, 0x16, 0x94, 0xff, 0x0f, 0x25, 0x1a, 0xa5, - 0x0f, 0xff, 0x20, 0xfd, 0xeb, 0x00, 0x71, 0x8f, 0x6a, 0xdb, 0x51, 0xd4, 0xf6, 0x7c, 0x01, 0x2b, - 0x51, 0xc5, 0x5b, 0xda, 0xd4, 0xf6, 0xc8, 0x27, 0xb0, 0x68, 0xe2, 0x1e, 0xf6, 0x69, 0xb1, 0xe5, - 0xaf, 0x84, 0xf9, 0x88, 0x08, 0x47, 0x23, 0x22, 0xdc, 0x13, 0x59, 0x54, 0xf8, 0xbc, 0x93, 0x5a, - 0xfe, 0x59, 0x82, 0xea, 0x89, 0x16, 0xff, 0x6f, 0x2a, 0x48, 0x60, 0xde, 0xdd, 0x04, 0x65, 0xff, - 0xc0, 0x5f, 0x93, 0x16, 0x2c, 0x70, 0xda, 0x45, 0x1e, 0xcc, 0xfb, 0x0d, 0x59, 0xbf, 0xc8, 0x86, - 0x0c, 0xbf, 0x75, 0x44, 0x4b, 0x58, 0x9d, 0x45, 0x39, 0x7d, 0xa1, 0xfe, 0x7d, 0x07, 0x75, 0xdb, - 0x6c, 0x00, 0x4c, 0x16, 0x77, 0x6b, 0x1c, 0x63, 0xe6, 0x2b, 0x56, 0x89, 0xdc, 0x25, 0xb9, 0x02, - 0x0b, 0x43, 0x57, 0x97, 0x22, 0xf9, 0xfc, 0xe6, 0x61, 0xa9, 0x31, 0x57, 0xfb, 0xa3, 0x02, 0xd7, - 0xa6, 0x48, 0x93, 0x2f, 0x60, 0x99, 0x1e, 0x1d, 0x31, 0xc1, 0x6c, 0x56, 0x94, 0xff, 0xd6, 0xd4, - 0xf0, 0xf6, 0x0a, 0xc7, 0x68, 0x8c, 0x90, 0x1d, 0x28, 0xa3, 0x18, 0x06, 0x25, 0x5f, 0xc1, 0x9b, - 0x53, 0xc9, 0x96, 0x18, 0x1e, 0x52, 0x1d, 0x39, 0x5f, 0x72, 0x08, 0xcb, 0x3d, 0x45, 0x3b, 0xbe, - 0xa1, 0xcb, 0x7e, 0xc5, 0xcf, 0x8a, 0xb3, 0x47, 0x48, 0x15, 0x0b, 0x4f, 0x9c, 0x3d, 0xc2, 0xe2, - 0xec, 0x11, 0x7e, 0x2d, 0x35, 0xfb, 0x59, 0x0a, 0x4b, 0x79, 0x5b, 0x26, 0x7b, 0x85, 0x03, 0xea, - 0x7c, 0xf6, 0xf4, 0x14, 0xf5, 0x99, 0xdc, 0x87, 0x0d, 0xd6, 0xa7, 0x29, 0x76, 0xd4, 0x80, 0xf3, - 0x4e, 0x31, 0x4e, 0xe7, 0x7d, 0x2d, 0xd6, 0xfc, 0x83, 0xf6, 0x80, 0xf3, 0x76, 0x3e, 0x2f, 0x53, - 0x58, 0xf1, 0x73, 0xca, 0x20, 0xcf, 0xe7, 0xf7, 0x82, 0x4f, 0xa0, 0x39, 0xeb, 0x9b, 0x09, 0x5f, - 0xc8, 0x04, 0x0f, 0x0a, 0x91, 0xbc, 0x2b, 0x2e, 0x89, 0x13, 0x26, 0x92, 0xc0, 0x55, 0x25, 0x93, - 0x4e, 0xc2, 0x8c, 0x1e, 0x28, 0xcb, 0xa4, 0xe8, 0x74, 0x07, 0x49, 0x8a, 0x36, 0x58, 0x3c, 0xa7, - 0x15, 0xda, 0x32, 0xd9, 0x1f, 0x43, 0x4d, 0xcf, 0xf8, 0x74, 0x2f, 0xab, 0xb3, 0x0f, 0x48, 0x1f, - 0xd6, 0xdc, 0x2a, 0x54, 0x08, 0x69, 0xa9, 0xb3, 0x9b, 0x60, 0xc9, 0x27, 0xb4, 0x3f, 0x73, 0x42, - 0xae, 0xc0, 0x13, 0x99, 0x3c, 0xa5, 0x55, 0x75, 0xca, 0x48, 0x42, 0xb8, 0xac, 0x34, 0x93, 0x9a, - 0xd9, 0xac, 0x13, 0x73, 0x6a, 0x4c, 0xc7, 0xef, 0xad, 0x65, 0x5f, 0xeb, 0x8d, 0xd1, 0xa3, 0x27, - 0xee, 0xc9, 0x0b, 0xb7, 0xd1, 0xda, 0xb0, 0xa6, 0x91, 0x26, 0x4c, 0xb8, 0x31, 0xa8, 0xb4, 0xec, - 0x62, 0x50, 0xf1, 0xe9, 0x7f, 0x34, 0x35, 0xbc, 0x68, 0xe4, 0xdf, 0x76, 0xee, 0xd1, 0xaa, 0x3e, - 0x75, 0x4f, 0x6e, 0xc3, 0x8a, 0x46, 0xc5, 0x59, 0x4c, 0x3b, 0xb1, 0x1c, 0x08, 0xeb, 0x77, 0xdf, - 0x4a, 0x74, 0xa9, 0x30, 0x3e, 0x71, 0x36, 0xf2, 0x18, 0x2a, 0x7a, 0x94, 0x9b, 0xdf, 0x8c, 0xd5, - 0xdd, 0xda, 0xdf, 0x2c, 0x58, 0x78, 0x46, 0x13, 0x88, 0x3c, 0x82, 0x25, 0x83, 0x7a, 0xc8, 0x62, - 0x0c, 0x2e, 0x79, 0x7e, 0xfa, 0xd0, 0x3e, 0xc8, 0xfd, 0xf2, 0x96, 0x2c, 0x20, 0xf2, 0x14, 0x96, - 0x8d, 0x75, 0x87, 0xe6, 0x34, 0x0b, 0x56, 0xce, 0xf9, 0xb6, 0xed, 0xa3, 0xe2, 0x32, 0xeb, 0xbb, - 0xb9, 0x52, 0x20, 0xd1, 0x18, 0x26, 0x2d, 0xa8, 0x5a, 0xc9, 0x1d, 0xe2, 0x5f, 0xee, 0xaa, 0xd7, - 0xba, 0x3d, 0xfd, 0x3b, 0x39, 0xf6, 0x8d, 0x4e, 0x72, 0xa4, 0x05, 0xcb, 0x72, 0x88, 0x9a, 0xbb, - 0x53, 0x48, 0xe2, 0x1b, 0xe4, 0xde, 0xf4, 0x06, 0x69, 0x98, 0x97, 0x5d, 0x77, 0x3c, 0x7d, 0x99, - 0x13, 0xd1, 0x18, 0xdd, 0xfc, 0x12, 0x36, 0xce, 0xf4, 0xfd, 0x2c, 0x1f, 0xa4, 0xcd, 0x3d, 0xb8, - 0xfc, 0x96, 0x3e, 0x9b, 0xe9, 0x9b, 0xf6, 0x4b, 0x09, 0xd6, 0xdf, 0x0c, 0x91, 0xdc, 0x84, 0x2a, - 0x55, 0xac, 0x33, 0x44, 0x6d, 0x98, 0x14, 0x85, 0x10, 0x50, 0xc5, 0x0e, 0x73, 0x8b, 0x1b, 0x03, - 0xc7, 0x4c, 0x24, 0x85, 0x9c, 0xbf, 0x7e, 0xeb, 0x68, 0x78, 0x0e, 0x4b, 0x8a, 0xda, 0xb8, 0x87, - 0xa6, 0x18, 0x0e, 0x0f, 0x2e, 0x5c, 0xa7, 0xd0, 0x8d, 0x55, 0x3f, 0xa0, 0xa2, 0x91, 0xc6, 0xe6, - 0x0f, 0x50, 0x19, 0x5b, 0xdd, 0x7a, 0x7e, 0x14, 0xe7, 0xd1, 0xf9, 0x6b, 0xf7, 0x43, 0x32, 0xc9, - 0xf3, 0xe2, 0x13, 0x3e, 0x87, 0x6a, 0x01, 0xbc, 0xe7, 0xec, 0xcf, 0xa9, 0x3a, 0xb0, 0x9a, 0x89, - 0x74, 0xec, 0x50, 0x5b, 0x83, 0x95, 0x53, 0x44, 0xed, 0x0a, 0x90, 0xb3, 0x43, 0xb4, 0xb9, 0xf5, - 0xea, 0x46, 0xbe, 0x60, 0xf1, 0xff, 0x77, 0xe6, 0xd7, 0xae, 0xbb, 0xe8, 0x8f, 0x03, 0x0f, 0xfe, - 0x0a, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x01, 0xbb, 0xc8, 0x7d, 0x0e, 0x00, 0x00, + // 1245 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x97, 0xdf, 0x72, 0x1b, 0xb5, + 0x17, 0xc7, 0x27, 0x76, 0xfe, 0xf9, 0xb8, 0x89, 0x13, 0xa5, 0xfd, 0x75, 0x7f, 0x19, 0xda, 0xa6, + 0x6e, 0x29, 0x69, 0x61, 0xd6, 0x24, 0xbd, 0xf1, 0x14, 0x28, 0x8d, 0x1b, 0xd3, 0x76, 0xa0, 0xad, + 0xd9, 0x30, 0xb9, 0xe8, 0x0c, 0xe3, 0x91, 0x77, 0x4f, 0xd6, 0x22, 0x6b, 0x49, 0x23, 0xc9, 0xa6, + 0xcb, 0x1b, 0x70, 0xcd, 0x0d, 0xaf, 0xc4, 0x15, 0x8f, 0xc2, 0x2b, 0x30, 0xd2, 0xae, 0xed, 0xa4, + 0xae, 0x69, 0x96, 0x29, 0x70, 0xb7, 0x3e, 0x3a, 0x9f, 0xaf, 0x74, 0x8e, 0x8f, 0xf6, 0x9c, 0x85, + 0x9b, 0x42, 0xa2, 0xa2, 0x46, 0xa8, 0xc6, 0x68, 0x8f, 0x26, 0xb2, 0x4f, 0xf7, 0x1a, 0xa1, 0x18, + 0x48, 0xc1, 0x91, 0x1b, 0x5f, 0x2a, 0x61, 0x04, 0xb9, 0xca, 0xb4, 0x61, 0xc2, 0x1f, 0x3b, 0xfa, + 0x63, 0xc7, 0xed, 0xff, 0xc7, 0x42, 0xc4, 0x09, 0x36, 0x9c, 0x5b, 0x6f, 0x78, 0xd2, 0xa0, 0x3c, + 0xcd, 0x98, 0x6d, 0xff, 0xb4, 0xa9, 0x7d, 0x26, 0x1a, 0x54, 0xb2, 0x06, 0x1d, 0x1a, 0xa1, 0x43, + 0x9a, 0x30, 0x1e, 0x37, 0x46, 0xfb, 0x3d, 0x34, 0x74, 0xaf, 0x11, 0x23, 0xb7, 0x6a, 0x18, 0xe5, + 0xfe, 0xf5, 0xd9, 0x63, 0x9c, 0x0e, 0x7b, 0xa8, 0x38, 0x1a, 0xd4, 0x99, 0x4f, 0xfd, 0xf7, 0x65, + 0xb8, 0xf2, 0xcc, 0x1e, 0xe5, 0xf1, 0xf8, 0x80, 0x47, 0x68, 0x8e, 0x24, 0x86, 0xe4, 0x21, 0x2c, + 0xf6, 0xa8, 0x46, 0xef, 0xda, 0xce, 0xc2, 0x6e, 0x75, 0xff, 0x9e, 0x3f, 0xe7, 0xc0, 0x7e, 0x8b, + 0x6a, 0x9c, 0xc2, 0x12, 0xc3, 0xc0, 0x71, 0xe4, 0x73, 0x58, 0x92, 0x2c, 0x11, 0xc6, 0xbb, 0xee, + 0x04, 0xee, 0xcc, 0x15, 0x38, 0x0f, 0x67, 0x90, 0xa3, 0x95, 0x78, 0x9d, 0x7a, 0x37, 0x0a, 0xd2, + 0x16, 0x22, 0xdf, 0xc2, 0x86, 0x66, 0x11, 0x86, 0x54, 0x75, 0x19, 0xff, 0x01, 0x43, 0x23, 0x94, + 0xb7, 0x53, 0x48, 0xa8, 0x96, 0xf3, 0xcf, 0x72, 0x9c, 0x3c, 0x84, 0x65, 0x29, 0x12, 0x16, 0xa6, + 0xde, 0xcd, 0x42, 0x42, 0x39, 0x45, 0x0e, 0xa1, 0x62, 0x30, 0xc1, 0x01, 0x1a, 0x95, 0x7a, 0xf5, + 0x42, 0x12, 0x53, 0x90, 0x3c, 0x82, 0x95, 0x90, 0x19, 0x1a, 0x61, 0xe2, 0xdd, 0x2a, 0xa4, 0x31, + 0xc6, 0x48, 0x1b, 0x80, 0x8b, 0x08, 0xbb, 0x34, 0x46, 0x6e, 0xbc, 0xdb, 0xc5, 0x0e, 0x62, 0xc9, + 0x03, 0x0b, 0xda, 0x74, 0xc4, 0x34, 0x49, 0x30, 0xf5, 0x3e, 0x2c, 0x96, 0x8e, 0x8c, 0x22, 0x4d, + 0x28, 0x87, 0x9c, 0x79, 0x77, 0x0a, 0xc1, 0x16, 0x21, 0x2f, 0x61, 0x83, 0xf1, 0x58, 0xa1, 0xd6, + 0xdd, 0x98, 0x1a, 0xfc, 0x91, 0xa6, 0xda, 0xdb, 0xdd, 0x29, 0xef, 0x56, 0xf7, 0x6f, 0xcf, 0x95, + 0x79, 0x92, 0x39, 0x66, 0xff, 0x6c, 0x4e, 0xe7, 0x36, 0x4d, 0x9e, 0x43, 0x0d, 0xdf, 0xd0, 0xbb, + 0x5b, 0x40, 0x6f, 0x1d, 0xcf, 0xc9, 0xd5, 0x5f, 0xc1, 0xe6, 0xcc, 0x95, 0x20, 0x6d, 0x58, 0x41, + 0x4e, 0x7b, 0x09, 0x46, 0xde, 0x82, 0x0b, 0xf9, 0xe3, 0xb9, 0xda, 0xdf, 0xa5, 0x12, 0x5b, 0x42, + 0x24, 0xc7, 0x34, 0x19, 0xe2, 0x57, 0x42, 0x75, 0x5a, 0xc1, 0x98, 0xad, 0xff, 0x5a, 0x82, 0xb5, + 0x7f, 0x42, 0x98, 0x7c, 0x00, 0x15, 0x4e, 0x07, 0xa8, 0x25, 0x0d, 0xd1, 0x2b, 0xed, 0x2c, 0xec, + 0x56, 0x82, 0xa9, 0x81, 0x6c, 0x40, 0xb9, 0x3f, 0xec, 0x79, 0xe0, 0xec, 0xf6, 0xd1, 0x5a, 0x0c, + 0x8d, 0xbd, 0x6a, 0x66, 0x31, 0x34, 0x26, 0x0f, 0x60, 0x51, 0x4b, 0x0c, 0xdf, 0x79, 0xdb, 0xed, + 0x29, 0x9e, 0x71, 0x83, 0xea, 0x84, 0x86, 0x18, 0x38, 0x86, 0xb4, 0xa0, 0x7c, 0xda, 0xd4, 0xde, + 0xbe, 0x43, 0x3f, 0x9d, 0x8b, 0x7e, 0x3d, 0x79, 0x79, 0x05, 0xa8, 0xc5, 0x50, 0x85, 0xa8, 0xb3, + 0xb2, 0x38, 0x6d, 0xea, 0xfa, 0x6f, 0x25, 0xb8, 0xd2, 0x7e, 0x6d, 0x50, 0x71, 0x9a, 0xfc, 0x07, + 0x29, 0x1a, 0x87, 0x0f, 0x7f, 0x23, 0xfc, 0x6b, 0x00, 0x61, 0x9f, 0x2a, 0xd3, 0x95, 0xd4, 0xf4, + 0x5d, 0x02, 0x2b, 0x41, 0xc5, 0x59, 0x3a, 0xd4, 0xf4, 0xc9, 0x27, 0xb0, 0xac, 0xc3, 0x3e, 0x0e, + 0x68, 0x7e, 0xe5, 0x2f, 0xfb, 0x59, 0x8b, 0xf0, 0xc7, 0x2d, 0xc2, 0x3f, 0xe0, 0x69, 0x90, 0xfb, + 0xbc, 0x97, 0x5c, 0xfe, 0x51, 0x82, 0xea, 0x99, 0x12, 0xff, 0x77, 0x32, 0x48, 0x60, 0xd1, 0xfe, + 0xf0, 0xca, 0x6e, 0xc1, 0x3d, 0x93, 0x36, 0x2c, 0x25, 0xb4, 0x87, 0x89, 0xb7, 0xe8, 0x2e, 0x64, + 0xe3, 0x22, 0x17, 0xd2, 0xff, 0xc6, 0x12, 0x6d, 0x6e, 0x54, 0x1a, 0x64, 0xf4, 0x85, 0xea, 0xf7, + 0x3d, 0xe4, 0x6d, 0xbb, 0x09, 0x30, 0xdd, 0xdc, 0xee, 0x71, 0x8a, 0xa9, 0xcb, 0x58, 0x25, 0xb0, + 0x8f, 0xe4, 0x32, 0x2c, 0x8d, 0x6c, 0x5e, 0xf2, 0xe0, 0xb3, 0x1f, 0x0f, 0x4a, 0xcd, 0x85, 0xfa, + 0x2f, 0x55, 0xb8, 0x3a, 0x47, 0x9a, 0x7c, 0x01, 0xab, 0xf4, 0xe4, 0x84, 0x71, 0x66, 0xd2, 0x3c, + 0xfd, 0x37, 0xe7, 0x1e, 0xef, 0x20, 0x77, 0x0c, 0x26, 0x08, 0xd9, 0x83, 0x32, 0xf2, 0x91, 0x57, + 0x72, 0x19, 0xbc, 0x31, 0x97, 0x6c, 0xf3, 0xd1, 0x31, 0x55, 0x81, 0xf5, 0x25, 0xc7, 0xb0, 0xda, + 0x97, 0xb4, 0xeb, 0x0a, 0xba, 0xec, 0x76, 0xfc, 0x2c, 0x9f, 0x3d, 0x7c, 0x2a, 0x99, 0x7f, 0x66, + 0xf6, 0xf0, 0xf3, 0xd9, 0xc3, 0x7f, 0x2a, 0x14, 0xfb, 0x49, 0x70, 0x43, 0x93, 0x8e, 0x88, 0x0e, + 0x72, 0x07, 0x54, 0x59, 0xef, 0xe9, 0x4b, 0xea, 0x22, 0xb9, 0x07, 0x9b, 0x6c, 0x40, 0x63, 0xec, + 0xca, 0x61, 0x92, 0x74, 0xf3, 0x76, 0xba, 0xe8, 0x72, 0x51, 0x73, 0x0b, 0x9d, 0x61, 0x92, 0x74, + 0xb2, 0x7e, 0x19, 0xc3, 0x9a, 0xeb, 0x53, 0x1a, 0x93, 0xac, 0x7f, 0x2f, 0xb9, 0x00, 0x5a, 0x45, + 0xff, 0x19, 0xff, 0x85, 0x88, 0xf0, 0x28, 0x17, 0xc9, 0xaa, 0xe2, 0x12, 0x3f, 0x63, 0x22, 0x11, + 0x5c, 0x91, 0x22, 0xea, 0x46, 0x4c, 0xab, 0xa1, 0x34, 0x4c, 0xf0, 0x6e, 0x6f, 0x18, 0xc5, 0x68, + 0xbc, 0xe5, 0x77, 0x94, 0x42, 0x47, 0x44, 0x87, 0x13, 0xa8, 0xe5, 0x18, 0x17, 0xee, 0x96, 0x9c, + 0x5d, 0x20, 0x03, 0xa8, 0xd9, 0x5d, 0x28, 0xe7, 0xc2, 0x50, 0x6b, 0xd7, 0xde, 0x8a, 0x0b, 0xe8, + 0xb0, 0x70, 0x40, 0x36, 0xc1, 0x53, 0x99, 0x2c, 0xa4, 0x75, 0x79, 0xce, 0x48, 0x7c, 0xd8, 0x92, + 0x8a, 0x09, 0xc5, 0x4c, 0xda, 0x0d, 0x13, 0xaa, 0x75, 0xd7, 0xdd, 0xad, 0x55, 0x97, 0xeb, 0xcd, + 0xf1, 0xd2, 0x63, 0xbb, 0xf2, 0xc2, 0x5e, 0xb4, 0x0e, 0xd4, 0x14, 0xd2, 0x88, 0x71, 0xdb, 0x06, + 0xa5, 0x12, 0x3d, 0xf4, 0x2a, 0x2e, 0xfc, 0x8f, 0xe6, 0x1e, 0x2f, 0x18, 0xfb, 0x77, 0xac, 0x7b, + 0xb0, 0xae, 0xce, 0xfd, 0x26, 0xb7, 0x60, 0x4d, 0xa1, 0x4c, 0x58, 0x48, 0xbb, 0xa1, 0x18, 0x72, + 0xe3, 0x6e, 0xdf, 0x5a, 0x70, 0x29, 0x37, 0x3e, 0xb6, 0x36, 0xf2, 0x08, 0x2a, 0x6a, 0x1c, 0x9b, + 0xbb, 0x8c, 0xd5, 0xfd, 0xfa, 0x5f, 0x6c, 0x98, 0x7b, 0x06, 0x53, 0x88, 0x3c, 0x84, 0x15, 0x8d, + 0x6a, 0xc4, 0x42, 0xf4, 0x2e, 0x39, 0x7e, 0x7e, 0xd3, 0x3e, 0xca, 0xfc, 0xb2, 0x92, 0xcc, 0x21, + 0xf2, 0x04, 0x56, 0xb5, 0xb1, 0x43, 0x73, 0x9c, 0x7a, 0x6b, 0xef, 0x78, 0xb7, 0x1d, 0xa2, 0x4c, + 0x44, 0x3a, 0xb0, 0x7d, 0x25, 0x47, 0x82, 0x09, 0x4c, 0xda, 0x50, 0x35, 0x22, 0xb1, 0x88, 0xfb, + 0x73, 0xd7, 0x9d, 0xd6, 0xad, 0xf9, 0xef, 0xc9, 0x89, 0x6f, 0x70, 0x96, 0x23, 0x29, 0x6c, 0xe5, + 0x47, 0x3b, 0x57, 0x2b, 0x35, 0x57, 0x2b, 0x4f, 0x0b, 0xd7, 0x4a, 0x1e, 0xf3, 0x4c, 0xbd, 0x10, + 0x3d, 0xb3, 0x40, 0xda, 0xb0, 0x2a, 0x46, 0xa8, 0x12, 0x3b, 0x00, 0x45, 0x6e, 0xbf, 0xbb, 0xf3, + 0xf7, 0x6b, 0xea, 0x97, 0x3d, 0x3b, 0x19, 0xbf, 0xcc, 0x88, 0x60, 0x82, 0x6e, 0x7f, 0x09, 0x9b, + 0x33, 0x57, 0xae, 0xc8, 0xbb, 0x70, 0xfb, 0x00, 0xb6, 0xde, 0x52, 0xe2, 0x85, 0x24, 0xda, 0x70, + 0x75, 0x4e, 0xe4, 0x85, 0xde, 0xca, 0x3f, 0x97, 0x60, 0xe3, 0xcd, 0x48, 0xc9, 0x0d, 0xa8, 0x52, + 0xc9, 0xba, 0x23, 0x54, 0x9a, 0x09, 0x9e, 0x0b, 0x01, 0x95, 0xec, 0x38, 0xb3, 0xd8, 0x46, 0x76, + 0xca, 0x78, 0x94, 0xcb, 0xb9, 0xe7, 0xb7, 0x36, 0xb7, 0xe7, 0xb0, 0x22, 0xa9, 0x09, 0xfb, 0xa8, + 0xf3, 0xf6, 0x76, 0xff, 0xc2, 0xe9, 0xf6, 0xed, 0x60, 0xe0, 0x5a, 0x6c, 0x30, 0xd6, 0xd8, 0xfe, + 0x1e, 0x2a, 0x13, 0xab, 0xdd, 0xcf, 0x0d, 0x13, 0xd9, 0xe9, 0xdc, 0xb3, 0xfd, 0xa4, 0x9a, 0xc6, + 0x79, 0xf1, 0x19, 0x25, 0x83, 0xea, 0x1e, 0xfc, 0xcf, 0xda, 0x9f, 0x53, 0x79, 0x64, 0x14, 0xe3, + 0xf1, 0xc4, 0xa1, 0x5e, 0x83, 0xb5, 0x73, 0x44, 0xfd, 0x32, 0x90, 0xd9, 0x31, 0xa0, 0xb5, 0xf3, + 0xea, 0x7a, 0xb6, 0x61, 0xfe, 0x05, 0x3b, 0xf3, 0x71, 0xda, 0x5b, 0x76, 0x03, 0xcd, 0xfd, 0x3f, + 0x03, 0x00, 0x00, 0xff, 0xff, 0xde, 0x40, 0x23, 0x23, 0x3f, 0x0f, 0x00, 0x00, } diff --git a/operator/v1alpha1/component.proto b/operator/v1alpha1/component.proto index b87cb484db..fc5d0bebd9 100644 --- a/operator/v1alpha1/component.proto +++ b/operator/v1alpha1/component.proto @@ -147,6 +147,9 @@ message KubernetesResourcesSpec { // k8s toleration // https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ Toleration tolerations = 14; + // k8s service annotations. + // https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + map service_annotations = 15; // Overlays for k8s resources in rendered manifests. repeated K8sObjectOverlay overlays = 100; diff --git a/operator/v1alpha1/istio.operator.v1alpha1.pb.html b/operator/v1alpha1/istio.operator.v1alpha1.pb.html index d3e12a0791..dd3fdb68c6 100644 --- a/operator/v1alpha1/istio.operator.v1alpha1.pb.html +++ b/operator/v1alpha1/istio.operator.v1alpha1.pb.html @@ -1332,6 +1332,18 @@

KubernetesResourcesSpec

k8s toleration https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/

+ + +No + + + +serviceAnnotations +map<string, string> + +

k8s service annotations. +https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/

+ No diff --git a/proto.lock b/proto.lock index 3b4f7d0433..281757abf2 100644 --- a/proto.lock +++ b/proto.lock @@ -41380,6 +41380,14 @@ "name": "pod_annotations", "type": "string" } + }, + { + "key_type": "string", + "field": { + "id": 15, + "name": "service_annotations", + "type": "string" + } } ] }, diff --git a/python/istio_api/operator/v1alpha1/component_pb2.py b/python/istio_api/operator/v1alpha1/component_pb2.py index b9617d10ce..6fc646c004 100644 --- a/python/istio_api/operator/v1alpha1/component_pb2.py +++ b/python/istio_api/operator/v1alpha1/component_pb2.py @@ -23,7 +23,7 @@ package='istio.operator.v1alpha1', syntax='proto3', serialized_options=_b('Z\036istio.io/api/operator/v1alpha1'), - serialized_pb=_b('\n!operator/v1alpha1/component.proto\x12\x17istio.operator.v1alpha1\x1a\x19google/protobuf/any.proto\x1a.k8s.io/api/autoscaling/v2beta1/generated.proto\x1a\"operator/v1alpha1/kubernetes.proto\"\xd5\x05\n\x15IstioComponentSetSpec\x12\x38\n\x04\x62\x61se\x18\x1d \x01(\x0b\x32*.istio.operator.v1alpha1.BaseComponentSpec\x12\x35\n\x05pilot\x18\x1e \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12\x35\n\x05proxy\x18\x1f \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12@\n\x10sidecar_injector\x18 \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12\x36\n\x06policy\x18! \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12\x39\n\ttelemetry\x18\" \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12\x37\n\x07\x63itadel\x18# \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12:\n\nnode_agent\x18$ \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12\x36\n\x06galley\x18% \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12\x33\n\x03\x63ni\x18& \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12>\n\x10ingress_gateways\x18( \x03(\x0b\x32$.istio.operator.v1alpha1.GatewaySpec\x12=\n\x0f\x65gress_gateways\x18) \x03(\x0b\x32$.istio.operator.v1alpha1.GatewaySpec\"Q\n\x11\x42\x61seComponentSpec\x12<\n\x07\x65nabled\x18\x01 \x01(\x0b\x32+.istio.operator.v1alpha1.TypeBoolValueForPB\"\xef\x01\n\rComponentSpec\x12<\n\x07\x65nabled\x18\x01 \x01(\x0b\x32+.istio.operator.v1alpha1.TypeBoolValueForPB\x12\x11\n\tnamespace\x18\x02 \x01(\t\x12\x0b\n\x03hub\x18\n \x01(\t\x12\x0b\n\x03tag\x18\x0b \x01(\t\x12\x34\n\x04spec\x18\x1e \x01(\x0b\x32&.istio.operator.v1alpha1.TypeInterface\x12=\n\x03k8s\x18\x32 \x01(\x0b\x32\x30.istio.operator.v1alpha1.KubernetesResourcesSpec\"\x97\x02\n\x15\x45xternalComponentSpec\x12<\n\x07\x65nabled\x18\x01 \x01(\x0b\x32+.istio.operator.v1alpha1.TypeBoolValueForPB\x12\x11\n\tnamespace\x18\x02 \x01(\t\x12\x34\n\x04spec\x18\n \x01(\x0b\x32&.istio.operator.v1alpha1.TypeInterface\x12\x12\n\nchart_path\x18\x1e \x01(\t\x12$\n\x06schema\x18# \x01(\x0b\x32\x14.google.protobuf.Any\x12=\n\x03k8s\x18\x32 \x01(\x0b\x32\x30.istio.operator.v1alpha1.KubernetesResourcesSpec\"\xb3\x02\n\x0bGatewaySpec\x12<\n\x07\x65nabled\x18\x01 \x01(\x0b\x32+.istio.operator.v1alpha1.TypeBoolValueForPB\x12\x11\n\tnamespace\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12>\n\x05label\x18\x04 \x03(\x0b\x32/.istio.operator.v1alpha1.GatewaySpec.LabelEntry\x12\x0b\n\x03hub\x18\n \x01(\t\x12\x0b\n\x03tag\x18\x0b \x01(\t\x12=\n\x03k8s\x18\x32 \x01(\x0b\x32\x30.istio.operator.v1alpha1.KubernetesResourcesSpec\x1a,\n\nLabelEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xf7\x07\n\x17KubernetesResourcesSpec\x12\x33\n\x08\x61\x66\x66inity\x18\x01 \x01(\x0b\x32!.istio.operator.v1alpha1.Affinity\x12,\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x1f.istio.operator.v1alpha1.EnvVar\x12M\n\x08hpa_spec\x18\x03 \x01(\x0b\x32;.k8s.io.api.autoscaling.v2beta1.HorizontalPodAutoscalerSpec\x12\x19\n\x11image_pull_policy\x18\x04 \x01(\t\x12Y\n\rnode_selector\x18\x05 \x03(\x0b\x32\x42.istio.operator.v1alpha1.KubernetesResourcesSpec.NodeSelectorEntry\x12O\n\x15pod_disruption_budget\x18\x06 \x01(\x0b\x32\x30.istio.operator.v1alpha1.PodDisruptionBudgetSpec\x12]\n\x0fpod_annotations\x18\x07 \x03(\x0b\x32\x44.istio.operator.v1alpha1.KubernetesResourcesSpec.PodAnnotationsEntry\x12\x1b\n\x13priority_class_name\x18\x08 \x01(\t\x12@\n\x0freadiness_probe\x18\t \x01(\x0b\x32\'.istio.operator.v1alpha1.ReadinessProbe\x12\x15\n\rreplica_count\x18\n \x01(\r\x12\x35\n\tresources\x18\x0b \x01(\x0b\x32\".istio.operator.v1alpha1.Resources\x12\x35\n\x07service\x18\x0c \x01(\x0b\x32$.istio.operator.v1alpha1.ServiceSpec\x12=\n\x08strategy\x18\r \x01(\x0b\x32+.istio.operator.v1alpha1.DeploymentStrategy\x12\x38\n\x0btolerations\x18\x0e \x01(\x0b\x32#.istio.operator.v1alpha1.Toleration\x12;\n\x08overlays\x18\x64 \x03(\x0b\x32).istio.operator.v1alpha1.K8sObjectOverlay\x1a\x33\n\x11NodeSelectorEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x35\n\x13PodAnnotationsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xdb\x01\n\x10K8sObjectOverlay\x12\x13\n\x0b\x61pi_version\x18\x01 \x01(\t\x12\x0c\n\x04kind\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x44\n\x07patches\x18\x04 \x03(\x0b\x32\x33.istio.operator.v1alpha1.K8sObjectOverlay.PathValue\x1aP\n\tPathValue\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.istio.operator.v1alpha1.TypeInterface\"\x18\n\x16TypeMapStringInterface\"\x0f\n\rTypeInterface\"\x14\n\x12TypeBoolValueForPBB Z\x1eistio.io/api/operator/v1alpha1b\x06proto3') + serialized_pb=_b('\n!operator/v1alpha1/component.proto\x12\x17istio.operator.v1alpha1\x1a\x19google/protobuf/any.proto\x1a.k8s.io/api/autoscaling/v2beta1/generated.proto\x1a\"operator/v1alpha1/kubernetes.proto\"\xd5\x05\n\x15IstioComponentSetSpec\x12\x38\n\x04\x62\x61se\x18\x1d \x01(\x0b\x32*.istio.operator.v1alpha1.BaseComponentSpec\x12\x35\n\x05pilot\x18\x1e \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12\x35\n\x05proxy\x18\x1f \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12@\n\x10sidecar_injector\x18 \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12\x36\n\x06policy\x18! \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12\x39\n\ttelemetry\x18\" \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12\x37\n\x07\x63itadel\x18# \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12:\n\nnode_agent\x18$ \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12\x36\n\x06galley\x18% \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12\x33\n\x03\x63ni\x18& \x01(\x0b\x32&.istio.operator.v1alpha1.ComponentSpec\x12>\n\x10ingress_gateways\x18( \x03(\x0b\x32$.istio.operator.v1alpha1.GatewaySpec\x12=\n\x0f\x65gress_gateways\x18) \x03(\x0b\x32$.istio.operator.v1alpha1.GatewaySpec\"Q\n\x11\x42\x61seComponentSpec\x12<\n\x07\x65nabled\x18\x01 \x01(\x0b\x32+.istio.operator.v1alpha1.TypeBoolValueForPB\"\xef\x01\n\rComponentSpec\x12<\n\x07\x65nabled\x18\x01 \x01(\x0b\x32+.istio.operator.v1alpha1.TypeBoolValueForPB\x12\x11\n\tnamespace\x18\x02 \x01(\t\x12\x0b\n\x03hub\x18\n \x01(\t\x12\x0b\n\x03tag\x18\x0b \x01(\t\x12\x34\n\x04spec\x18\x1e \x01(\x0b\x32&.istio.operator.v1alpha1.TypeInterface\x12=\n\x03k8s\x18\x32 \x01(\x0b\x32\x30.istio.operator.v1alpha1.KubernetesResourcesSpec\"\x97\x02\n\x15\x45xternalComponentSpec\x12<\n\x07\x65nabled\x18\x01 \x01(\x0b\x32+.istio.operator.v1alpha1.TypeBoolValueForPB\x12\x11\n\tnamespace\x18\x02 \x01(\t\x12\x34\n\x04spec\x18\n \x01(\x0b\x32&.istio.operator.v1alpha1.TypeInterface\x12\x12\n\nchart_path\x18\x1e \x01(\t\x12$\n\x06schema\x18# \x01(\x0b\x32\x14.google.protobuf.Any\x12=\n\x03k8s\x18\x32 \x01(\x0b\x32\x30.istio.operator.v1alpha1.KubernetesResourcesSpec\"\xb3\x02\n\x0bGatewaySpec\x12<\n\x07\x65nabled\x18\x01 \x01(\x0b\x32+.istio.operator.v1alpha1.TypeBoolValueForPB\x12\x11\n\tnamespace\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12>\n\x05label\x18\x04 \x03(\x0b\x32/.istio.operator.v1alpha1.GatewaySpec.LabelEntry\x12\x0b\n\x03hub\x18\n \x01(\t\x12\x0b\n\x03tag\x18\x0b \x01(\t\x12=\n\x03k8s\x18\x32 \x01(\x0b\x32\x30.istio.operator.v1alpha1.KubernetesResourcesSpec\x1a,\n\nLabelEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\x99\t\n\x17KubernetesResourcesSpec\x12\x33\n\x08\x61\x66\x66inity\x18\x01 \x01(\x0b\x32!.istio.operator.v1alpha1.Affinity\x12,\n\x03\x65nv\x18\x02 \x03(\x0b\x32\x1f.istio.operator.v1alpha1.EnvVar\x12M\n\x08hpa_spec\x18\x03 \x01(\x0b\x32;.k8s.io.api.autoscaling.v2beta1.HorizontalPodAutoscalerSpec\x12\x19\n\x11image_pull_policy\x18\x04 \x01(\t\x12Y\n\rnode_selector\x18\x05 \x03(\x0b\x32\x42.istio.operator.v1alpha1.KubernetesResourcesSpec.NodeSelectorEntry\x12O\n\x15pod_disruption_budget\x18\x06 \x01(\x0b\x32\x30.istio.operator.v1alpha1.PodDisruptionBudgetSpec\x12]\n\x0fpod_annotations\x18\x07 \x03(\x0b\x32\x44.istio.operator.v1alpha1.KubernetesResourcesSpec.PodAnnotationsEntry\x12\x1b\n\x13priority_class_name\x18\x08 \x01(\t\x12@\n\x0freadiness_probe\x18\t \x01(\x0b\x32\'.istio.operator.v1alpha1.ReadinessProbe\x12\x15\n\rreplica_count\x18\n \x01(\r\x12\x35\n\tresources\x18\x0b \x01(\x0b\x32\".istio.operator.v1alpha1.Resources\x12\x35\n\x07service\x18\x0c \x01(\x0b\x32$.istio.operator.v1alpha1.ServiceSpec\x12=\n\x08strategy\x18\r \x01(\x0b\x32+.istio.operator.v1alpha1.DeploymentStrategy\x12\x38\n\x0btolerations\x18\x0e \x01(\x0b\x32#.istio.operator.v1alpha1.Toleration\x12\x65\n\x13service_annotations\x18\x0f \x03(\x0b\x32H.istio.operator.v1alpha1.KubernetesResourcesSpec.ServiceAnnotationsEntry\x12;\n\x08overlays\x18\x64 \x03(\x0b\x32).istio.operator.v1alpha1.K8sObjectOverlay\x1a\x33\n\x11NodeSelectorEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x35\n\x13PodAnnotationsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a\x39\n\x17ServiceAnnotationsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"\xdb\x01\n\x10K8sObjectOverlay\x12\x13\n\x0b\x61pi_version\x18\x01 \x01(\t\x12\x0c\n\x04kind\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x44\n\x07patches\x18\x04 \x03(\x0b\x32\x33.istio.operator.v1alpha1.K8sObjectOverlay.PathValue\x1aP\n\tPathValue\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x35\n\x05value\x18\x02 \x01(\x0b\x32&.istio.operator.v1alpha1.TypeInterface\"\x18\n\x16TypeMapStringInterface\"\x0f\n\rTypeInterface\"\x14\n\x12TypeBoolValueForPBB Z\x1eistio.io/api/operator/v1alpha1b\x06proto3') , dependencies=[google_dot_protobuf_dot_any__pb2.DESCRIPTOR,k8s_dot_io_dot_api_dot_autoscaling_dot_v2beta1_dot_generated__pb2.DESCRIPTOR,operator_dot_v1alpha1_dot_kubernetes__pb2.DESCRIPTOR,]) @@ -444,8 +444,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2728, - serialized_end=2779, + serialized_start=2831, + serialized_end=2882, ) _KUBERNETESRESOURCESSPEC_PODANNOTATIONSENTRY = _descriptor.Descriptor( @@ -481,8 +481,45 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2781, - serialized_end=2834, + serialized_start=2884, + serialized_end=2937, +) + +_KUBERNETESRESOURCESSPEC_SERVICEANNOTATIONSENTRY = _descriptor.Descriptor( + name='ServiceAnnotationsEntry', + full_name='istio.operator.v1alpha1.KubernetesResourcesSpec.ServiceAnnotationsEntry', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='key', full_name='istio.operator.v1alpha1.KubernetesResourcesSpec.ServiceAnnotationsEntry.key', 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, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='value', full_name='istio.operator.v1alpha1.KubernetesResourcesSpec.ServiceAnnotationsEntry.value', index=1, + number=2, 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, + serialized_options=None, file=DESCRIPTOR), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + serialized_options=_b('8\001'), + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=2939, + serialized_end=2996, ) _KUBERNETESRESOURCESSPEC = _descriptor.Descriptor( @@ -591,7 +628,14 @@ is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='overlays', full_name='istio.operator.v1alpha1.KubernetesResourcesSpec.overlays', index=14, + name='service_annotations', full_name='istio.operator.v1alpha1.KubernetesResourcesSpec.service_annotations', index=14, + number=15, 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, + serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='overlays', full_name='istio.operator.v1alpha1.KubernetesResourcesSpec.overlays', index=15, number=100, type=11, cpp_type=10, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -600,7 +644,7 @@ ], extensions=[ ], - nested_types=[_KUBERNETESRESOURCESSPEC_NODESELECTORENTRY, _KUBERNETESRESOURCESSPEC_PODANNOTATIONSENTRY, ], + nested_types=[_KUBERNETESRESOURCESSPEC_NODESELECTORENTRY, _KUBERNETESRESOURCESSPEC_PODANNOTATIONSENTRY, _KUBERNETESRESOURCESSPEC_SERVICEANNOTATIONSENTRY, ], enum_types=[ ], serialized_options=None, @@ -610,7 +654,7 @@ oneofs=[ ], serialized_start=1819, - serialized_end=2834, + serialized_end=2996, ) @@ -647,8 +691,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2976, - serialized_end=3056, + serialized_start=3138, + serialized_end=3218, ) _K8SOBJECTOVERLAY = _descriptor.Descriptor( @@ -698,8 +742,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=2837, - serialized_end=3056, + serialized_start=2999, + serialized_end=3218, ) @@ -722,8 +766,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3058, - serialized_end=3082, + serialized_start=3220, + serialized_end=3244, ) @@ -746,8 +790,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3084, - serialized_end=3099, + serialized_start=3246, + serialized_end=3261, ) @@ -770,8 +814,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=3101, - serialized_end=3121, + serialized_start=3263, + serialized_end=3283, ) _ISTIOCOMPONENTSETSPEC.fields_by_name['base'].message_type = _BASECOMPONENTSPEC @@ -800,6 +844,7 @@ _GATEWAYSPEC.fields_by_name['k8s'].message_type = _KUBERNETESRESOURCESSPEC _KUBERNETESRESOURCESSPEC_NODESELECTORENTRY.containing_type = _KUBERNETESRESOURCESSPEC _KUBERNETESRESOURCESSPEC_PODANNOTATIONSENTRY.containing_type = _KUBERNETESRESOURCESSPEC +_KUBERNETESRESOURCESSPEC_SERVICEANNOTATIONSENTRY.containing_type = _KUBERNETESRESOURCESSPEC _KUBERNETESRESOURCESSPEC.fields_by_name['affinity'].message_type = operator_dot_v1alpha1_dot_kubernetes__pb2._AFFINITY _KUBERNETESRESOURCESSPEC.fields_by_name['env'].message_type = operator_dot_v1alpha1_dot_kubernetes__pb2._ENVVAR _KUBERNETESRESOURCESSPEC.fields_by_name['hpa_spec'].message_type = k8s_dot_io_dot_api_dot_autoscaling_dot_v2beta1_dot_generated__pb2._HORIZONTALPODAUTOSCALERSPEC @@ -811,6 +856,7 @@ _KUBERNETESRESOURCESSPEC.fields_by_name['service'].message_type = operator_dot_v1alpha1_dot_kubernetes__pb2._SERVICESPEC _KUBERNETESRESOURCESSPEC.fields_by_name['strategy'].message_type = operator_dot_v1alpha1_dot_kubernetes__pb2._DEPLOYMENTSTRATEGY _KUBERNETESRESOURCESSPEC.fields_by_name['tolerations'].message_type = operator_dot_v1alpha1_dot_kubernetes__pb2._TOLERATION +_KUBERNETESRESOURCESSPEC.fields_by_name['service_annotations'].message_type = _KUBERNETESRESOURCESSPEC_SERVICEANNOTATIONSENTRY _KUBERNETESRESOURCESSPEC.fields_by_name['overlays'].message_type = _K8SOBJECTOVERLAY _K8SOBJECTOVERLAY_PATHVALUE.fields_by_name['value'].message_type = _TYPEINTERFACE _K8SOBJECTOVERLAY_PATHVALUE.containing_type = _K8SOBJECTOVERLAY @@ -885,6 +931,13 @@ # @@protoc_insertion_point(class_scope:istio.operator.v1alpha1.KubernetesResourcesSpec.PodAnnotationsEntry) }) , + + 'ServiceAnnotationsEntry' : _reflection.GeneratedProtocolMessageType('ServiceAnnotationsEntry', (_message.Message,), { + 'DESCRIPTOR' : _KUBERNETESRESOURCESSPEC_SERVICEANNOTATIONSENTRY, + '__module__' : 'operator.v1alpha1.component_pb2' + # @@protoc_insertion_point(class_scope:istio.operator.v1alpha1.KubernetesResourcesSpec.ServiceAnnotationsEntry) + }) + , 'DESCRIPTOR' : _KUBERNETESRESOURCESSPEC, '__module__' : 'operator.v1alpha1.component_pb2' # @@protoc_insertion_point(class_scope:istio.operator.v1alpha1.KubernetesResourcesSpec) @@ -892,6 +945,7 @@ _sym_db.RegisterMessage(KubernetesResourcesSpec) _sym_db.RegisterMessage(KubernetesResourcesSpec.NodeSelectorEntry) _sym_db.RegisterMessage(KubernetesResourcesSpec.PodAnnotationsEntry) +_sym_db.RegisterMessage(KubernetesResourcesSpec.ServiceAnnotationsEntry) K8sObjectOverlay = _reflection.GeneratedProtocolMessageType('K8sObjectOverlay', (_message.Message,), { @@ -934,4 +988,5 @@ _GATEWAYSPEC_LABELENTRY._options = None _KUBERNETESRESOURCESSPEC_NODESELECTORENTRY._options = None _KUBERNETESRESOURCESSPEC_PODANNOTATIONSENTRY._options = None +_KUBERNETESRESOURCESSPEC_SERVICEANNOTATIONSENTRY._options = None # @@protoc_insertion_point(module_scope)