diff --git a/flyteidl/gen/pb-cpp/flyteidl/plugins/sidecar.pb.cc b/flyteidl/gen/pb-cpp/flyteidl/plugins/sidecar.pb.cc index 55119fb6f1a..1f33c24d42e 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/plugins/sidecar.pb.cc +++ b/flyteidl/gen/pb-cpp/flyteidl/plugins/sidecar.pb.cc @@ -16,15 +16,51 @@ // @@protoc_insertion_point(includes) #include +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fsidecar_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_SidecarJob_AnnotationsEntry_DoNotUse_flyteidl_2fplugins_2fsidecar_2eproto; +extern PROTOBUF_INTERNAL_EXPORT_flyteidl_2fplugins_2fsidecar_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_SidecarJob_LabelsEntry_DoNotUse_flyteidl_2fplugins_2fsidecar_2eproto; extern PROTOBUF_INTERNAL_EXPORT_k8s_2eio_2fapi_2fcore_2fv1_2fgenerated_2eproto ::google::protobuf::internal::SCCInfo<10> scc_info_PodSpec_k8s_2eio_2fapi_2fcore_2fv1_2fgenerated_2eproto; namespace flyteidl { namespace plugins { +class SidecarJob_AnnotationsEntry_DoNotUseDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _SidecarJob_AnnotationsEntry_DoNotUse_default_instance_; +class SidecarJob_LabelsEntry_DoNotUseDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed _instance; +} _SidecarJob_LabelsEntry_DoNotUse_default_instance_; class SidecarJobDefaultTypeInternal { public: ::google::protobuf::internal::ExplicitlyConstructed _instance; } _SidecarJob_default_instance_; } // namespace plugins } // namespace flyteidl +static void InitDefaultsSidecarJob_AnnotationsEntry_DoNotUse_flyteidl_2fplugins_2fsidecar_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::plugins::_SidecarJob_AnnotationsEntry_DoNotUse_default_instance_; + new (ptr) ::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse(); + } + ::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<0> scc_info_SidecarJob_AnnotationsEntry_DoNotUse_flyteidl_2fplugins_2fsidecar_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsSidecarJob_AnnotationsEntry_DoNotUse_flyteidl_2fplugins_2fsidecar_2eproto}, {}}; + +static void InitDefaultsSidecarJob_LabelsEntry_DoNotUse_flyteidl_2fplugins_2fsidecar_2eproto() { + GOOGLE_PROTOBUF_VERIFY_VERSION; + + { + void* ptr = &::flyteidl::plugins::_SidecarJob_LabelsEntry_DoNotUse_default_instance_; + new (ptr) ::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse(); + } + ::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse::InitAsDefaultInstance(); +} + +::google::protobuf::internal::SCCInfo<0> scc_info_SidecarJob_LabelsEntry_DoNotUse_flyteidl_2fplugins_2fsidecar_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsSidecarJob_LabelsEntry_DoNotUse_flyteidl_2fplugins_2fsidecar_2eproto}, {}}; + static void InitDefaultsSidecarJob_flyteidl_2fplugins_2fsidecar_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; @@ -36,19 +72,41 @@ static void InitDefaultsSidecarJob_flyteidl_2fplugins_2fsidecar_2eproto() { ::flyteidl::plugins::SidecarJob::InitAsDefaultInstance(); } -::google::protobuf::internal::SCCInfo<1> scc_info_SidecarJob_flyteidl_2fplugins_2fsidecar_2eproto = - {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsSidecarJob_flyteidl_2fplugins_2fsidecar_2eproto}, { - &scc_info_PodSpec_k8s_2eio_2fapi_2fcore_2fv1_2fgenerated_2eproto.base,}}; +::google::protobuf::internal::SCCInfo<3> scc_info_SidecarJob_flyteidl_2fplugins_2fsidecar_2eproto = + {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsSidecarJob_flyteidl_2fplugins_2fsidecar_2eproto}, { + &scc_info_PodSpec_k8s_2eio_2fapi_2fcore_2fv1_2fgenerated_2eproto.base, + &scc_info_SidecarJob_AnnotationsEntry_DoNotUse_flyteidl_2fplugins_2fsidecar_2eproto.base, + &scc_info_SidecarJob_LabelsEntry_DoNotUse_flyteidl_2fplugins_2fsidecar_2eproto.base,}}; void InitDefaults_flyteidl_2fplugins_2fsidecar_2eproto() { + ::google::protobuf::internal::InitSCC(&scc_info_SidecarJob_AnnotationsEntry_DoNotUse_flyteidl_2fplugins_2fsidecar_2eproto.base); + ::google::protobuf::internal::InitSCC(&scc_info_SidecarJob_LabelsEntry_DoNotUse_flyteidl_2fplugins_2fsidecar_2eproto.base); ::google::protobuf::internal::InitSCC(&scc_info_SidecarJob_flyteidl_2fplugins_2fsidecar_2eproto.base); } -::google::protobuf::Metadata file_level_metadata_flyteidl_2fplugins_2fsidecar_2eproto[1]; +::google::protobuf::Metadata file_level_metadata_flyteidl_2fplugins_2fsidecar_2eproto[3]; constexpr ::google::protobuf::EnumDescriptor const** file_level_enum_descriptors_flyteidl_2fplugins_2fsidecar_2eproto = nullptr; constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_flyteidl_2fplugins_2fsidecar_2eproto = nullptr; const ::google::protobuf::uint32 TableStruct_flyteidl_2fplugins_2fsidecar_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse, _has_bits_), + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse, key_), + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse, value_), + 0, + 1, + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse, _has_bits_), + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse, _internal_metadata_), + ~0u, // no _extensions_ + ~0u, // no _oneof_case_ + ~0u, // no _weak_field_map_ + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse, key_), + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse, value_), + 0, + 1, ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob, _internal_metadata_), ~0u, // no _extensions_ @@ -56,34 +114,45 @@ const ::google::protobuf::uint32 TableStruct_flyteidl_2fplugins_2fsidecar_2eprot ~0u, // no _weak_field_map_ PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob, pod_spec_), PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob, primary_container_name_), + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob, annotations_), + PROTOBUF_FIELD_OFFSET(::flyteidl::plugins::SidecarJob, labels_), }; static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = { - { 0, -1, sizeof(::flyteidl::plugins::SidecarJob)}, + { 0, 7, sizeof(::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse)}, + { 9, 16, sizeof(::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse)}, + { 18, -1, sizeof(::flyteidl::plugins::SidecarJob)}, }; static ::google::protobuf::Message const * const file_default_instances[] = { + reinterpret_cast(&::flyteidl::plugins::_SidecarJob_AnnotationsEntry_DoNotUse_default_instance_), + reinterpret_cast(&::flyteidl::plugins::_SidecarJob_LabelsEntry_DoNotUse_default_instance_), reinterpret_cast(&::flyteidl::plugins::_SidecarJob_default_instance_), }; ::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_flyteidl_2fplugins_2fsidecar_2eproto = { {}, AddDescriptors_flyteidl_2fplugins_2fsidecar_2eproto, "flyteidl/plugins/sidecar.proto", schemas, file_default_instances, TableStruct_flyteidl_2fplugins_2fsidecar_2eproto::offsets, - file_level_metadata_flyteidl_2fplugins_2fsidecar_2eproto, 1, file_level_enum_descriptors_flyteidl_2fplugins_2fsidecar_2eproto, file_level_service_descriptors_flyteidl_2fplugins_2fsidecar_2eproto, + file_level_metadata_flyteidl_2fplugins_2fsidecar_2eproto, 3, file_level_enum_descriptors_flyteidl_2fplugins_2fsidecar_2eproto, file_level_service_descriptors_flyteidl_2fplugins_2fsidecar_2eproto, }; const char descriptor_table_protodef_flyteidl_2fplugins_2fsidecar_2eproto[] = "\n\036flyteidl/plugins/sidecar.proto\022\020flytei" "dl.plugins\032\"k8s.io/api/core/v1/generated" - ".proto\"[\n\nSidecarJob\022-\n\010pod_spec\030\001 \001(\0132\033" - ".k8s.io.api.core.v1.PodSpec\022\036\n\026primary_c" - "ontainer_name\030\002 \001(\tB9Z7github.com/flyteo" - "rg/flyteidl/gen/pb-go/flyteidl/pluginsb\006" - "proto3" + ".proto\"\274\002\n\nSidecarJob\022-\n\010pod_spec\030\001 \001(\0132" + "\033.k8s.io.api.core.v1.PodSpec\022\036\n\026primary_" + "container_name\030\002 \001(\t\022B\n\013annotations\030\003 \003(" + "\0132-.flyteidl.plugins.SidecarJob.Annotati" + "onsEntry\0228\n\006labels\030\004 \003(\0132(.flyteidl.plug" + "ins.SidecarJob.LabelsEntry\0322\n\020Annotation" + "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032-" + "\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(" + "\t:\0028\001B9Z7github.com/flyteorg/flyteidl/ge" + "n/pb-go/flyteidl/pluginsb\006proto3" ; ::google::protobuf::internal::DescriptorTable descriptor_table_flyteidl_2fplugins_2fsidecar_2eproto = { false, InitDefaults_flyteidl_2fplugins_2fsidecar_2eproto, descriptor_table_protodef_flyteidl_2fplugins_2fsidecar_2eproto, - "flyteidl/plugins/sidecar.proto", &assign_descriptors_table_flyteidl_2fplugins_2fsidecar_2eproto, 246, + "flyteidl/plugins/sidecar.proto", &assign_descriptors_table_flyteidl_2fplugins_2fsidecar_2eproto, 472, }; void AddDescriptors_flyteidl_2fplugins_2fsidecar_2eproto() { @@ -99,6 +168,88 @@ static bool dynamic_init_dummy_flyteidl_2fplugins_2fsidecar_2eproto = []() { Add namespace flyteidl { namespace plugins { +// =================================================================== + +SidecarJob_AnnotationsEntry_DoNotUse::SidecarJob_AnnotationsEntry_DoNotUse() {} +SidecarJob_AnnotationsEntry_DoNotUse::SidecarJob_AnnotationsEntry_DoNotUse(::google::protobuf::Arena* arena) + : SuperType(arena) {} +void SidecarJob_AnnotationsEntry_DoNotUse::MergeFrom(const SidecarJob_AnnotationsEntry_DoNotUse& other) { + MergeFromInternal(other); +} +::google::protobuf::Metadata SidecarJob_AnnotationsEntry_DoNotUse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fplugins_2fsidecar_2eproto); + return ::file_level_metadata_flyteidl_2fplugins_2fsidecar_2eproto[0]; +} +void SidecarJob_AnnotationsEntry_DoNotUse::MergeFrom( + const ::google::protobuf::Message& other) { + ::google::protobuf::Message::MergeFrom(other); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool SidecarJob_AnnotationsEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { + using MF = ::google::protobuf::internal::MapField< + SidecarJob_AnnotationsEntry_DoNotUse, EntryKeyType, EntryValueType, + kEntryKeyFieldType, kEntryValueFieldType, + kEntryDefaultEnumValue>; + auto mf = static_cast(object); + Parser> parser(mf); +#define DO_(x) if (!(x)) return false + DO_(parser.ParseMap(begin, end)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.plugins.SidecarJob.AnnotationsEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.plugins.SidecarJob.AnnotationsEntry.value")); +#undef DO_ + return true; +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + + +// =================================================================== + +SidecarJob_LabelsEntry_DoNotUse::SidecarJob_LabelsEntry_DoNotUse() {} +SidecarJob_LabelsEntry_DoNotUse::SidecarJob_LabelsEntry_DoNotUse(::google::protobuf::Arena* arena) + : SuperType(arena) {} +void SidecarJob_LabelsEntry_DoNotUse::MergeFrom(const SidecarJob_LabelsEntry_DoNotUse& other) { + MergeFromInternal(other); +} +::google::protobuf::Metadata SidecarJob_LabelsEntry_DoNotUse::GetMetadata() const { + ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_flyteidl_2fplugins_2fsidecar_2eproto); + return ::file_level_metadata_flyteidl_2fplugins_2fsidecar_2eproto[1]; +} +void SidecarJob_LabelsEntry_DoNotUse::MergeFrom( + const ::google::protobuf::Message& other) { + ::google::protobuf::Message::MergeFrom(other); +} + +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +bool SidecarJob_LabelsEntry_DoNotUse::_ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx) { + using MF = ::google::protobuf::internal::MapField< + SidecarJob_LabelsEntry_DoNotUse, EntryKeyType, EntryValueType, + kEntryKeyFieldType, kEntryValueFieldType, + kEntryDefaultEnumValue>; + auto mf = static_cast(object); + Parser> parser(mf); +#define DO_(x) if (!(x)) return false + DO_(parser.ParseMap(begin, end)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.plugins.SidecarJob.LabelsEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.plugins.SidecarJob.LabelsEntry.value")); +#undef DO_ + return true; +} +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + + // =================================================================== void SidecarJob::InitAsDefaultInstance() { @@ -123,6 +274,8 @@ void SidecarJob::clear_pod_spec() { #if !defined(_MSC_VER) || _MSC_VER >= 1900 const int SidecarJob::kPodSpecFieldNumber; const int SidecarJob::kPrimaryContainerNameFieldNumber; +const int SidecarJob::kAnnotationsFieldNumber; +const int SidecarJob::kLabelsFieldNumber; #endif // !defined(_MSC_VER) || _MSC_VER >= 1900 SidecarJob::SidecarJob() @@ -134,6 +287,8 @@ SidecarJob::SidecarJob(const SidecarJob& from) : ::google::protobuf::Message(), _internal_metadata_(nullptr) { _internal_metadata_.MergeFrom(from._internal_metadata_); + annotations_.MergeFrom(from.annotations_); + labels_.MergeFrom(from.labels_); primary_container_name_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (from.primary_container_name().size() > 0) { primary_container_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.primary_container_name_); @@ -178,6 +333,8 @@ void SidecarJob::Clear() { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + annotations_.Clear(); + labels_.Clear(); primary_container_name_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); if (GetArenaNoVirtual() == nullptr && pod_spec_ != nullptr) { delete pod_spec_; @@ -228,6 +385,44 @@ const char* SidecarJob::_InternalParse(const char* begin, const char* end, void* ptr += size; break; } + // map annotations = 3; + case 3: { + if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; + auto parse_map = ::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse::_ParseMap; + ctx->extra_parse_data().payload.clear(); + ctx->extra_parse_data().parse_map = parse_map; + object = &msg->annotations_; + if (size > end - ptr) goto len_delim_till_end; + auto newend = ptr + size; + GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); + ptr = newend; + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 26 && (ptr += 1)); + break; + } + // map labels = 4; + case 4: { + if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual; + do { + ptr = ::google::protobuf::io::ReadSize(ptr, &size); + GOOGLE_PROTOBUF_PARSER_ASSERT(ptr); + parser_till_end = ::google::protobuf::internal::SlowMapEntryParser; + auto parse_map = ::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse::_ParseMap; + ctx->extra_parse_data().payload.clear(); + ctx->extra_parse_data().parse_map = parse_map; + object = &msg->labels_; + if (size > end - ptr) goto len_delim_till_end; + auto newend = ptr + size; + GOOGLE_PROTOBUF_PARSER_ASSERT(parse_map(ptr, newend, object, ctx)); + ptr = newend; + if (ptr >= end) break; + } while ((::google::protobuf::io::UnalignedLoad<::google::protobuf::uint64>(ptr) & 255) == 34 && (ptr += 1)); + break; + } default: { handle_unusual: if ((tag & 7) == 4 || tag == 0) { @@ -288,6 +483,58 @@ bool SidecarJob::MergePartialFromCodedStream( break; } + // map annotations = 3; + case 3: { + if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) { + SidecarJob_AnnotationsEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< + SidecarJob_AnnotationsEntry_DoNotUse, + ::std::string, ::std::string, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + 0 >, + ::google::protobuf::Map< ::std::string, ::std::string > > parser(&annotations_); + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, &parser)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.plugins.SidecarJob.AnnotationsEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.plugins.SidecarJob.AnnotationsEntry.value")); + } else { + goto handle_unusual; + } + break; + } + + // map labels = 4; + case 4: { + if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) { + SidecarJob_LabelsEntry_DoNotUse::Parser< ::google::protobuf::internal::MapField< + SidecarJob_LabelsEntry_DoNotUse, + ::std::string, ::std::string, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + 0 >, + ::google::protobuf::Map< ::std::string, ::std::string > > parser(&labels_); + DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual( + input, &parser)); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.key().data(), static_cast(parser.key().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.plugins.SidecarJob.LabelsEntry.key")); + DO_(::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + parser.value().data(), static_cast(parser.value().length()), + ::google::protobuf::internal::WireFormatLite::PARSE, + "flyteidl.plugins.SidecarJob.LabelsEntry.value")); + } else { + goto handle_unusual; + } + break; + } + default: { handle_unusual: if (tag == 0) { @@ -331,6 +578,104 @@ void SidecarJob::SerializeWithCachedSizes( 2, this->primary_container_name(), output); } + // map annotations = 3; + if (!this->annotations().empty()) { + typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer + ConstPtr; + typedef ConstPtr SortItem; + typedef ::google::protobuf::internal::CompareByDerefFirst Less; + struct Utf8Check { + static void Check(ConstPtr p) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->first.data(), static_cast(p->first.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.plugins.SidecarJob.AnnotationsEntry.key"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->second.data(), static_cast(p->second.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.plugins.SidecarJob.AnnotationsEntry.value"); + } + }; + + if (output->IsSerializationDeterministic() && + this->annotations().size() > 1) { + ::std::unique_ptr items( + new SortItem[this->annotations().size()]); + typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; + size_type n = 0; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->annotations().begin(); + it != this->annotations().end(); ++it, ++n) { + items[static_cast(n)] = SortItem(&*it); + } + ::std::sort(&items[0], &items[static_cast(n)], Less()); + ::std::unique_ptr entry; + for (size_type i = 0; i < n; i++) { + entry.reset(annotations_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(3, *entry, output); + Utf8Check::Check(&(*items[static_cast(i)])); + } + } else { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->annotations().begin(); + it != this->annotations().end(); ++it) { + entry.reset(annotations_.NewEntryWrapper(it->first, it->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(3, *entry, output); + Utf8Check::Check(&(*it)); + } + } + } + + // map labels = 4; + if (!this->labels().empty()) { + typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer + ConstPtr; + typedef ConstPtr SortItem; + typedef ::google::protobuf::internal::CompareByDerefFirst Less; + struct Utf8Check { + static void Check(ConstPtr p) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->first.data(), static_cast(p->first.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.plugins.SidecarJob.LabelsEntry.key"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->second.data(), static_cast(p->second.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.plugins.SidecarJob.LabelsEntry.value"); + } + }; + + if (output->IsSerializationDeterministic() && + this->labels().size() > 1) { + ::std::unique_ptr items( + new SortItem[this->labels().size()]); + typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; + size_type n = 0; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->labels().begin(); + it != this->labels().end(); ++it, ++n) { + items[static_cast(n)] = SortItem(&*it); + } + ::std::sort(&items[0], &items[static_cast(n)], Less()); + ::std::unique_ptr entry; + for (size_type i = 0; i < n; i++) { + entry.reset(labels_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(4, *entry, output); + Utf8Check::Check(&(*items[static_cast(i)])); + } + } else { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->labels().begin(); + it != this->labels().end(); ++it) { + entry.reset(labels_.NewEntryWrapper(it->first, it->second)); + ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(4, *entry, output); + Utf8Check::Check(&(*it)); + } + } + } + if (_internal_metadata_.have_unknown_fields()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( _internal_metadata_.unknown_fields(), output); @@ -362,6 +707,104 @@ ::google::protobuf::uint8* SidecarJob::InternalSerializeWithCachedSizesToArray( 2, this->primary_container_name(), target); } + // map annotations = 3; + if (!this->annotations().empty()) { + typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer + ConstPtr; + typedef ConstPtr SortItem; + typedef ::google::protobuf::internal::CompareByDerefFirst Less; + struct Utf8Check { + static void Check(ConstPtr p) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->first.data(), static_cast(p->first.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.plugins.SidecarJob.AnnotationsEntry.key"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->second.data(), static_cast(p->second.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.plugins.SidecarJob.AnnotationsEntry.value"); + } + }; + + if (false && + this->annotations().size() > 1) { + ::std::unique_ptr items( + new SortItem[this->annotations().size()]); + typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; + size_type n = 0; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->annotations().begin(); + it != this->annotations().end(); ++it, ++n) { + items[static_cast(n)] = SortItem(&*it); + } + ::std::sort(&items[0], &items[static_cast(n)], Less()); + ::std::unique_ptr entry; + for (size_type i = 0; i < n; i++) { + entry.reset(annotations_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(3, *entry, target); + Utf8Check::Check(&(*items[static_cast(i)])); + } + } else { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->annotations().begin(); + it != this->annotations().end(); ++it) { + entry.reset(annotations_.NewEntryWrapper(it->first, it->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(3, *entry, target); + Utf8Check::Check(&(*it)); + } + } + } + + // map labels = 4; + if (!this->labels().empty()) { + typedef ::google::protobuf::Map< ::std::string, ::std::string >::const_pointer + ConstPtr; + typedef ConstPtr SortItem; + typedef ::google::protobuf::internal::CompareByDerefFirst Less; + struct Utf8Check { + static void Check(ConstPtr p) { + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->first.data(), static_cast(p->first.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.plugins.SidecarJob.LabelsEntry.key"); + ::google::protobuf::internal::WireFormatLite::VerifyUtf8String( + p->second.data(), static_cast(p->second.length()), + ::google::protobuf::internal::WireFormatLite::SERIALIZE, + "flyteidl.plugins.SidecarJob.LabelsEntry.value"); + } + }; + + if (false && + this->labels().size() > 1) { + ::std::unique_ptr items( + new SortItem[this->labels().size()]); + typedef ::google::protobuf::Map< ::std::string, ::std::string >::size_type size_type; + size_type n = 0; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->labels().begin(); + it != this->labels().end(); ++it, ++n) { + items[static_cast(n)] = SortItem(&*it); + } + ::std::sort(&items[0], &items[static_cast(n)], Less()); + ::std::unique_ptr entry; + for (size_type i = 0; i < n; i++) { + entry.reset(labels_.NewEntryWrapper(items[static_cast(i)]->first, items[static_cast(i)]->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(4, *entry, target); + Utf8Check::Check(&(*items[static_cast(i)])); + } + } else { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->labels().begin(); + it != this->labels().end(); ++it) { + entry.reset(labels_.NewEntryWrapper(it->first, it->second)); + target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessageNoVirtualToArray(4, *entry, target); + Utf8Check::Check(&(*it)); + } + } + } + if (_internal_metadata_.have_unknown_fields()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields(), target); @@ -383,6 +826,34 @@ size_t SidecarJob::ByteSizeLong() const { // Prevent compiler warnings about cached_has_bits being unused (void) cached_has_bits; + // map annotations = 3; + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->annotations_size()); + { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->annotations().begin(); + it != this->annotations().end(); ++it) { + entry.reset(annotations_.NewEntryWrapper(it->first, it->second)); + total_size += ::google::protobuf::internal::WireFormatLite:: + MessageSizeNoVirtual(*entry); + } + } + + // map labels = 4; + total_size += 1 * + ::google::protobuf::internal::FromIntSize(this->labels_size()); + { + ::std::unique_ptr entry; + for (::google::protobuf::Map< ::std::string, ::std::string >::const_iterator + it = this->labels().begin(); + it != this->labels().end(); ++it) { + entry.reset(labels_.NewEntryWrapper(it->first, it->second)); + total_size += ::google::protobuf::internal::WireFormatLite:: + MessageSizeNoVirtual(*entry); + } + } + // string primary_container_name = 2; if (this->primary_container_name().size() > 0) { total_size += 1 + @@ -424,6 +895,8 @@ void SidecarJob::MergeFrom(const SidecarJob& from) { ::google::protobuf::uint32 cached_has_bits = 0; (void) cached_has_bits; + annotations_.MergeFrom(from.annotations_); + labels_.MergeFrom(from.labels_); if (from.primary_container_name().size() > 0) { primary_container_name_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.primary_container_name_); @@ -458,6 +931,8 @@ void SidecarJob::Swap(SidecarJob* other) { void SidecarJob::InternalSwap(SidecarJob* other) { using std::swap; _internal_metadata_.Swap(&other->_internal_metadata_); + annotations_.Swap(&other->annotations_); + labels_.Swap(&other->labels_); primary_container_name_.Swap(&other->primary_container_name_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(), GetArenaNoVirtual()); swap(pod_spec_, other->pod_spec_); @@ -474,6 +949,12 @@ ::google::protobuf::Metadata SidecarJob::GetMetadata() const { } // namespace flyteidl namespace google { namespace protobuf { +template<> PROTOBUF_NOINLINE ::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse >(arena); +} +template<> PROTOBUF_NOINLINE ::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse* Arena::CreateMaybeMessage< ::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse >(Arena* arena) { + return Arena::CreateInternal< ::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse >(arena); +} template<> PROTOBUF_NOINLINE ::flyteidl::plugins::SidecarJob* Arena::CreateMaybeMessage< ::flyteidl::plugins::SidecarJob >(Arena* arena) { return Arena::CreateInternal< ::flyteidl::plugins::SidecarJob >(arena); } diff --git a/flyteidl/gen/pb-cpp/flyteidl/plugins/sidecar.pb.h b/flyteidl/gen/pb-cpp/flyteidl/plugins/sidecar.pb.h index e1230d701d3..582e48e76fd 100644 --- a/flyteidl/gen/pb-cpp/flyteidl/plugins/sidecar.pb.h +++ b/flyteidl/gen/pb-cpp/flyteidl/plugins/sidecar.pb.h @@ -30,6 +30,9 @@ #include #include // IWYU pragma: export #include // IWYU pragma: export +#include // IWYU pragma: export +#include +#include #include #include "k8s.io/api/core/v1/generated.pb.h" // @@protoc_insertion_point(includes) @@ -42,7 +45,7 @@ struct TableStruct_flyteidl_2fplugins_2fsidecar_2eproto { PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::AuxillaryParseTableField aux[] PROTOBUF_SECTION_VARIABLE(protodesc_cold); - static const ::google::protobuf::internal::ParseTable schema[1] + static const ::google::protobuf::internal::ParseTable schema[3] PROTOBUF_SECTION_VARIABLE(protodesc_cold); static const ::google::protobuf::internal::FieldMetadata field_metadata[]; static const ::google::protobuf::internal::SerializationTable serialization_table[]; @@ -54,11 +57,19 @@ namespace plugins { class SidecarJob; class SidecarJobDefaultTypeInternal; extern SidecarJobDefaultTypeInternal _SidecarJob_default_instance_; +class SidecarJob_AnnotationsEntry_DoNotUse; +class SidecarJob_AnnotationsEntry_DoNotUseDefaultTypeInternal; +extern SidecarJob_AnnotationsEntry_DoNotUseDefaultTypeInternal _SidecarJob_AnnotationsEntry_DoNotUse_default_instance_; +class SidecarJob_LabelsEntry_DoNotUse; +class SidecarJob_LabelsEntry_DoNotUseDefaultTypeInternal; +extern SidecarJob_LabelsEntry_DoNotUseDefaultTypeInternal _SidecarJob_LabelsEntry_DoNotUse_default_instance_; } // namespace plugins } // namespace flyteidl namespace google { namespace protobuf { template<> ::flyteidl::plugins::SidecarJob* Arena::CreateMaybeMessage<::flyteidl::plugins::SidecarJob>(Arena*); +template<> ::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::plugins::SidecarJob_AnnotationsEntry_DoNotUse>(Arena*); +template<> ::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse* Arena::CreateMaybeMessage<::flyteidl::plugins::SidecarJob_LabelsEntry_DoNotUse>(Arena*); } // namespace protobuf } // namespace google namespace flyteidl { @@ -66,6 +77,54 @@ namespace plugins { // =================================================================== +class SidecarJob_AnnotationsEntry_DoNotUse : public ::google::protobuf::internal::MapEntry { +public: +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +static bool _ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + typedef ::google::protobuf::internal::MapEntry SuperType; + SidecarJob_AnnotationsEntry_DoNotUse(); + SidecarJob_AnnotationsEntry_DoNotUse(::google::protobuf::Arena* arena); + void MergeFrom(const SidecarJob_AnnotationsEntry_DoNotUse& other); + static const SidecarJob_AnnotationsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_SidecarJob_AnnotationsEntry_DoNotUse_default_instance_); } + void MergeFrom(const ::google::protobuf::Message& other) final; + ::google::protobuf::Metadata GetMetadata() const; +}; + +// ------------------------------------------------------------------- + +class SidecarJob_LabelsEntry_DoNotUse : public ::google::protobuf::internal::MapEntry { +public: +#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER +static bool _ParseMap(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx); +#endif // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER + typedef ::google::protobuf::internal::MapEntry SuperType; + SidecarJob_LabelsEntry_DoNotUse(); + SidecarJob_LabelsEntry_DoNotUse(::google::protobuf::Arena* arena); + void MergeFrom(const SidecarJob_LabelsEntry_DoNotUse& other); + static const SidecarJob_LabelsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast(&_SidecarJob_LabelsEntry_DoNotUse_default_instance_); } + void MergeFrom(const ::google::protobuf::Message& other) final; + ::google::protobuf::Metadata GetMetadata() const; +}; + +// ------------------------------------------------------------------- + class SidecarJob final : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:flyteidl.plugins.SidecarJob) */ { public: @@ -104,7 +163,7 @@ class SidecarJob final : &_SidecarJob_default_instance_); } static constexpr int kIndexInFileMessages = - 0; + 2; void Swap(SidecarJob* other); friend void swap(SidecarJob& a, SidecarJob& b) { @@ -159,8 +218,27 @@ class SidecarJob final : // nested types ---------------------------------------------------- + // accessors ------------------------------------------------------- + // map annotations = 3; + int annotations_size() const; + void clear_annotations(); + static const int kAnnotationsFieldNumber = 3; + const ::google::protobuf::Map< ::std::string, ::std::string >& + annotations() const; + ::google::protobuf::Map< ::std::string, ::std::string >* + mutable_annotations(); + + // map labels = 4; + int labels_size() const; + void clear_labels(); + static const int kLabelsFieldNumber = 4; + const ::google::protobuf::Map< ::std::string, ::std::string >& + labels() const; + ::google::protobuf::Map< ::std::string, ::std::string >* + mutable_labels(); + // string primary_container_name = 2; void clear_primary_container_name(); static const int kPrimaryContainerNameFieldNumber = 2; @@ -189,6 +267,18 @@ class SidecarJob final : class HasBitSetters; ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; + ::google::protobuf::internal::MapField< + SidecarJob_AnnotationsEntry_DoNotUse, + ::std::string, ::std::string, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + 0 > annotations_; + ::google::protobuf::internal::MapField< + SidecarJob_LabelsEntry_DoNotUse, + ::std::string, ::std::string, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + ::google::protobuf::internal::WireFormatLite::TYPE_STRING, + 0 > labels_; ::google::protobuf::internal::ArenaStringPtr primary_container_name_; ::k8s::io::api::core::v1::PodSpec* pod_spec_; mutable ::google::protobuf::internal::CachedSize _cached_size_; @@ -203,6 +293,10 @@ class SidecarJob final : #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif // __GNUC__ +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + // SidecarJob // .k8s.io.api.core.v1.PodSpec pod_spec = 1; @@ -303,9 +397,49 @@ inline void SidecarJob::set_allocated_primary_container_name(::std::string* prim // @@protoc_insertion_point(field_set_allocated:flyteidl.plugins.SidecarJob.primary_container_name) } +// map annotations = 3; +inline int SidecarJob::annotations_size() const { + return annotations_.size(); +} +inline void SidecarJob::clear_annotations() { + annotations_.Clear(); +} +inline const ::google::protobuf::Map< ::std::string, ::std::string >& +SidecarJob::annotations() const { + // @@protoc_insertion_point(field_map:flyteidl.plugins.SidecarJob.annotations) + return annotations_.GetMap(); +} +inline ::google::protobuf::Map< ::std::string, ::std::string >* +SidecarJob::mutable_annotations() { + // @@protoc_insertion_point(field_mutable_map:flyteidl.plugins.SidecarJob.annotations) + return annotations_.MutableMap(); +} + +// map labels = 4; +inline int SidecarJob::labels_size() const { + return labels_.size(); +} +inline void SidecarJob::clear_labels() { + labels_.Clear(); +} +inline const ::google::protobuf::Map< ::std::string, ::std::string >& +SidecarJob::labels() const { + // @@protoc_insertion_point(field_map:flyteidl.plugins.SidecarJob.labels) + return labels_.GetMap(); +} +inline ::google::protobuf::Map< ::std::string, ::std::string >* +SidecarJob::mutable_labels() { + // @@protoc_insertion_point(field_mutable_map:flyteidl.plugins.SidecarJob.labels) + return labels_.MutableMap(); +} + #ifdef __GNUC__ #pragma GCC diagnostic pop #endif // __GNUC__ +// ------------------------------------------------------------------- + +// ------------------------------------------------------------------- + // @@protoc_insertion_point(namespace_scope) diff --git a/flyteidl/gen/pb-go/flyteidl/plugins/sidecar.pb.go b/flyteidl/gen/pb-go/flyteidl/plugins/sidecar.pb.go index 2f2a483a494..e0181dfef2a 100644 --- a/flyteidl/gen/pb-go/flyteidl/plugins/sidecar.pb.go +++ b/flyteidl/gen/pb-go/flyteidl/plugins/sidecar.pb.go @@ -27,9 +27,13 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type SidecarJob struct { PodSpec *v1.PodSpec `protobuf:"bytes,1,opt,name=pod_spec,json=podSpec,proto3" json:"pod_spec,omitempty"` PrimaryContainerName string `protobuf:"bytes,2,opt,name=primary_container_name,json=primaryContainerName,proto3" json:"primary_container_name,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // Pod annotations + Annotations map[string]string `protobuf:"bytes,3,rep,name=annotations,proto3" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + // Pod labels + Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *SidecarJob) Reset() { *m = SidecarJob{} } @@ -71,27 +75,49 @@ func (m *SidecarJob) GetPrimaryContainerName() string { return "" } +func (m *SidecarJob) GetAnnotations() map[string]string { + if m != nil { + return m.Annotations + } + return nil +} + +func (m *SidecarJob) GetLabels() map[string]string { + if m != nil { + return m.Labels + } + return nil +} + func init() { proto.RegisterType((*SidecarJob)(nil), "flyteidl.plugins.SidecarJob") + proto.RegisterMapType((map[string]string)(nil), "flyteidl.plugins.SidecarJob.AnnotationsEntry") + proto.RegisterMapType((map[string]string)(nil), "flyteidl.plugins.SidecarJob.LabelsEntry") } func init() { proto.RegisterFile("flyteidl/plugins/sidecar.proto", fileDescriptor_b34ccf0cecf5c059) } var fileDescriptor_b34ccf0cecf5c059 = []byte{ - // 225 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x8f, 0xbd, 0x4b, 0x03, 0x41, - 0x10, 0x47, 0x39, 0x0b, 0x3f, 0xd6, 0x46, 0x0e, 0x91, 0xa0, 0x20, 0x21, 0x55, 0x1a, 0x67, 0x88, - 0x8a, 0x1f, 0xad, 0x76, 0x16, 0x22, 0x49, 0x67, 0x73, 0xec, 0xed, 0x8e, 0xeb, 0xe0, 0xdd, 0xce, - 0xb0, 0xb7, 0x09, 0xc4, 0xbf, 0x5e, 0xcc, 0x26, 0x16, 0x76, 0x03, 0x8f, 0x79, 0xfc, 0x9e, 0xb9, - 0xfc, 0xe8, 0xd6, 0x99, 0xd8, 0x77, 0xa8, 0xdd, 0x32, 0x70, 0x1c, 0x70, 0x60, 0x4f, 0xce, 0x26, - 0xd0, 0x24, 0x59, 0xea, 0x93, 0x1d, 0x87, 0x2d, 0x3f, 0x9f, 0x7c, 0x3d, 0x0c, 0xc0, 0x82, 0x56, - 0x19, 0x9d, 0x24, 0xc2, 0xd5, 0x0c, 0x03, 0x45, 0x4a, 0x36, 0x93, 0x2f, 0x5f, 0x93, 0x6f, 0x63, - 0x16, 0x45, 0xf3, 0x22, 0x6d, 0x7d, 0x67, 0x0e, 0x55, 0x7c, 0x33, 0x28, 0xb9, 0x51, 0x35, 0xae, - 0xa6, 0xc7, 0xd7, 0x17, 0x50, 0x24, 0x60, 0x95, 0xe1, 0x57, 0x02, 0xab, 0x19, 0xbc, 0x89, 0x5f, - 0x28, 0xb9, 0xf9, 0x81, 0x96, 0xa3, 0xbe, 0x35, 0x67, 0x9a, 0xb8, 0xb7, 0x69, 0xdd, 0x38, 0x89, - 0xd9, 0x72, 0xa4, 0xd4, 0x44, 0xdb, 0xd3, 0x68, 0x6f, 0x5c, 0x4d, 0x8f, 0xe6, 0xa7, 0x5b, 0xfa, - 0xbc, 0x83, 0xaf, 0xb6, 0xa7, 0xa7, 0xc7, 0xf7, 0xfb, 0xc0, 0xf9, 0x73, 0xd9, 0x82, 0x93, 0x1e, - 0x37, 0xf3, 0x25, 0x05, 0xfc, 0xeb, 0x0c, 0x14, 0x51, 0xdb, 0xab, 0x20, 0xf8, 0x3f, 0xbd, 0xdd, - 0xdf, 0xac, 0xbf, 0xf9, 0x09, 0x00, 0x00, 0xff, 0xff, 0xa0, 0x21, 0xe4, 0x4f, 0x15, 0x01, 0x00, - 0x00, + // 330 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x4f, 0x4b, 0xf3, 0x40, + 0x10, 0xc6, 0x49, 0xf3, 0xbe, 0xd5, 0x6e, 0x2e, 0x65, 0x29, 0x12, 0x2a, 0x48, 0xe9, 0x29, 0x97, + 0xee, 0xd2, 0x2a, 0xda, 0x7a, 0x10, 0xff, 0xe0, 0x45, 0x44, 0x25, 0xbd, 0x79, 0x29, 0x9b, 0x64, + 0x8c, 0x4b, 0x93, 0x9d, 0x65, 0xb3, 0x2d, 0xe4, 0x1b, 0xf8, 0xb1, 0xa5, 0x49, 0x6b, 0x4b, 0x0e, + 0x82, 0xb7, 0x59, 0x9e, 0x79, 0x7e, 0x3b, 0xb3, 0xcf, 0x92, 0xb3, 0x8f, 0xac, 0xb4, 0x20, 0x93, + 0x8c, 0xeb, 0x6c, 0x95, 0x4a, 0x55, 0xf0, 0x42, 0x26, 0x10, 0x0b, 0xc3, 0xb4, 0x41, 0x8b, 0xb4, + 0xbb, 0xd3, 0xd9, 0x56, 0xef, 0x0f, 0x97, 0xd3, 0x82, 0x49, 0xe4, 0x42, 0x4b, 0x1e, 0xa3, 0x01, + 0xbe, 0x1e, 0xf3, 0x14, 0x14, 0x18, 0x61, 0x21, 0xa9, 0x5d, 0xc3, 0x2f, 0x97, 0x90, 0x79, 0xcd, + 0x79, 0xc2, 0x88, 0x5e, 0x92, 0x63, 0x8d, 0xc9, 0xa2, 0xd0, 0x10, 0xfb, 0xce, 0xc0, 0x09, 0xbc, + 0xc9, 0x29, 0xab, 0x29, 0x4c, 0x68, 0xc9, 0x36, 0x14, 0xb6, 0x1e, 0xb3, 0x37, 0x4c, 0xe6, 0x1a, + 0xe2, 0xf0, 0x48, 0xd7, 0x05, 0xbd, 0x20, 0x27, 0xda, 0xc8, 0x5c, 0x98, 0x72, 0x11, 0xa3, 0xb2, + 0x42, 0x2a, 0x30, 0x0b, 0x25, 0x72, 0xf0, 0x5b, 0x03, 0x27, 0xe8, 0x84, 0xbd, 0xad, 0xfa, 0xb0, + 0x13, 0x5f, 0x44, 0x0e, 0xf4, 0x95, 0x78, 0x42, 0x29, 0xb4, 0xc2, 0x4a, 0x54, 0x85, 0xef, 0x0e, + 0xdc, 0xc0, 0x9b, 0x8c, 0x58, 0x73, 0x11, 0xb6, 0x1f, 0x90, 0xdd, 0xed, 0xfb, 0x1f, 0x95, 0x35, + 0x65, 0x78, 0x48, 0xa0, 0xb7, 0xa4, 0x9d, 0x89, 0x08, 0xb2, 0xc2, 0xff, 0x57, 0xb1, 0x82, 0x5f, + 0x59, 0xcf, 0x55, 0x6b, 0x8d, 0xd9, 0xfa, 0xfa, 0x37, 0xa4, 0xdb, 0xbc, 0x82, 0x76, 0x89, 0xbb, + 0x84, 0xb2, 0x7a, 0x8f, 0x4e, 0xb8, 0x29, 0x69, 0x8f, 0xfc, 0x5f, 0x8b, 0x6c, 0xb5, 0xdb, 0xae, + 0x3e, 0x5c, 0xb7, 0xa6, 0x4e, 0x7f, 0x46, 0xbc, 0x03, 0xec, 0x5f, 0xac, 0xf7, 0xb3, 0xf7, 0xab, + 0x54, 0xda, 0xcf, 0x55, 0xc4, 0x62, 0xcc, 0x79, 0x35, 0x38, 0x9a, 0x94, 0xff, 0xc4, 0x9e, 0x82, + 0xe2, 0x3a, 0x1a, 0xa5, 0xc8, 0x9b, 0x3f, 0x21, 0x6a, 0x57, 0x61, 0x9e, 0x7f, 0x07, 0x00, 0x00, + 0xff, 0xff, 0xcc, 0x9c, 0x7d, 0x1f, 0x24, 0x02, 0x00, 0x00, } diff --git a/flyteidl/gen/pb-go/flyteidl/plugins/sidecar.pb.validate.go b/flyteidl/gen/pb-go/flyteidl/plugins/sidecar.pb.validate.go index a2ac51655cd..d41f896e594 100644 --- a/flyteidl/gen/pb-go/flyteidl/plugins/sidecar.pb.validate.go +++ b/flyteidl/gen/pb-go/flyteidl/plugins/sidecar.pb.validate.go @@ -55,6 +55,10 @@ func (m *SidecarJob) Validate() error { // no validation rules for PrimaryContainerName + // no validation rules for Annotations + + // no validation rules for Labels + return nil } diff --git a/flyteidl/gen/pb-java/flyteidl/plugins/Sidecar.java b/flyteidl/gen/pb-java/flyteidl/plugins/Sidecar.java index f59c08e1c7d..74bec59bef4 100644 --- a/flyteidl/gen/pb-java/flyteidl/plugins/Sidecar.java +++ b/flyteidl/gen/pb-java/flyteidl/plugins/Sidecar.java @@ -40,6 +40,114 @@ public interface SidecarJobOrBuilder extends */ com.google.protobuf.ByteString getPrimaryContainerNameBytes(); + + /** + *
+     * Pod annotations
+     * 
+ * + * map<string, string> annotations = 3; + */ + int getAnnotationsCount(); + /** + *
+     * Pod annotations
+     * 
+ * + * map<string, string> annotations = 3; + */ + boolean containsAnnotations( + java.lang.String key); + /** + * Use {@link #getAnnotationsMap()} instead. + */ + @java.lang.Deprecated + java.util.Map + getAnnotations(); + /** + *
+     * Pod annotations
+     * 
+ * + * map<string, string> annotations = 3; + */ + java.util.Map + getAnnotationsMap(); + /** + *
+     * Pod annotations
+     * 
+ * + * map<string, string> annotations = 3; + */ + + java.lang.String getAnnotationsOrDefault( + java.lang.String key, + java.lang.String defaultValue); + /** + *
+     * Pod annotations
+     * 
+ * + * map<string, string> annotations = 3; + */ + + java.lang.String getAnnotationsOrThrow( + java.lang.String key); + + /** + *
+     * Pod labels
+     * 
+ * + * map<string, string> labels = 4; + */ + int getLabelsCount(); + /** + *
+     * Pod labels
+     * 
+ * + * map<string, string> labels = 4; + */ + boolean containsLabels( + java.lang.String key); + /** + * Use {@link #getLabelsMap()} instead. + */ + @java.lang.Deprecated + java.util.Map + getLabels(); + /** + *
+     * Pod labels
+     * 
+ * + * map<string, string> labels = 4; + */ + java.util.Map + getLabelsMap(); + /** + *
+     * Pod labels
+     * 
+ * + * map<string, string> labels = 4; + */ + + java.lang.String getLabelsOrDefault( + java.lang.String key, + java.lang.String defaultValue); + /** + *
+     * Pod labels
+     * 
+ * + * map<string, string> labels = 4; + */ + + java.lang.String getLabelsOrThrow( + java.lang.String key); } /** *
@@ -106,6 +214,32 @@ private SidecarJob(
               primaryContainerName_ = s;
               break;
             }
+            case 26: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                annotations_ = com.google.protobuf.MapField.newMapField(
+                    AnnotationsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000004;
+              }
+              com.google.protobuf.MapEntry
+              annotations__ = input.readMessage(
+                  AnnotationsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              annotations_.getMutableMap().put(
+                  annotations__.getKey(), annotations__.getValue());
+              break;
+            }
+            case 34: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                labels_ = com.google.protobuf.MapField.newMapField(
+                    LabelsDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000008;
+              }
+              com.google.protobuf.MapEntry
+              labels__ = input.readMessage(
+                  LabelsDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              labels_.getMutableMap().put(
+                  labels__.getKey(), labels__.getValue());
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -130,6 +264,20 @@ private SidecarJob(
       return flyteidl.plugins.Sidecar.internal_static_flyteidl_plugins_SidecarJob_descriptor;
     }
 
+    @SuppressWarnings({"rawtypes"})
+    @java.lang.Override
+    protected com.google.protobuf.MapField internalGetMapField(
+        int number) {
+      switch (number) {
+        case 3:
+          return internalGetAnnotations();
+        case 4:
+          return internalGetLabels();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
@@ -138,6 +286,7 @@ private SidecarJob(
               flyteidl.plugins.Sidecar.SidecarJob.class, flyteidl.plugins.Sidecar.SidecarJob.Builder.class);
     }
 
+    private int bitField0_;
     public static final int POD_SPEC_FIELD_NUMBER = 1;
     private k8s.io.api.core.v1.Generated.PodSpec podSpec_;
     /**
@@ -193,6 +342,190 @@ public java.lang.String getPrimaryContainerName() {
       }
     }
 
+    public static final int ANNOTATIONS_FIELD_NUMBER = 3;
+    private static final class AnnotationsDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.String, java.lang.String> defaultEntry =
+              com.google.protobuf.MapEntry
+              .newDefaultInstance(
+                  flyteidl.plugins.Sidecar.internal_static_flyteidl_plugins_SidecarJob_AnnotationsEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "",
+                  com.google.protobuf.WireFormat.FieldType.STRING,
+                  "");
+    }
+    private com.google.protobuf.MapField<
+        java.lang.String, java.lang.String> annotations_;
+    private com.google.protobuf.MapField
+    internalGetAnnotations() {
+      if (annotations_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            AnnotationsDefaultEntryHolder.defaultEntry);
+      }
+      return annotations_;
+    }
+
+    public int getAnnotationsCount() {
+      return internalGetAnnotations().getMap().size();
+    }
+    /**
+     * 
+     * Pod annotations
+     * 
+ * + * map<string, string> annotations = 3; + */ + + public boolean containsAnnotations( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + return internalGetAnnotations().getMap().containsKey(key); + } + /** + * Use {@link #getAnnotationsMap()} instead. + */ + @java.lang.Deprecated + public java.util.Map getAnnotations() { + return getAnnotationsMap(); + } + /** + *
+     * Pod annotations
+     * 
+ * + * map<string, string> annotations = 3; + */ + + public java.util.Map getAnnotationsMap() { + return internalGetAnnotations().getMap(); + } + /** + *
+     * Pod annotations
+     * 
+ * + * map<string, string> annotations = 3; + */ + + public java.lang.String getAnnotationsOrDefault( + java.lang.String key, + java.lang.String defaultValue) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetAnnotations().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + *
+     * Pod annotations
+     * 
+ * + * map<string, string> annotations = 3; + */ + + public java.lang.String getAnnotationsOrThrow( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetAnnotations().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + public static final int LABELS_FIELD_NUMBER = 4; + private static final class LabelsDefaultEntryHolder { + static final com.google.protobuf.MapEntry< + java.lang.String, java.lang.String> defaultEntry = + com.google.protobuf.MapEntry + .newDefaultInstance( + flyteidl.plugins.Sidecar.internal_static_flyteidl_plugins_SidecarJob_LabelsEntry_descriptor, + com.google.protobuf.WireFormat.FieldType.STRING, + "", + com.google.protobuf.WireFormat.FieldType.STRING, + ""); + } + private com.google.protobuf.MapField< + java.lang.String, java.lang.String> labels_; + private com.google.protobuf.MapField + internalGetLabels() { + if (labels_ == null) { + return com.google.protobuf.MapField.emptyMapField( + LabelsDefaultEntryHolder.defaultEntry); + } + return labels_; + } + + public int getLabelsCount() { + return internalGetLabels().getMap().size(); + } + /** + *
+     * Pod labels
+     * 
+ * + * map<string, string> labels = 4; + */ + + public boolean containsLabels( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + return internalGetLabels().getMap().containsKey(key); + } + /** + * Use {@link #getLabelsMap()} instead. + */ + @java.lang.Deprecated + public java.util.Map getLabels() { + return getLabelsMap(); + } + /** + *
+     * Pod labels
+     * 
+ * + * map<string, string> labels = 4; + */ + + public java.util.Map getLabelsMap() { + return internalGetLabels().getMap(); + } + /** + *
+     * Pod labels
+     * 
+ * + * map<string, string> labels = 4; + */ + + public java.lang.String getLabelsOrDefault( + java.lang.String key, + java.lang.String defaultValue) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetLabels().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + *
+     * Pod labels
+     * 
+ * + * map<string, string> labels = 4; + */ + + public java.lang.String getLabelsOrThrow( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetLabels().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -213,6 +546,18 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!getPrimaryContainerNameBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 2, primaryContainerName_); } + com.google.protobuf.GeneratedMessageV3 + .serializeStringMapTo( + output, + internalGetAnnotations(), + AnnotationsDefaultEntryHolder.defaultEntry, + 3); + com.google.protobuf.GeneratedMessageV3 + .serializeStringMapTo( + output, + internalGetLabels(), + LabelsDefaultEntryHolder.defaultEntry, + 4); unknownFields.writeTo(output); } @@ -229,6 +574,26 @@ public int getSerializedSize() { if (!getPrimaryContainerNameBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, primaryContainerName_); } + for (java.util.Map.Entry entry + : internalGetAnnotations().getMap().entrySet()) { + com.google.protobuf.MapEntry + annotations__ = AnnotationsDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, annotations__); + } + for (java.util.Map.Entry entry + : internalGetLabels().getMap().entrySet()) { + com.google.protobuf.MapEntry + labels__ = LabelsDefaultEntryHolder.defaultEntry.newBuilderForType() + .setKey(entry.getKey()) + .setValue(entry.getValue()) + .build(); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, labels__); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -251,6 +616,10 @@ public boolean equals(final java.lang.Object obj) { } if (!getPrimaryContainerName() .equals(other.getPrimaryContainerName())) return false; + if (!internalGetAnnotations().equals( + other.internalGetAnnotations())) return false; + if (!internalGetLabels().equals( + other.internalGetLabels())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -268,6 +637,14 @@ public int hashCode() { } hash = (37 * hash) + PRIMARY_CONTAINER_NAME_FIELD_NUMBER; hash = (53 * hash) + getPrimaryContainerName().hashCode(); + if (!internalGetAnnotations().getMap().isEmpty()) { + hash = (37 * hash) + ANNOTATIONS_FIELD_NUMBER; + hash = (53 * hash) + internalGetAnnotations().hashCode(); + } + if (!internalGetLabels().getMap().isEmpty()) { + hash = (37 * hash) + LABELS_FIELD_NUMBER; + hash = (53 * hash) + internalGetLabels().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -381,6 +758,32 @@ public static final class Builder extends return flyteidl.plugins.Sidecar.internal_static_flyteidl_plugins_SidecarJob_descriptor; } + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapField internalGetMapField( + int number) { + switch (number) { + case 3: + return internalGetAnnotations(); + case 4: + return internalGetLabels(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } + @SuppressWarnings({"rawtypes"}) + protected com.google.protobuf.MapField internalGetMutableMapField( + int number) { + switch (number) { + case 3: + return internalGetMutableAnnotations(); + case 4: + return internalGetMutableLabels(); + default: + throw new RuntimeException( + "Invalid map field number: " + number); + } + } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { @@ -415,6 +818,8 @@ public Builder clear() { } primaryContainerName_ = ""; + internalGetMutableAnnotations().clear(); + internalGetMutableLabels().clear(); return this; } @@ -441,12 +846,19 @@ public flyteidl.plugins.Sidecar.SidecarJob build() { @java.lang.Override public flyteidl.plugins.Sidecar.SidecarJob buildPartial() { flyteidl.plugins.Sidecar.SidecarJob result = new flyteidl.plugins.Sidecar.SidecarJob(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; if (podSpecBuilder_ == null) { result.podSpec_ = podSpec_; } else { result.podSpec_ = podSpecBuilder_.build(); } result.primaryContainerName_ = primaryContainerName_; + result.annotations_ = internalGetAnnotations(); + result.annotations_.makeImmutable(); + result.labels_ = internalGetLabels(); + result.labels_.makeImmutable(); + result.bitField0_ = to_bitField0_; onBuilt(); return result; } @@ -502,6 +914,10 @@ public Builder mergeFrom(flyteidl.plugins.Sidecar.SidecarJob other) { primaryContainerName_ = other.primaryContainerName_; onChanged(); } + internalGetMutableAnnotations().mergeFrom( + other.internalGetAnnotations()); + internalGetMutableLabels().mergeFrom( + other.internalGetLabels()); this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -530,6 +946,7 @@ public Builder mergeFrom( } return this; } + private int bitField0_; private k8s.io.api.core.v1.Generated.PodSpec podSpec_; private com.google.protobuf.SingleFieldBuilderV3< @@ -716,6 +1133,308 @@ public Builder setPrimaryContainerNameBytes( onChanged(); return this; } + + private com.google.protobuf.MapField< + java.lang.String, java.lang.String> annotations_; + private com.google.protobuf.MapField + internalGetAnnotations() { + if (annotations_ == null) { + return com.google.protobuf.MapField.emptyMapField( + AnnotationsDefaultEntryHolder.defaultEntry); + } + return annotations_; + } + private com.google.protobuf.MapField + internalGetMutableAnnotations() { + onChanged();; + if (annotations_ == null) { + annotations_ = com.google.protobuf.MapField.newMapField( + AnnotationsDefaultEntryHolder.defaultEntry); + } + if (!annotations_.isMutable()) { + annotations_ = annotations_.copy(); + } + return annotations_; + } + + public int getAnnotationsCount() { + return internalGetAnnotations().getMap().size(); + } + /** + *
+       * Pod annotations
+       * 
+ * + * map<string, string> annotations = 3; + */ + + public boolean containsAnnotations( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + return internalGetAnnotations().getMap().containsKey(key); + } + /** + * Use {@link #getAnnotationsMap()} instead. + */ + @java.lang.Deprecated + public java.util.Map getAnnotations() { + return getAnnotationsMap(); + } + /** + *
+       * Pod annotations
+       * 
+ * + * map<string, string> annotations = 3; + */ + + public java.util.Map getAnnotationsMap() { + return internalGetAnnotations().getMap(); + } + /** + *
+       * Pod annotations
+       * 
+ * + * map<string, string> annotations = 3; + */ + + public java.lang.String getAnnotationsOrDefault( + java.lang.String key, + java.lang.String defaultValue) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetAnnotations().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + *
+       * Pod annotations
+       * 
+ * + * map<string, string> annotations = 3; + */ + + public java.lang.String getAnnotationsOrThrow( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetAnnotations().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + public Builder clearAnnotations() { + internalGetMutableAnnotations().getMutableMap() + .clear(); + return this; + } + /** + *
+       * Pod annotations
+       * 
+ * + * map<string, string> annotations = 3; + */ + + public Builder removeAnnotations( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + internalGetMutableAnnotations().getMutableMap() + .remove(key); + return this; + } + /** + * Use alternate mutation accessors instead. + */ + @java.lang.Deprecated + public java.util.Map + getMutableAnnotations() { + return internalGetMutableAnnotations().getMutableMap(); + } + /** + *
+       * Pod annotations
+       * 
+ * + * map<string, string> annotations = 3; + */ + public Builder putAnnotations( + java.lang.String key, + java.lang.String value) { + if (key == null) { throw new java.lang.NullPointerException(); } + if (value == null) { throw new java.lang.NullPointerException(); } + internalGetMutableAnnotations().getMutableMap() + .put(key, value); + return this; + } + /** + *
+       * Pod annotations
+       * 
+ * + * map<string, string> annotations = 3; + */ + + public Builder putAllAnnotations( + java.util.Map values) { + internalGetMutableAnnotations().getMutableMap() + .putAll(values); + return this; + } + + private com.google.protobuf.MapField< + java.lang.String, java.lang.String> labels_; + private com.google.protobuf.MapField + internalGetLabels() { + if (labels_ == null) { + return com.google.protobuf.MapField.emptyMapField( + LabelsDefaultEntryHolder.defaultEntry); + } + return labels_; + } + private com.google.protobuf.MapField + internalGetMutableLabels() { + onChanged();; + if (labels_ == null) { + labels_ = com.google.protobuf.MapField.newMapField( + LabelsDefaultEntryHolder.defaultEntry); + } + if (!labels_.isMutable()) { + labels_ = labels_.copy(); + } + return labels_; + } + + public int getLabelsCount() { + return internalGetLabels().getMap().size(); + } + /** + *
+       * Pod labels
+       * 
+ * + * map<string, string> labels = 4; + */ + + public boolean containsLabels( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + return internalGetLabels().getMap().containsKey(key); + } + /** + * Use {@link #getLabelsMap()} instead. + */ + @java.lang.Deprecated + public java.util.Map getLabels() { + return getLabelsMap(); + } + /** + *
+       * Pod labels
+       * 
+ * + * map<string, string> labels = 4; + */ + + public java.util.Map getLabelsMap() { + return internalGetLabels().getMap(); + } + /** + *
+       * Pod labels
+       * 
+ * + * map<string, string> labels = 4; + */ + + public java.lang.String getLabelsOrDefault( + java.lang.String key, + java.lang.String defaultValue) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetLabels().getMap(); + return map.containsKey(key) ? map.get(key) : defaultValue; + } + /** + *
+       * Pod labels
+       * 
+ * + * map<string, string> labels = 4; + */ + + public java.lang.String getLabelsOrThrow( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + java.util.Map map = + internalGetLabels().getMap(); + if (!map.containsKey(key)) { + throw new java.lang.IllegalArgumentException(); + } + return map.get(key); + } + + public Builder clearLabels() { + internalGetMutableLabels().getMutableMap() + .clear(); + return this; + } + /** + *
+       * Pod labels
+       * 
+ * + * map<string, string> labels = 4; + */ + + public Builder removeLabels( + java.lang.String key) { + if (key == null) { throw new java.lang.NullPointerException(); } + internalGetMutableLabels().getMutableMap() + .remove(key); + return this; + } + /** + * Use alternate mutation accessors instead. + */ + @java.lang.Deprecated + public java.util.Map + getMutableLabels() { + return internalGetMutableLabels().getMutableMap(); + } + /** + *
+       * Pod labels
+       * 
+ * + * map<string, string> labels = 4; + */ + public Builder putLabels( + java.lang.String key, + java.lang.String value) { + if (key == null) { throw new java.lang.NullPointerException(); } + if (value == null) { throw new java.lang.NullPointerException(); } + internalGetMutableLabels().getMutableMap() + .put(key, value); + return this; + } + /** + *
+       * Pod labels
+       * 
+ * + * map<string, string> labels = 4; + */ + + public Builder putAllLabels( + java.util.Map values) { + internalGetMutableLabels().getMutableMap() + .putAll(values); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -774,6 +1493,16 @@ public flyteidl.plugins.Sidecar.SidecarJob getDefaultInstanceForType() { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_flyteidl_plugins_SidecarJob_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_plugins_SidecarJob_AnnotationsEntry_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_plugins_SidecarJob_AnnotationsEntry_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_flyteidl_plugins_SidecarJob_LabelsEntry_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_flyteidl_plugins_SidecarJob_LabelsEntry_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -785,11 +1514,16 @@ public flyteidl.plugins.Sidecar.SidecarJob getDefaultInstanceForType() { java.lang.String[] descriptorData = { "\n\036flyteidl/plugins/sidecar.proto\022\020flytei" + "dl.plugins\032\"k8s.io/api/core/v1/generated" + - ".proto\"[\n\nSidecarJob\022-\n\010pod_spec\030\001 \001(\0132\033" + - ".k8s.io.api.core.v1.PodSpec\022\036\n\026primary_c" + - "ontainer_name\030\002 \001(\tB9Z7github.com/flyteo" + - "rg/flyteidl/gen/pb-go/flyteidl/pluginsb\006" + - "proto3" + ".proto\"\274\002\n\nSidecarJob\022-\n\010pod_spec\030\001 \001(\0132" + + "\033.k8s.io.api.core.v1.PodSpec\022\036\n\026primary_" + + "container_name\030\002 \001(\t\022B\n\013annotations\030\003 \003(" + + "\0132-.flyteidl.plugins.SidecarJob.Annotati" + + "onsEntry\0228\n\006labels\030\004 \003(\0132(.flyteidl.plug" + + "ins.SidecarJob.LabelsEntry\0322\n\020Annotation" + + "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\032-" + + "\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(" + + "\t:\0028\001B9Z7github.com/flyteorg/flyteidl/ge" + + "n/pb-go/flyteidl/pluginsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -809,7 +1543,19 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_flyteidl_plugins_SidecarJob_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_flyteidl_plugins_SidecarJob_descriptor, - new java.lang.String[] { "PodSpec", "PrimaryContainerName", }); + new java.lang.String[] { "PodSpec", "PrimaryContainerName", "Annotations", "Labels", }); + internal_static_flyteidl_plugins_SidecarJob_AnnotationsEntry_descriptor = + internal_static_flyteidl_plugins_SidecarJob_descriptor.getNestedTypes().get(0); + internal_static_flyteidl_plugins_SidecarJob_AnnotationsEntry_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_plugins_SidecarJob_AnnotationsEntry_descriptor, + new java.lang.String[] { "Key", "Value", }); + internal_static_flyteidl_plugins_SidecarJob_LabelsEntry_descriptor = + internal_static_flyteidl_plugins_SidecarJob_descriptor.getNestedTypes().get(1); + internal_static_flyteidl_plugins_SidecarJob_LabelsEntry_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_flyteidl_plugins_SidecarJob_LabelsEntry_descriptor, + new java.lang.String[] { "Key", "Value", }); k8s.io.api.core.v1.Generated.getDescriptor(); } diff --git a/flyteidl/gen/pb_python/flyteidl/plugins/sidecar_pb2.py b/flyteidl/gen/pb_python/flyteidl/plugins/sidecar_pb2.py index 34c40802eb6..6e529ed2546 100644 --- a/flyteidl/gen/pb_python/flyteidl/plugins/sidecar_pb2.py +++ b/flyteidl/gen/pb_python/flyteidl/plugins/sidecar_pb2.py @@ -21,13 +21,87 @@ package='flyteidl.plugins', syntax='proto3', serialized_options=_b('Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/plugins'), - serialized_pb=_b('\n\x1e\x66lyteidl/plugins/sidecar.proto\x12\x10\x66lyteidl.plugins\x1a\"k8s.io/api/core/v1/generated.proto\"[\n\nSidecarJob\x12-\n\x08pod_spec\x18\x01 \x01(\x0b\x32\x1b.k8s.io.api.core.v1.PodSpec\x12\x1e\n\x16primary_container_name\x18\x02 \x01(\tB9Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/pluginsb\x06proto3') + serialized_pb=_b('\n\x1e\x66lyteidl/plugins/sidecar.proto\x12\x10\x66lyteidl.plugins\x1a\"k8s.io/api/core/v1/generated.proto\"\xbc\x02\n\nSidecarJob\x12-\n\x08pod_spec\x18\x01 \x01(\x0b\x32\x1b.k8s.io.api.core.v1.PodSpec\x12\x1e\n\x16primary_container_name\x18\x02 \x01(\t\x12\x42\n\x0b\x61nnotations\x18\x03 \x03(\x0b\x32-.flyteidl.plugins.SidecarJob.AnnotationsEntry\x12\x38\n\x06labels\x18\x04 \x03(\x0b\x32(.flyteidl.plugins.SidecarJob.LabelsEntry\x1a\x32\n\x10\x41nnotationsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a-\n\x0bLabelsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x42\x39Z7github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/pluginsb\x06proto3') , dependencies=[k8s_dot_io_dot_api_dot_core_dot_v1_dot_generated__pb2.DESCRIPTOR,]) +_SIDECARJOB_ANNOTATIONSENTRY = _descriptor.Descriptor( + name='AnnotationsEntry', + full_name='flyteidl.plugins.SidecarJob.AnnotationsEntry', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='key', full_name='flyteidl.plugins.SidecarJob.AnnotationsEntry.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='flyteidl.plugins.SidecarJob.AnnotationsEntry.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=308, + serialized_end=358, +) + +_SIDECARJOB_LABELSENTRY = _descriptor.Descriptor( + name='LabelsEntry', + full_name='flyteidl.plugins.SidecarJob.LabelsEntry', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='key', full_name='flyteidl.plugins.SidecarJob.LabelsEntry.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='flyteidl.plugins.SidecarJob.LabelsEntry.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=360, + serialized_end=405, +) + _SIDECARJOB = _descriptor.Descriptor( name='SidecarJob', full_name='flyteidl.plugins.SidecarJob', @@ -49,10 +123,24 @@ message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='annotations', full_name='flyteidl.plugins.SidecarJob.annotations', index=2, + number=3, 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='labels', full_name='flyteidl.plugins.SidecarJob.labels', index=3, + number=4, 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), ], extensions=[ ], - nested_types=[], + nested_types=[_SIDECARJOB_ANNOTATIONSENTRY, _SIDECARJOB_LABELSENTRY, ], enum_types=[ ], serialized_options=None, @@ -61,21 +149,43 @@ extension_ranges=[], oneofs=[ ], - serialized_start=88, - serialized_end=179, + serialized_start=89, + serialized_end=405, ) +_SIDECARJOB_ANNOTATIONSENTRY.containing_type = _SIDECARJOB +_SIDECARJOB_LABELSENTRY.containing_type = _SIDECARJOB _SIDECARJOB.fields_by_name['pod_spec'].message_type = k8s_dot_io_dot_api_dot_core_dot_v1_dot_generated__pb2._PODSPEC +_SIDECARJOB.fields_by_name['annotations'].message_type = _SIDECARJOB_ANNOTATIONSENTRY +_SIDECARJOB.fields_by_name['labels'].message_type = _SIDECARJOB_LABELSENTRY DESCRIPTOR.message_types_by_name['SidecarJob'] = _SIDECARJOB _sym_db.RegisterFileDescriptor(DESCRIPTOR) SidecarJob = _reflection.GeneratedProtocolMessageType('SidecarJob', (_message.Message,), dict( + + AnnotationsEntry = _reflection.GeneratedProtocolMessageType('AnnotationsEntry', (_message.Message,), dict( + DESCRIPTOR = _SIDECARJOB_ANNOTATIONSENTRY, + __module__ = 'flyteidl.plugins.sidecar_pb2' + # @@protoc_insertion_point(class_scope:flyteidl.plugins.SidecarJob.AnnotationsEntry) + )) + , + + LabelsEntry = _reflection.GeneratedProtocolMessageType('LabelsEntry', (_message.Message,), dict( + DESCRIPTOR = _SIDECARJOB_LABELSENTRY, + __module__ = 'flyteidl.plugins.sidecar_pb2' + # @@protoc_insertion_point(class_scope:flyteidl.plugins.SidecarJob.LabelsEntry) + )) + , DESCRIPTOR = _SIDECARJOB, __module__ = 'flyteidl.plugins.sidecar_pb2' # @@protoc_insertion_point(class_scope:flyteidl.plugins.SidecarJob) )) _sym_db.RegisterMessage(SidecarJob) +_sym_db.RegisterMessage(SidecarJob.AnnotationsEntry) +_sym_db.RegisterMessage(SidecarJob.LabelsEntry) DESCRIPTOR._options = None +_SIDECARJOB_ANNOTATIONSENTRY._options = None +_SIDECARJOB_LABELSENTRY._options = None # @@protoc_insertion_point(module_scope) diff --git a/flyteidl/go.mod b/flyteidl/go.mod index dbd07aad940..3a8c9ba7be3 100644 --- a/flyteidl/go.mod +++ b/flyteidl/go.mod @@ -6,10 +6,11 @@ require ( github.com/antihax/optional v1.0.0 github.com/flyteorg/flytestdlib v0.3.13 github.com/go-test/deep v1.0.7 + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/protobuf v1.4.3 github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 - github.com/grpc-ecosystem/grpc-gateway v1.12.2 + github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/mitchellh/mapstructure v1.4.1 github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4 github.com/pkg/errors v0.9.1 @@ -17,6 +18,7 @@ require ( github.com/stretchr/testify v1.7.0 golang.org/x/oauth2 v0.0.0-20210126194326-f9ce19ea3013 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 + google.golang.org/api v0.38.0 google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506 google.golang.org/grpc v1.35.0 k8s.io/api v0.20.2 diff --git a/flyteidl/go.sum b/flyteidl/go.sum index 9cfb76e8415..61c347786fa 100644 --- a/flyteidl/go.sum +++ b/flyteidl/go.sum @@ -210,6 +210,7 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -300,6 +301,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.12.2 h1:D0EVSTwQoQOyfY35QNSuPJA4jpZRtkoGYWQMB7XNg5o= github.com/grpc-ecosystem/grpc-gateway v1.12.2/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= @@ -881,6 +884,7 @@ google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= @@ -918,6 +922,7 @@ google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0 h1:TwIQcH3es+MojMVojxxfQ3l3OF2KzlRxML2xZq0kRo8= diff --git a/flyteidl/protos/flyteidl/plugins/sidecar.proto b/flyteidl/protos/flyteidl/plugins/sidecar.proto index acd778bcb94..8f5b6f55ff0 100644 --- a/flyteidl/protos/flyteidl/plugins/sidecar.proto +++ b/flyteidl/protos/flyteidl/plugins/sidecar.proto @@ -13,4 +13,10 @@ message SidecarJob { k8s.io.api.core.v1.PodSpec pod_spec = 1; string primary_container_name = 2; + + // Pod annotations + map annotations = 3; + + // Pod labels + map labels = 4; }