diff --git a/pkg/proto/nbcontract/v1/config.pb.go b/pkg/proto/nbcontract/v1/config.pb.go index d05f3f03ad5..77d22a15c75 100644 --- a/pkg/proto/nbcontract/v1/config.pb.go +++ b/pkg/proto/nbcontract/v1/config.pb.go @@ -116,22 +116,21 @@ type Configuration struct { OutboundCommand string `protobuf:"bytes,43,opt,name=outbound_command,json=outboundCommand,proto3" json:"outbound_command,omitempty"` // ensure_no_dupe_promiscuous_bridge specifies whether to ensure no duplicate promiscuous bridge EnsureNoDupePromiscuousBridge bool `protobuf:"varint,45,opt,name=ensure_no_dupe_promiscuous_bridge,json=ensureNoDupePromiscuousBridge,proto3" json:"ensure_no_dupe_promiscuous_bridge,omitempty"` - // custom_search_domain specifies the custom search domain configuration - CustomSearchDomain *CustomSearchDomain `protobuf:"bytes,46,opt,name=custom_search_domain,json=customSearchDomain,proto3" json:"custom_search_domain,omitempty"` - CustomLinuxOsConfig *CustomLinuxOSConfig `protobuf:"bytes,47,opt,name=custom_linux_os_config,json=customLinuxOsConfig,proto3,oneof" json:"custom_linux_os_config,omitempty"` - // we do not need these in the final contract, these are consts - CseHelperFilepath string `protobuf:"bytes,49,opt,name=cse_helper_filepath,json=cseHelperFilepath,proto3" json:"cse_helper_filepath,omitempty"` - CseDistroHelperFilepath string `protobuf:"bytes,50,opt,name=cse_distro_helper_filepath,json=cseDistroHelperFilepath,proto3" json:"cse_distro_helper_filepath,omitempty"` - CseInstallFilepath string `protobuf:"bytes,51,opt,name=cse_install_filepath,json=cseInstallFilepath,proto3" json:"cse_install_filepath,omitempty"` - CseDistroInstallFilepath string `protobuf:"bytes,52,opt,name=cse_distro_install_filepath,json=cseDistroInstallFilepath,proto3" json:"cse_distro_install_filepath,omitempty"` - CseConfigFilepath string `protobuf:"bytes,53,opt,name=cse_config_filepath,json=cseConfigFilepath,proto3" json:"cse_config_filepath,omitempty"` - Dhcpv6ServiceFilepath string `protobuf:"bytes,54,opt,name=dhcpv6_service_filepath,json=dhcpv6ServiceFilepath,proto3" json:"dhcpv6_service_filepath,omitempty"` - Dhcpv6ConfigFilepath string `protobuf:"bytes,55,opt,name=dhcpv6_config_filepath,json=dhcpv6ConfigFilepath,proto3" json:"dhcpv6_config_filepath,omitempty"` - AzurePrivateRegistryServer string `protobuf:"bytes,56,opt,name=azure_private_registry_server,json=azurePrivateRegistryServer,proto3" json:"azure_private_registry_server,omitempty"` - PrivateEgressProxyAddress string `protobuf:"bytes,57,opt,name=private_egress_proxy_address,json=privateEgressProxyAddress,proto3" json:"private_egress_proxy_address,omitempty"` - ArtifactStreamingEnabled FeatureState `protobuf:"varint,58,opt,name=artifact_streaming_enabled,json=artifactStreamingEnabled,proto3,enum=nbcontract.v1.FeatureState" json:"artifact_streaming_enabled,omitempty"` - IsKata bool `protobuf:"varint,59,opt,name=is_kata,json=isKata,proto3" json:"is_kata,omitempty"` // we can calculate this on the VHD, will remove from final contract - NeedsCgroupv2 bool `protobuf:"varint,60,opt,name=needs_cgroupv2,json=needsCgroupv2,proto3" json:"needs_cgroupv2,omitempty"` // we can calculate this on the VHD, will remove from final contract + // custom_search_domain specifies the custom search domain configurations + CustomSearchDomain *CustomSearchDomain `protobuf:"bytes,46,opt,name=custom_search_domain,json=customSearchDomain,proto3" json:"custom_search_domain,omitempty"` + // custom_linux_os_config specifies the custom Linux OS configurations including SwapFile, SysCtl configs, etc. + CustomLinuxOsConfig *CustomLinuxOSConfig `protobuf:"bytes,47,opt,name=custom_linux_os_config,json=customLinuxOsConfig,proto3" json:"custom_linux_os_config,omitempty"` + // azure_private_registry_server specifies the Azure private registry server + AzurePrivateRegistryServer string `protobuf:"bytes,56,opt,name=azure_private_registry_server,json=azurePrivateRegistryServer,proto3" json:"azure_private_registry_server,omitempty"` + // private_egress_proxy_address specifies the private egress proxy address + PrivateEgressProxyAddress string `protobuf:"bytes,57,opt,name=private_egress_proxy_address,json=privateEgressProxyAddress,proto3" json:"private_egress_proxy_address,omitempty"` + // enable_artifact_streaming specifies whether artifact streaming is enabled or disabled on the VM node + EnableArtifactStreaming bool `protobuf:"varint,58,opt,name=enable_artifact_streaming,json=enableArtifactStreaming,proto3" json:"enable_artifact_streaming,omitempty"` + // is_kata specifies whether the node is a Kata node + IsKata bool `protobuf:"varint,59,opt,name=is_kata,json=isKata,proto3" json:"is_kata,omitempty"` + // needs_cgroupv2 specifies whether the node needs cgroupv2 + // when we actually work on the go binary, we should be able to query from the system. By then we can remove this. + NeedsCgroupv2 bool `protobuf:"varint,60,opt,name=needs_cgroupv2,json=needsCgroupv2,proto3" json:"needs_cgroupv2,omitempty"` // Here begins the final contract HttpProxyConfig *HTTPProxyConfig `protobuf:"bytes,61,opt,name=http_proxy_config,json=httpProxyConfig,proto3,oneof" json:"http_proxy_config,omitempty"` GpuConfig *GPUConfig `protobuf:"bytes,62,opt,name=gpu_config,json=gpuConfig,proto3,oneof" json:"gpu_config,omitempty"` @@ -372,55 +371,6 @@ func (x *Configuration) GetCustomLinuxOsConfig() *CustomLinuxOSConfig { return nil } -func (x *Configuration) GetCseHelperFilepath() string { - if x != nil { - return x.CseHelperFilepath - } - return "" -} - -func (x *Configuration) GetCseDistroHelperFilepath() string { - if x != nil { - return x.CseDistroHelperFilepath - } - return "" -} - -func (x *Configuration) GetCseInstallFilepath() string { - if x != nil { - return x.CseInstallFilepath - } - return "" -} - -func (x *Configuration) GetCseDistroInstallFilepath() string { - if x != nil { - return x.CseDistroInstallFilepath - } - return "" -} - -func (x *Configuration) GetCseConfigFilepath() string { - if x != nil { - return x.CseConfigFilepath - } - return "" -} - -func (x *Configuration) GetDhcpv6ServiceFilepath() string { - if x != nil { - return x.Dhcpv6ServiceFilepath - } - return "" -} - -func (x *Configuration) GetDhcpv6ConfigFilepath() string { - if x != nil { - return x.Dhcpv6ConfigFilepath - } - return "" -} - func (x *Configuration) GetAzurePrivateRegistryServer() string { if x != nil { return x.AzurePrivateRegistryServer @@ -435,11 +385,11 @@ func (x *Configuration) GetPrivateEgressProxyAddress() string { return "" } -func (x *Configuration) GetArtifactStreamingEnabled() FeatureState { +func (x *Configuration) GetEnableArtifactStreaming() bool { if x != nil { - return x.ArtifactStreamingEnabled + return x.EnableArtifactStreaming } - return FeatureState_FEATURE_STATE_UNSPECIFIED + return false } func (x *Configuration) GetIsKata() bool { @@ -523,7 +473,7 @@ var file_pkg_proto_nbcontract_v1_config_proto_rawDesc = []byte{ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2b, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x22, 0xfa, 0x14, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, + 0x6f, 0x74, 0x6f, 0x22, 0xbf, 0x11, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x42, 0x0a, 0x1d, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1b, 0x63, 0x6c, @@ -629,50 +579,24 @@ var file_pkg_proto_nbcontract_v1_config_proto_rawDesc = []byte{ 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x12, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, - 0x12, 0x5c, 0x0a, 0x16, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6c, 0x69, 0x6e, 0x75, 0x78, + 0x12, 0x57, 0x0a, 0x16, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x5f, 0x6f, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x2f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x69, 0x6e, 0x75, 0x78, 0x4f, 0x53, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x48, 0x01, 0x52, 0x13, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x69, - 0x6e, 0x75, 0x78, 0x4f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x88, 0x01, 0x01, 0x12, 0x2e, - 0x0a, 0x13, 0x63, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x6c, 0x70, 0x65, 0x72, 0x5f, 0x66, 0x69, 0x6c, - 0x65, 0x70, 0x61, 0x74, 0x68, 0x18, 0x31, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x63, 0x73, 0x65, - 0x48, 0x65, 0x6c, 0x70, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3b, - 0x0a, 0x1a, 0x63, 0x73, 0x65, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x72, 0x6f, 0x5f, 0x68, 0x65, 0x6c, - 0x70, 0x65, 0x72, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x18, 0x32, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x17, 0x63, 0x73, 0x65, 0x44, 0x69, 0x73, 0x74, 0x72, 0x6f, 0x48, 0x65, 0x6c, - 0x70, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x30, 0x0a, 0x14, 0x63, - 0x73, 0x65, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x70, - 0x61, 0x74, 0x68, 0x18, 0x33, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x63, 0x73, 0x65, 0x49, 0x6e, - 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x46, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3d, 0x0a, - 0x1b, 0x63, 0x73, 0x65, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x72, 0x6f, 0x5f, 0x69, 0x6e, 0x73, 0x74, - 0x61, 0x6c, 0x6c, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x18, 0x34, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x18, 0x63, 0x73, 0x65, 0x44, 0x69, 0x73, 0x74, 0x72, 0x6f, 0x49, 0x6e, 0x73, - 0x74, 0x61, 0x6c, 0x6c, 0x46, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x2e, 0x0a, 0x13, - 0x63, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x70, - 0x61, 0x74, 0x68, 0x18, 0x35, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x63, 0x73, 0x65, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x46, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x36, 0x0a, 0x17, - 0x64, 0x68, 0x63, 0x70, 0x76, 0x36, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x66, - 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x18, 0x36, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x64, - 0x68, 0x63, 0x70, 0x76, 0x36, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x46, 0x69, 0x6c, 0x65, - 0x70, 0x61, 0x74, 0x68, 0x12, 0x34, 0x0a, 0x16, 0x64, 0x68, 0x63, 0x70, 0x76, 0x36, 0x5f, 0x63, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x18, 0x37, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x64, 0x68, 0x63, 0x70, 0x76, 0x36, 0x43, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x46, 0x69, 0x6c, 0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x41, 0x0a, 0x1d, 0x61, 0x7a, - 0x75, 0x72, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x69, - 0x73, 0x74, 0x72, 0x79, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x38, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x1a, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, - 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x3f, 0x0a, - 0x1c, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, - 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x39, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x19, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x45, 0x67, 0x72, 0x65, - 0x73, 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x59, - 0x0a, 0x1a, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, - 0x6d, 0x69, 0x6e, 0x67, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x3a, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, - 0x76, 0x31, 0x2e, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, - 0x18, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, - 0x6e, 0x67, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x69, 0x73, 0x5f, + 0x6e, 0x66, 0x69, 0x67, 0x52, 0x13, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x69, 0x6e, 0x75, + 0x78, 0x4f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x41, 0x0a, 0x1d, 0x61, 0x7a, 0x75, + 0x72, 0x65, 0x5f, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, + 0x74, 0x72, 0x79, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x18, 0x38, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x1a, 0x61, 0x7a, 0x75, 0x72, 0x65, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, + 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x1c, + 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x65, 0x67, 0x72, 0x65, 0x73, 0x73, 0x5f, 0x70, + 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x39, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x19, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x45, 0x67, 0x72, 0x65, 0x73, + 0x73, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x3a, 0x0a, + 0x19, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, + 0x5f, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x3a, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x17, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61, 0x63, 0x74, + 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x17, 0x0a, 0x07, 0x69, 0x73, 0x5f, 0x6b, 0x61, 0x74, 0x61, 0x18, 0x3b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x4b, 0x61, 0x74, 0x61, 0x12, 0x25, 0x0a, 0x0e, 0x6e, 0x65, 0x65, 0x64, 0x73, 0x5f, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x76, 0x32, 0x18, 0x3c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x6e, 0x65, 0x65, 0x64, @@ -680,34 +604,32 @@ var file_pkg_proto_nbcontract_v1_config_proto_rawDesc = []byte{ 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x3d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x54, 0x54, 0x50, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x48, 0x02, 0x52, 0x0f, 0x68, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x78, + 0x6e, 0x66, 0x69, 0x67, 0x48, 0x01, 0x52, 0x0f, 0x68, 0x74, 0x74, 0x70, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x88, 0x01, 0x01, 0x12, 0x3c, 0x0a, 0x0a, 0x67, 0x70, 0x75, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x3e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x47, - 0x50, 0x55, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x03, 0x52, 0x09, 0x67, 0x70, 0x75, 0x43, + 0x50, 0x55, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x02, 0x52, 0x09, 0x67, 0x70, 0x75, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x88, 0x01, 0x01, 0x42, 0x16, 0x0a, 0x14, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x6c, 0x6f, 0x75, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, - 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6c, 0x69, 0x6e, 0x75, - 0x78, 0x5f, 0x6f, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x14, 0x0a, 0x12, 0x5f, - 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, - 0x67, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, - 0x2a, 0x47, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x75, 0x6e, 0x74, - 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x0e, 0x57, 0x52, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, - 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4f, 0x43, 0x49, 0x5f, 0x43, - 0x4f, 0x4e, 0x54, 0x41, 0x49, 0x4e, 0x45, 0x52, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x57, 0x41, - 0x53, 0x4d, 0x5f, 0x57, 0x41, 0x53, 0x49, 0x10, 0x02, 0x42, 0xb7, 0x01, 0x0a, 0x11, 0x63, 0x6f, - 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, - 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, - 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, - 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, - 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, - 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, - 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, - 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, - 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, - 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x5f, + 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x67, 0x70, 0x75, 0x5f, 0x63, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2a, 0x47, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, + 0x64, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x0e, 0x57, 0x52, 0x5f, 0x55, + 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, + 0x4f, 0x43, 0x49, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x41, 0x49, 0x4e, 0x45, 0x52, 0x10, 0x01, 0x12, + 0x0d, 0x0a, 0x09, 0x57, 0x41, 0x53, 0x4d, 0x5f, 0x57, 0x41, 0x53, 0x49, 0x10, 0x02, 0x42, 0xb7, + 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, + 0x74, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, + 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, + 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, + 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, + 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, + 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, + 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -740,9 +662,8 @@ var file_pkg_proto_nbcontract_v1_config_proto_goTypes = []interface{}{ (*KubeletConfig)(nil), // 12: nbcontract.v1.KubeletConfig (*CustomSearchDomain)(nil), // 13: nbcontract.v1.CustomSearchDomain (*CustomLinuxOSConfig)(nil), // 14: nbcontract.v1.CustomLinuxOSConfig - (FeatureState)(0), // 15: nbcontract.v1.FeatureState - (*HTTPProxyConfig)(nil), // 16: nbcontract.v1.HTTPProxyConfig - (*GPUConfig)(nil), // 17: nbcontract.v1.GPUConfig + (*HTTPProxyConfig)(nil), // 15: nbcontract.v1.HTTPProxyConfig + (*GPUConfig)(nil), // 16: nbcontract.v1.GPUConfig } var file_pkg_proto_nbcontract_v1_config_proto_depIdxs = []int32{ 2, // 0: nbcontract.v1.Configuration.tls_bootstrapping_config:type_name -> nbcontract.v1.TLSBootstrappingConfig @@ -759,14 +680,13 @@ var file_pkg_proto_nbcontract_v1_config_proto_depIdxs = []int32{ 0, // 11: nbcontract.v1.Configuration.workload_runtime:type_name -> nbcontract.v1.WorkloadRuntime 13, // 12: nbcontract.v1.Configuration.custom_search_domain:type_name -> nbcontract.v1.CustomSearchDomain 14, // 13: nbcontract.v1.Configuration.custom_linux_os_config:type_name -> nbcontract.v1.CustomLinuxOSConfig - 15, // 14: nbcontract.v1.Configuration.artifact_streaming_enabled:type_name -> nbcontract.v1.FeatureState - 16, // 15: nbcontract.v1.Configuration.http_proxy_config:type_name -> nbcontract.v1.HTTPProxyConfig - 17, // 16: nbcontract.v1.Configuration.gpu_config:type_name -> nbcontract.v1.GPUConfig - 17, // [17:17] is the sub-list for method output_type - 17, // [17:17] is the sub-list for method input_type - 17, // [17:17] is the sub-list for extension type_name - 17, // [17:17] is the sub-list for extension extendee - 0, // [0:17] is the sub-list for field type_name + 15, // 14: nbcontract.v1.Configuration.http_proxy_config:type_name -> nbcontract.v1.HTTPProxyConfig + 16, // 15: nbcontract.v1.Configuration.gpu_config:type_name -> nbcontract.v1.GPUConfig + 16, // [16:16] is the sub-list for method output_type + 16, // [16:16] is the sub-list for method input_type + 16, // [16:16] is the sub-list for extension type_name + 16, // [16:16] is the sub-list for extension extendee + 0, // [0:16] is the sub-list for field type_name } func init() { file_pkg_proto_nbcontract_v1_config_proto_init() } diff --git a/pkg/proto/nbcontract/v1/config.proto b/pkg/proto/nbcontract/v1/config.proto index ca9ae128563..8883bfda235 100644 --- a/pkg/proto/nbcontract/v1/config.proto +++ b/pkg/proto/nbcontract/v1/config.proto @@ -83,25 +83,27 @@ message Configuration { // ensure_no_dupe_promiscuous_bridge specifies whether to ensure no duplicate promiscuous bridge bool ensure_no_dupe_promiscuous_bridge = 45; - // custom_search_domain specifies the custom search domain configuration + // custom_search_domain specifies the custom search domain configurations CustomSearchDomain custom_search_domain = 46; - optional CustomLinuxOSConfig custom_linux_os_config = 47; - - //we do not need these in the final contract, these are consts - string cse_helper_filepath = 49; - string cse_distro_helper_filepath = 50; - string cse_install_filepath = 51; - string cse_distro_install_filepath = 52; - string cse_config_filepath = 53; - string dhcpv6_service_filepath = 54; - string dhcpv6_config_filepath = 55; + // custom_linux_os_config specifies the custom Linux OS configurations including SwapFile, SysCtl configs, etc. + CustomLinuxOSConfig custom_linux_os_config = 47; + // azure_private_registry_server specifies the Azure private registry server string azure_private_registry_server = 56; + + // private_egress_proxy_address specifies the private egress proxy address string private_egress_proxy_address = 57; - FeatureState artifact_streaming_enabled = 58; - bool is_kata = 59; // we can calculate this on the VHD, will remove from final contract - bool needs_cgroupv2 = 60; // we can calculate this on the VHD, will remove from final contract + + // enable_artifact_streaming specifies whether artifact streaming is enabled or disabled on the VM node + bool enable_artifact_streaming = 58; + + // is_kata specifies whether the node is a Kata node + bool is_kata = 59; + + // needs_cgroupv2 specifies whether the node needs cgroupv2 + // when we actually work on the go binary, we should be able to query from the system. By then we can remove this. + bool needs_cgroupv2 = 60; // Here begins the final contract optional HTTPProxyConfig http_proxy_config = 61; diff --git a/pkg/proto/nbcontract/v1/customlinuxosconfig.pb.go b/pkg/proto/nbcontract/v1/customlinuxosconfig.pb.go index c64ca7790c9..dd8de0bf462 100644 --- a/pkg/proto/nbcontract/v1/customlinuxosconfig.pb.go +++ b/pkg/proto/nbcontract/v1/customlinuxosconfig.pb.go @@ -26,16 +26,20 @@ type CustomLinuxOSConfig struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // Enable or disable swap configuration + EnableSwapConfig bool `protobuf:"varint,1,opt,name=enable_swap_config,json=enableSwapConfig,proto3" json:"enable_swap_config,omitempty"` // The size in MB of a swap file that will be created on each node - SwapFileSize *int32 `protobuf:"varint,1,opt,name=swap_file_size,json=swapFileSize,proto3,oneof" json:"swap_file_size,omitempty"` + SwapFileSize int32 `protobuf:"varint,2,opt,name=swap_file_size,json=swapFileSize,proto3" json:"swap_file_size,omitempty"` // Valid values are "always", "defer", "defer+madvise", "madvise" and "never" - TransparentHugepageSupport *string `protobuf:"bytes,2,opt,name=transparent_hugepage_support,json=transparentHugepageSupport,proto3,oneof" json:"transparent_hugepage_support,omitempty"` + // If it's unset or set to empty string, it will use the default value in the VHD "always" + TransparentHugepageSupport string `protobuf:"bytes,3,opt,name=transparent_hugepage_support,json=transparentHugepageSupport,proto3" json:"transparent_hugepage_support,omitempty"` // Valid values are "always", "madvise" and "never" - TransparentDefrag *string `protobuf:"bytes,3,opt,name=transparent_defrag,json=transparentDefrag,proto3,oneof" json:"transparent_defrag,omitempty"` + // If it's unset or set to empty string, it will use the default value in the VHD "madvise" + TransparentDefrag string `protobuf:"bytes,4,opt,name=transparent_defrag,json=transparentDefrag,proto3" json:"transparent_defrag,omitempty"` // Sysctl settings for Linux agent nodes - SysctlConfig *SysctlConfig `protobuf:"bytes,4,opt,name=sysctl_config,json=sysctlConfig,proto3,oneof" json:"sysctl_config,omitempty"` + SysctlConfig *SysctlConfig `protobuf:"bytes,5,opt,name=sysctl_config,json=sysctlConfig,proto3" json:"sysctl_config,omitempty"` // Ulimit settings for Linux agent nodes - UlimitConfig *UlimitConfig `protobuf:"bytes,5,opt,name=ulimit_config,json=ulimitConfig,proto3,oneof" json:"ulimit_config,omitempty"` + UlimitConfig *UlimitConfig `protobuf:"bytes,6,opt,name=ulimit_config,json=ulimitConfig,proto3" json:"ulimit_config,omitempty"` } func (x *CustomLinuxOSConfig) Reset() { @@ -70,23 +74,30 @@ func (*CustomLinuxOSConfig) Descriptor() ([]byte, []int) { return file_pkg_proto_nbcontract_v1_customlinuxosconfig_proto_rawDescGZIP(), []int{0} } +func (x *CustomLinuxOSConfig) GetEnableSwapConfig() bool { + if x != nil { + return x.EnableSwapConfig + } + return false +} + func (x *CustomLinuxOSConfig) GetSwapFileSize() int32 { - if x != nil && x.SwapFileSize != nil { - return *x.SwapFileSize + if x != nil { + return x.SwapFileSize } return 0 } func (x *CustomLinuxOSConfig) GetTransparentHugepageSupport() string { - if x != nil && x.TransparentHugepageSupport != nil { - return *x.TransparentHugepageSupport + if x != nil { + return x.TransparentHugepageSupport } return "" } func (x *CustomLinuxOSConfig) GetTransparentDefrag() string { - if x != nil && x.TransparentDefrag != nil { - return *x.TransparentDefrag + if x != nil { + return x.TransparentDefrag } return "" } @@ -110,6 +121,7 @@ type SysctlConfig struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // using optional here to allow detecting if the field is set or not (explicit presence in proto3) NetCoreSomaxconn *int32 `protobuf:"varint,1,opt,name=NetCoreSomaxconn,proto3,oneof" json:"NetCoreSomaxconn,omitempty"` NetCoreNetdevMaxBacklog *int32 `protobuf:"varint,2,opt,name=NetCoreNetdevMaxBacklog,proto3,oneof" json:"NetCoreNetdevMaxBacklog,omitempty"` NetCoreRmemDefault *int32 `protobuf:"varint,3,opt,name=NetCoreRmemDefault,proto3,oneof" json:"NetCoreRmemDefault,omitempty"` @@ -373,6 +385,7 @@ type UlimitConfig struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + // using optional here to allow detecting if the field is set or not (explicit presence in proto3) NoFile *string `protobuf:"bytes,1,opt,name=NoFile,proto3,oneof" json:"NoFile,omitempty"` MaxLockedMemory *string `protobuf:"bytes,2,opt,name=MaxLockedMemory,proto3,oneof" json:"MaxLockedMemory,omitempty"` } @@ -430,197 +443,191 @@ var file_pkg_proto_nbcontract_v1_customlinuxosconfig_proto_rawDesc = []byte{ 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x6f, 0x73, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, - 0x76, 0x31, 0x22, 0xb8, 0x03, 0x0a, 0x13, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x69, 0x6e, - 0x75, 0x78, 0x4f, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x29, 0x0a, 0x0e, 0x73, 0x77, - 0x61, 0x70, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x48, 0x00, 0x52, 0x0c, 0x73, 0x77, 0x61, 0x70, 0x46, 0x69, 0x6c, 0x65, 0x53, 0x69, - 0x7a, 0x65, 0x88, 0x01, 0x01, 0x12, 0x45, 0x0a, 0x1c, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, - 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x68, 0x75, 0x67, 0x65, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x75, - 0x70, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x1a, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x48, 0x75, 0x67, 0x65, 0x70, 0x61, - 0x67, 0x65, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x88, 0x01, 0x01, 0x12, 0x32, 0x0a, 0x12, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x65, 0x66, 0x72, - 0x61, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x11, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x66, 0x72, 0x61, 0x67, 0x88, 0x01, 0x01, - 0x12, 0x45, 0x0a, 0x0d, 0x73, 0x79, 0x73, 0x63, 0x74, 0x6c, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, - 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, - 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x73, 0x63, 0x74, 0x6c, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x48, 0x03, 0x52, 0x0c, 0x73, 0x79, 0x73, 0x63, 0x74, 0x6c, 0x43, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x88, 0x01, 0x01, 0x12, 0x45, 0x0a, 0x0d, 0x75, 0x6c, 0x69, 0x6d, 0x69, - 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, - 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x55, - 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x04, 0x52, 0x0c, 0x75, - 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x88, 0x01, 0x01, 0x42, 0x11, - 0x0a, 0x0f, 0x5f, 0x73, 0x77, 0x61, 0x70, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x73, 0x69, 0x7a, - 0x65, 0x42, 0x1f, 0x0a, 0x1d, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, - 0x74, 0x5f, 0x68, 0x75, 0x67, 0x65, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x75, 0x70, 0x70, 0x6f, - 0x72, 0x74, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, - 0x6e, 0x74, 0x5f, 0x64, 0x65, 0x66, 0x72, 0x61, 0x67, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x73, 0x79, - 0x73, 0x63, 0x74, 0x6c, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x10, 0x0a, 0x0e, 0x5f, - 0x75, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xd9, 0x11, - 0x0a, 0x0c, 0x53, 0x79, 0x73, 0x63, 0x74, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2f, - 0x0a, 0x10, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x53, 0x6f, 0x6d, 0x61, 0x78, 0x63, 0x6f, - 0x6e, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x10, 0x4e, 0x65, 0x74, 0x43, - 0x6f, 0x72, 0x65, 0x53, 0x6f, 0x6d, 0x61, 0x78, 0x63, 0x6f, 0x6e, 0x6e, 0x88, 0x01, 0x01, 0x12, - 0x3d, 0x0a, 0x17, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x4e, 0x65, 0x74, 0x64, 0x65, 0x76, - 0x4d, 0x61, 0x78, 0x42, 0x61, 0x63, 0x6b, 0x6c, 0x6f, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x48, 0x01, 0x52, 0x17, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x4e, 0x65, 0x74, 0x64, 0x65, - 0x76, 0x4d, 0x61, 0x78, 0x42, 0x61, 0x63, 0x6b, 0x6c, 0x6f, 0x67, 0x88, 0x01, 0x01, 0x12, 0x33, - 0x0a, 0x12, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x52, 0x6d, 0x65, 0x6d, 0x44, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x48, 0x02, 0x52, 0x12, 0x4e, 0x65, - 0x74, 0x43, 0x6f, 0x72, 0x65, 0x52, 0x6d, 0x65, 0x6d, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x88, 0x01, 0x01, 0x12, 0x2b, 0x0a, 0x0e, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x52, 0x6d, - 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x48, 0x03, 0x52, 0x0e, 0x4e, - 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x52, 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x88, 0x01, 0x01, - 0x12, 0x33, 0x0a, 0x12, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x57, 0x6d, 0x65, 0x6d, 0x44, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x48, 0x04, 0x52, 0x12, - 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x57, 0x6d, 0x65, 0x6d, 0x44, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x88, 0x01, 0x01, 0x12, 0x2b, 0x0a, 0x0e, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, - 0x57, 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x48, 0x05, 0x52, - 0x0e, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x57, 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x88, - 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x10, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x4f, 0x70, 0x74, - 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x48, 0x06, 0x52, 0x10, - 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x4f, 0x70, 0x74, 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, - 0x88, 0x01, 0x01, 0x12, 0x3d, 0x0a, 0x17, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, - 0x70, 0x4d, 0x61, 0x78, 0x53, 0x79, 0x6e, 0x42, 0x61, 0x63, 0x6b, 0x6c, 0x6f, 0x67, 0x18, 0x08, - 0x20, 0x01, 0x28, 0x05, 0x48, 0x07, 0x52, 0x17, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, - 0x63, 0x70, 0x4d, 0x61, 0x78, 0x53, 0x79, 0x6e, 0x42, 0x61, 0x63, 0x6b, 0x6c, 0x6f, 0x67, 0x88, - 0x01, 0x01, 0x12, 0x3b, 0x0a, 0x16, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, - 0x4d, 0x61, 0x78, 0x54, 0x77, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x09, 0x20, 0x01, - 0x28, 0x05, 0x48, 0x08, 0x52, 0x16, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, - 0x4d, 0x61, 0x78, 0x54, 0x77, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x88, 0x01, 0x01, 0x12, - 0x37, 0x0a, 0x14, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x46, 0x69, 0x6e, - 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x48, 0x09, 0x52, - 0x14, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x46, 0x69, 0x6e, 0x54, 0x69, - 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x88, 0x01, 0x01, 0x12, 0x3d, 0x0a, 0x17, 0x4e, 0x65, 0x74, 0x49, - 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x54, - 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x48, 0x0a, 0x52, 0x17, 0x4e, 0x65, 0x74, - 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, - 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x41, 0x0a, 0x19, 0x4e, 0x65, 0x74, 0x49, 0x70, - 0x76, 0x34, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x50, 0x72, - 0x6f, 0x62, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x48, 0x0b, 0x52, 0x19, 0x4e, 0x65, - 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, - 0x65, 0x50, 0x72, 0x6f, 0x62, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x3f, 0x0a, 0x18, 0x4e, 0x65, - 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, - 0x65, 0x49, 0x6e, 0x74, 0x76, 0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x48, 0x0c, 0x52, 0x18, - 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, - 0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x76, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x11, 0x4e, - 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x54, 0x77, 0x52, 0x65, 0x75, 0x73, 0x65, - 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x48, 0x0d, 0x52, 0x11, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, - 0x34, 0x54, 0x63, 0x70, 0x54, 0x77, 0x52, 0x65, 0x75, 0x73, 0x65, 0x88, 0x01, 0x01, 0x12, 0x3d, - 0x0a, 0x17, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x49, 0x70, 0x4c, 0x6f, 0x63, 0x61, 0x6c, - 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x48, - 0x0e, 0x52, 0x17, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x49, 0x70, 0x4c, 0x6f, 0x63, 0x61, - 0x6c, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x88, 0x01, 0x01, 0x12, 0x47, 0x0a, - 0x1c, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x44, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x47, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x31, 0x18, 0x10, 0x20, - 0x01, 0x28, 0x05, 0x48, 0x0f, 0x52, 0x1c, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x4e, 0x65, + 0x76, 0x31, 0x22, 0xde, 0x02, 0x0a, 0x13, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x69, 0x6e, + 0x75, 0x78, 0x4f, 0x53, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2c, 0x0a, 0x12, 0x65, 0x6e, + 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x77, 0x61, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x77, + 0x61, 0x70, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x77, 0x61, 0x70, + 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x0c, 0x73, 0x77, 0x61, 0x70, 0x46, 0x69, 0x6c, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x40, + 0x0a, 0x1c, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x68, 0x75, + 0x67, 0x65, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x1a, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, + 0x74, 0x48, 0x75, 0x67, 0x65, 0x70, 0x61, 0x67, 0x65, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, + 0x12, 0x2d, 0x0a, 0x12, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, + 0x64, 0x65, 0x66, 0x72, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x66, 0x72, 0x61, 0x67, 0x12, + 0x40, 0x0a, 0x0d, 0x73, 0x79, 0x73, 0x63, 0x74, 0x6c, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, + 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x73, 0x63, 0x74, 0x6c, 0x43, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x52, 0x0c, 0x73, 0x79, 0x73, 0x63, 0x74, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x12, 0x40, 0x0a, 0x0d, 0x75, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, + 0x69, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, + 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x43, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0c, 0x75, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x43, 0x6f, 0x6e, + 0x66, 0x69, 0x67, 0x22, 0xd9, 0x11, 0x0a, 0x0c, 0x53, 0x79, 0x73, 0x63, 0x74, 0x6c, 0x43, 0x6f, + 0x6e, 0x66, 0x69, 0x67, 0x12, 0x2f, 0x0a, 0x10, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x53, + 0x6f, 0x6d, 0x61, 0x78, 0x63, 0x6f, 0x6e, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, + 0x52, 0x10, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x53, 0x6f, 0x6d, 0x61, 0x78, 0x63, 0x6f, + 0x6e, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x3d, 0x0a, 0x17, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, + 0x4e, 0x65, 0x74, 0x64, 0x65, 0x76, 0x4d, 0x61, 0x78, 0x42, 0x61, 0x63, 0x6b, 0x6c, 0x6f, 0x67, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, 0x17, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, + 0x65, 0x4e, 0x65, 0x74, 0x64, 0x65, 0x76, 0x4d, 0x61, 0x78, 0x42, 0x61, 0x63, 0x6b, 0x6c, 0x6f, + 0x67, 0x88, 0x01, 0x01, 0x12, 0x33, 0x0a, 0x12, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x52, + 0x6d, 0x65, 0x6d, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, + 0x48, 0x02, 0x52, 0x12, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x52, 0x6d, 0x65, 0x6d, 0x44, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x88, 0x01, 0x01, 0x12, 0x2b, 0x0a, 0x0e, 0x4e, 0x65, 0x74, + 0x43, 0x6f, 0x72, 0x65, 0x52, 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x48, 0x03, 0x52, 0x0e, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x52, 0x6d, 0x65, 0x6d, + 0x4d, 0x61, 0x78, 0x88, 0x01, 0x01, 0x12, 0x33, 0x0a, 0x12, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, + 0x65, 0x57, 0x6d, 0x65, 0x6d, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x05, 0x48, 0x04, 0x52, 0x12, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x57, 0x6d, 0x65, + 0x6d, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x88, 0x01, 0x01, 0x12, 0x2b, 0x0a, 0x0e, 0x4e, + 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x57, 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x18, 0x06, 0x20, + 0x01, 0x28, 0x05, 0x48, 0x05, 0x52, 0x0e, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x57, 0x6d, + 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x10, 0x4e, 0x65, 0x74, 0x43, + 0x6f, 0x72, 0x65, 0x4f, 0x70, 0x74, 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x05, 0x48, 0x06, 0x52, 0x10, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x4f, 0x70, 0x74, + 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x88, 0x01, 0x01, 0x12, 0x3d, 0x0a, 0x17, 0x4e, 0x65, 0x74, + 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4d, 0x61, 0x78, 0x53, 0x79, 0x6e, 0x42, 0x61, 0x63, + 0x6b, 0x6c, 0x6f, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x48, 0x07, 0x52, 0x17, 0x4e, 0x65, + 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4d, 0x61, 0x78, 0x53, 0x79, 0x6e, 0x42, 0x61, + 0x63, 0x6b, 0x6c, 0x6f, 0x67, 0x88, 0x01, 0x01, 0x12, 0x3b, 0x0a, 0x16, 0x4e, 0x65, 0x74, 0x49, + 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4d, 0x61, 0x78, 0x54, 0x77, 0x42, 0x75, 0x63, 0x6b, 0x65, + 0x74, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x48, 0x08, 0x52, 0x16, 0x4e, 0x65, 0x74, 0x49, + 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4d, 0x61, 0x78, 0x54, 0x77, 0x42, 0x75, 0x63, 0x6b, 0x65, + 0x74, 0x73, 0x88, 0x01, 0x01, 0x12, 0x37, 0x0a, 0x14, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, + 0x54, 0x63, 0x70, 0x46, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x05, 0x48, 0x09, 0x52, 0x14, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, + 0x70, 0x46, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x88, 0x01, 0x01, 0x12, 0x3d, + 0x0a, 0x17, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, + 0x61, 0x6c, 0x69, 0x76, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x48, + 0x0a, 0x52, 0x17, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, + 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x41, 0x0a, + 0x19, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, + 0x6c, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6f, 0x62, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, + 0x48, 0x0b, 0x52, 0x19, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4b, 0x65, + 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6f, 0x62, 0x65, 0x73, 0x88, 0x01, 0x01, + 0x12, 0x3f, 0x0a, 0x18, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x6b, 0x65, + 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x76, 0x6c, 0x18, 0x0d, 0x20, 0x01, + 0x28, 0x05, 0x48, 0x0c, 0x52, 0x18, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, + 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x76, 0x6c, 0x88, 0x01, + 0x01, 0x12, 0x31, 0x0a, 0x11, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x54, + 0x77, 0x52, 0x65, 0x75, 0x73, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x48, 0x0d, 0x52, 0x11, + 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x54, 0x77, 0x52, 0x65, 0x75, 0x73, + 0x65, 0x88, 0x01, 0x01, 0x12, 0x3d, 0x0a, 0x17, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x49, + 0x70, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x18, + 0x0f, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0e, 0x52, 0x17, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, + 0x49, 0x70, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, + 0x88, 0x01, 0x01, 0x12, 0x47, 0x0a, 0x1c, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x47, 0x63, 0x54, 0x68, 0x72, 0x65, - 0x73, 0x68, 0x31, 0x88, 0x01, 0x01, 0x12, 0x47, 0x0a, 0x1c, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, - 0x34, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x47, 0x63, 0x54, - 0x68, 0x72, 0x65, 0x73, 0x68, 0x32, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x48, 0x10, 0x52, 0x1c, + 0x73, 0x68, 0x31, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x48, 0x0f, 0x52, 0x1c, 0x4e, 0x65, 0x74, + 0x49, 0x70, 0x76, 0x34, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, + 0x47, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x31, 0x88, 0x01, 0x01, 0x12, 0x47, 0x0a, 0x1c, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x44, 0x65, 0x66, 0x61, - 0x75, 0x6c, 0x74, 0x47, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x32, 0x88, 0x01, 0x01, 0x12, - 0x47, 0x0a, 0x1c, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x44, - 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x47, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x33, 0x18, - 0x12, 0x20, 0x01, 0x28, 0x05, 0x48, 0x11, 0x52, 0x1c, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, + 0x75, 0x6c, 0x74, 0x47, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x32, 0x18, 0x11, 0x20, 0x01, + 0x28, 0x05, 0x48, 0x10, 0x52, 0x1c, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x4e, 0x65, 0x69, + 0x67, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x47, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, + 0x68, 0x32, 0x88, 0x01, 0x01, 0x12, 0x47, 0x0a, 0x1c, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x47, 0x63, 0x54, 0x68, - 0x72, 0x65, 0x73, 0x68, 0x33, 0x88, 0x01, 0x01, 0x12, 0x43, 0x0a, 0x1a, 0x4e, 0x65, 0x74, 0x4e, + 0x72, 0x65, 0x73, 0x68, 0x33, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x48, 0x11, 0x52, 0x1c, 0x4e, + 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x47, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x33, 0x88, 0x01, 0x01, 0x12, 0x43, + 0x0a, 0x1a, 0x4e, 0x65, 0x74, 0x4e, 0x65, 0x74, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x4e, 0x66, + 0x43, 0x6f, 0x6e, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x4d, 0x61, 0x78, 0x18, 0x13, 0x20, 0x01, + 0x28, 0x05, 0x48, 0x12, 0x52, 0x1a, 0x4e, 0x65, 0x74, 0x4e, 0x65, 0x74, 0x66, 0x69, 0x6c, 0x74, + 0x65, 0x72, 0x4e, 0x66, 0x43, 0x6f, 0x6e, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x4d, 0x61, 0x78, + 0x88, 0x01, 0x01, 0x12, 0x4b, 0x0a, 0x1e, 0x4e, 0x65, 0x74, 0x4e, 0x65, 0x74, 0x66, 0x69, 0x6c, + 0x74, 0x65, 0x72, 0x4e, 0x66, 0x43, 0x6f, 0x6e, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x42, 0x75, + 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x48, 0x13, 0x52, 0x1e, 0x4e, + 0x65, 0x74, 0x4e, 0x65, 0x74, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x4e, 0x66, 0x43, 0x6f, 0x6e, + 0x6e, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x88, 0x01, 0x01, + 0x12, 0x3d, 0x0a, 0x17, 0x46, 0x73, 0x49, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x4d, 0x61, 0x78, + 0x55, 0x73, 0x65, 0x72, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, + 0x05, 0x48, 0x14, 0x52, 0x17, 0x46, 0x73, 0x49, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x4d, 0x61, + 0x78, 0x55, 0x73, 0x65, 0x72, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, + 0x21, 0x0a, 0x09, 0x46, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x4d, 0x61, 0x78, 0x18, 0x16, 0x20, 0x01, + 0x28, 0x05, 0x48, 0x15, 0x52, 0x09, 0x46, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x4d, 0x61, 0x78, 0x88, + 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x46, 0x73, 0x41, 0x69, 0x6f, 0x4d, 0x61, 0x78, 0x4e, 0x72, + 0x18, 0x17, 0x20, 0x01, 0x28, 0x05, 0x48, 0x16, 0x52, 0x0a, 0x46, 0x73, 0x41, 0x69, 0x6f, 0x4d, + 0x61, 0x78, 0x4e, 0x72, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x46, 0x73, 0x4e, 0x72, 0x4f, + 0x70, 0x65, 0x6e, 0x18, 0x18, 0x20, 0x01, 0x28, 0x05, 0x48, 0x17, 0x52, 0x08, 0x46, 0x73, 0x4e, + 0x72, 0x4f, 0x70, 0x65, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x10, 0x4b, 0x65, 0x72, 0x6e, + 0x65, 0x6c, 0x54, 0x68, 0x72, 0x65, 0x61, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x18, 0x19, 0x20, 0x01, + 0x28, 0x05, 0x48, 0x18, 0x52, 0x10, 0x4b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x54, 0x68, 0x72, 0x65, + 0x61, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a, 0x0d, 0x56, 0x4d, 0x4d, + 0x61, 0x78, 0x4d, 0x61, 0x70, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x05, + 0x48, 0x19, 0x52, 0x0d, 0x56, 0x4d, 0x4d, 0x61, 0x78, 0x4d, 0x61, 0x70, 0x43, 0x6f, 0x75, 0x6e, + 0x74, 0x88, 0x01, 0x01, 0x12, 0x27, 0x0a, 0x0c, 0x56, 0x4d, 0x53, 0x77, 0x61, 0x70, 0x70, 0x69, + 0x6e, 0x65, 0x73, 0x73, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x05, 0x48, 0x1a, 0x52, 0x0c, 0x56, 0x4d, + 0x53, 0x77, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x88, 0x01, 0x01, 0x12, 0x33, 0x0a, + 0x12, 0x56, 0x4d, 0x56, 0x66, 0x73, 0x43, 0x61, 0x63, 0x68, 0x65, 0x50, 0x72, 0x65, 0x73, 0x73, + 0x75, 0x72, 0x65, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x05, 0x48, 0x1b, 0x52, 0x12, 0x56, 0x4d, 0x56, + 0x66, 0x73, 0x43, 0x61, 0x63, 0x68, 0x65, 0x50, 0x72, 0x65, 0x73, 0x73, 0x75, 0x72, 0x65, 0x88, + 0x01, 0x01, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x53, 0x6f, + 0x6d, 0x61, 0x78, 0x63, 0x6f, 0x6e, 0x6e, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x4e, 0x65, 0x74, 0x43, + 0x6f, 0x72, 0x65, 0x4e, 0x65, 0x74, 0x64, 0x65, 0x76, 0x4d, 0x61, 0x78, 0x42, 0x61, 0x63, 0x6b, + 0x6c, 0x6f, 0x67, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x52, + 0x6d, 0x65, 0x6d, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x4e, + 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x52, 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x42, 0x15, 0x0a, + 0x13, 0x5f, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x57, 0x6d, 0x65, 0x6d, 0x44, 0x65, 0x66, + 0x61, 0x75, 0x6c, 0x74, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, + 0x57, 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x4e, 0x65, 0x74, 0x43, + 0x6f, 0x72, 0x65, 0x4f, 0x70, 0x74, 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x42, 0x1a, 0x0a, 0x18, + 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4d, 0x61, 0x78, 0x53, 0x79, + 0x6e, 0x42, 0x61, 0x63, 0x6b, 0x6c, 0x6f, 0x67, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x4e, 0x65, 0x74, + 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4d, 0x61, 0x78, 0x54, 0x77, 0x42, 0x75, 0x63, 0x6b, + 0x65, 0x74, 0x73, 0x42, 0x17, 0x0a, 0x15, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, + 0x63, 0x70, 0x46, 0x69, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x42, 0x1a, 0x0a, 0x18, + 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, + 0x6c, 0x69, 0x76, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x1c, 0x0a, 0x1a, 0x5f, 0x4e, 0x65, 0x74, + 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, + 0x50, 0x72, 0x6f, 0x62, 0x65, 0x73, 0x42, 0x1b, 0x0a, 0x19, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, + 0x76, 0x34, 0x54, 0x63, 0x70, 0x6b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x49, 0x6e, + 0x74, 0x76, 0x6c, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, + 0x63, 0x70, 0x54, 0x77, 0x52, 0x65, 0x75, 0x73, 0x65, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x4e, 0x65, + 0x74, 0x49, 0x70, 0x76, 0x34, 0x49, 0x70, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x6f, 0x72, 0x74, + 0x52, 0x61, 0x6e, 0x67, 0x65, 0x42, 0x1f, 0x0a, 0x1d, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, + 0x34, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x47, 0x63, 0x54, + 0x68, 0x72, 0x65, 0x73, 0x68, 0x31, 0x42, 0x1f, 0x0a, 0x1d, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, + 0x76, 0x34, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x47, 0x63, + 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x32, 0x42, 0x1f, 0x0a, 0x1d, 0x5f, 0x4e, 0x65, 0x74, 0x49, + 0x70, 0x76, 0x34, 0x4e, 0x65, 0x69, 0x67, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x47, + 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x33, 0x42, 0x1d, 0x0a, 0x1b, 0x5f, 0x4e, 0x65, 0x74, + 0x4e, 0x65, 0x74, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x4e, 0x66, 0x43, 0x6f, 0x6e, 0x6e, 0x74, + 0x72, 0x61, 0x63, 0x6b, 0x4d, 0x61, 0x78, 0x42, 0x21, 0x0a, 0x1f, 0x5f, 0x4e, 0x65, 0x74, 0x4e, 0x65, 0x74, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x4e, 0x66, 0x43, 0x6f, 0x6e, 0x6e, 0x74, 0x72, - 0x61, 0x63, 0x6b, 0x4d, 0x61, 0x78, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x48, 0x12, 0x52, 0x1a, - 0x4e, 0x65, 0x74, 0x4e, 0x65, 0x74, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x4e, 0x66, 0x43, 0x6f, - 0x6e, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x4d, 0x61, 0x78, 0x88, 0x01, 0x01, 0x12, 0x4b, 0x0a, - 0x1e, 0x4e, 0x65, 0x74, 0x4e, 0x65, 0x74, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x4e, 0x66, 0x43, - 0x6f, 0x6e, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, - 0x14, 0x20, 0x01, 0x28, 0x05, 0x48, 0x13, 0x52, 0x1e, 0x4e, 0x65, 0x74, 0x4e, 0x65, 0x74, 0x66, - 0x69, 0x6c, 0x74, 0x65, 0x72, 0x4e, 0x66, 0x43, 0x6f, 0x6e, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x6b, - 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x88, 0x01, 0x01, 0x12, 0x3d, 0x0a, 0x17, 0x46, 0x73, - 0x49, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x4d, 0x61, 0x78, 0x55, 0x73, 0x65, 0x72, 0x57, 0x61, - 0x74, 0x63, 0x68, 0x65, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x48, 0x14, 0x52, 0x17, 0x46, + 0x61, 0x63, 0x6b, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x46, 0x73, 0x49, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x4d, 0x61, 0x78, 0x55, 0x73, 0x65, 0x72, 0x57, - 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x46, 0x73, 0x46, - 0x69, 0x6c, 0x65, 0x4d, 0x61, 0x78, 0x18, 0x16, 0x20, 0x01, 0x28, 0x05, 0x48, 0x15, 0x52, 0x09, - 0x46, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x4d, 0x61, 0x78, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, - 0x46, 0x73, 0x41, 0x69, 0x6f, 0x4d, 0x61, 0x78, 0x4e, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x05, - 0x48, 0x16, 0x52, 0x0a, 0x46, 0x73, 0x41, 0x69, 0x6f, 0x4d, 0x61, 0x78, 0x4e, 0x72, 0x88, 0x01, - 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x46, 0x73, 0x4e, 0x72, 0x4f, 0x70, 0x65, 0x6e, 0x18, 0x18, 0x20, - 0x01, 0x28, 0x05, 0x48, 0x17, 0x52, 0x08, 0x46, 0x73, 0x4e, 0x72, 0x4f, 0x70, 0x65, 0x6e, 0x88, - 0x01, 0x01, 0x12, 0x2f, 0x0a, 0x10, 0x4b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x54, 0x68, 0x72, 0x65, - 0x61, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x48, 0x18, 0x52, 0x10, - 0x4b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x54, 0x68, 0x72, 0x65, 0x61, 0x64, 0x73, 0x4d, 0x61, 0x78, - 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a, 0x0d, 0x56, 0x4d, 0x4d, 0x61, 0x78, 0x4d, 0x61, 0x70, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x05, 0x48, 0x19, 0x52, 0x0d, 0x56, 0x4d, - 0x4d, 0x61, 0x78, 0x4d, 0x61, 0x70, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x27, - 0x0a, 0x0c, 0x56, 0x4d, 0x53, 0x77, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x18, 0x1b, - 0x20, 0x01, 0x28, 0x05, 0x48, 0x1a, 0x52, 0x0c, 0x56, 0x4d, 0x53, 0x77, 0x61, 0x70, 0x70, 0x69, - 0x6e, 0x65, 0x73, 0x73, 0x88, 0x01, 0x01, 0x12, 0x33, 0x0a, 0x12, 0x56, 0x4d, 0x56, 0x66, 0x73, - 0x43, 0x61, 0x63, 0x68, 0x65, 0x50, 0x72, 0x65, 0x73, 0x73, 0x75, 0x72, 0x65, 0x18, 0x1c, 0x20, - 0x01, 0x28, 0x05, 0x48, 0x1b, 0x52, 0x12, 0x56, 0x4d, 0x56, 0x66, 0x73, 0x43, 0x61, 0x63, 0x68, - 0x65, 0x50, 0x72, 0x65, 0x73, 0x73, 0x75, 0x72, 0x65, 0x88, 0x01, 0x01, 0x42, 0x13, 0x0a, 0x11, - 0x5f, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x53, 0x6f, 0x6d, 0x61, 0x78, 0x63, 0x6f, 0x6e, - 0x6e, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x4e, 0x65, 0x74, - 0x64, 0x65, 0x76, 0x4d, 0x61, 0x78, 0x42, 0x61, 0x63, 0x6b, 0x6c, 0x6f, 0x67, 0x42, 0x15, 0x0a, - 0x13, 0x5f, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x52, 0x6d, 0x65, 0x6d, 0x44, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, - 0x52, 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x4e, 0x65, 0x74, 0x43, - 0x6f, 0x72, 0x65, 0x57, 0x6d, 0x65, 0x6d, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x42, 0x11, - 0x0a, 0x0f, 0x5f, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x57, 0x6d, 0x65, 0x6d, 0x4d, 0x61, - 0x78, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x4e, 0x65, 0x74, 0x43, 0x6f, 0x72, 0x65, 0x4f, 0x70, 0x74, - 0x6d, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, - 0x76, 0x34, 0x54, 0x63, 0x70, 0x4d, 0x61, 0x78, 0x53, 0x79, 0x6e, 0x42, 0x61, 0x63, 0x6b, 0x6c, - 0x6f, 0x67, 0x42, 0x19, 0x0a, 0x17, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, - 0x70, 0x4d, 0x61, 0x78, 0x54, 0x77, 0x42, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x42, 0x17, 0x0a, - 0x15, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x46, 0x69, 0x6e, 0x54, - 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, - 0x76, 0x34, 0x54, 0x63, 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x54, 0x69, - 0x6d, 0x65, 0x42, 0x1c, 0x0a, 0x1a, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, - 0x70, 0x4b, 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6f, 0x62, 0x65, 0x73, - 0x42, 0x1b, 0x0a, 0x19, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x6b, - 0x65, 0x65, 0x70, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x74, 0x76, 0x6c, 0x42, 0x14, 0x0a, - 0x12, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x54, 0x63, 0x70, 0x54, 0x77, 0x52, 0x65, - 0x75, 0x73, 0x65, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x49, - 0x70, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x42, - 0x1f, 0x0a, 0x1d, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x4e, 0x65, 0x69, 0x67, 0x68, - 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x47, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x31, - 0x42, 0x1f, 0x0a, 0x1d, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x4e, 0x65, 0x69, 0x67, - 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x47, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, - 0x32, 0x42, 0x1f, 0x0a, 0x1d, 0x5f, 0x4e, 0x65, 0x74, 0x49, 0x70, 0x76, 0x34, 0x4e, 0x65, 0x69, - 0x67, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x47, 0x63, 0x54, 0x68, 0x72, 0x65, 0x73, - 0x68, 0x33, 0x42, 0x1d, 0x0a, 0x1b, 0x5f, 0x4e, 0x65, 0x74, 0x4e, 0x65, 0x74, 0x66, 0x69, 0x6c, - 0x74, 0x65, 0x72, 0x4e, 0x66, 0x43, 0x6f, 0x6e, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x4d, 0x61, - 0x78, 0x42, 0x21, 0x0a, 0x1f, 0x5f, 0x4e, 0x65, 0x74, 0x4e, 0x65, 0x74, 0x66, 0x69, 0x6c, 0x74, - 0x65, 0x72, 0x4e, 0x66, 0x43, 0x6f, 0x6e, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x42, 0x75, 0x63, - 0x6b, 0x65, 0x74, 0x73, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x46, 0x73, 0x49, 0x6e, 0x6f, 0x74, 0x69, - 0x66, 0x79, 0x4d, 0x61, 0x78, 0x55, 0x73, 0x65, 0x72, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, - 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x46, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x4d, 0x61, 0x78, 0x42, 0x0d, - 0x0a, 0x0b, 0x5f, 0x46, 0x73, 0x41, 0x69, 0x6f, 0x4d, 0x61, 0x78, 0x4e, 0x72, 0x42, 0x0b, 0x0a, - 0x09, 0x5f, 0x46, 0x73, 0x4e, 0x72, 0x4f, 0x70, 0x65, 0x6e, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x4b, - 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x54, 0x68, 0x72, 0x65, 0x61, 0x64, 0x73, 0x4d, 0x61, 0x78, 0x42, - 0x10, 0x0a, 0x0e, 0x5f, 0x56, 0x4d, 0x4d, 0x61, 0x78, 0x4d, 0x61, 0x70, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x56, 0x4d, 0x53, 0x77, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x65, - 0x73, 0x73, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x56, 0x4d, 0x56, 0x66, 0x73, 0x43, 0x61, 0x63, 0x68, - 0x65, 0x50, 0x72, 0x65, 0x73, 0x73, 0x75, 0x72, 0x65, 0x22, 0x79, 0x0a, 0x0c, 0x55, 0x6c, 0x69, - 0x6d, 0x69, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1b, 0x0a, 0x06, 0x4e, 0x6f, 0x46, - 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x4e, 0x6f, 0x46, - 0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x0f, 0x4d, 0x61, 0x78, 0x4c, 0x6f, 0x63, - 0x6b, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, - 0x01, 0x52, 0x0f, 0x4d, 0x61, 0x78, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x6f, - 0x72, 0x79, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x4e, 0x6f, 0x46, 0x69, 0x6c, 0x65, - 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x4d, 0x61, 0x78, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x4d, 0x65, - 0x6d, 0x6f, 0x72, 0x79, 0x42, 0xc4, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, - 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x18, 0x43, 0x75, 0x73, 0x74, - 0x6f, 0x6d, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x6f, 0x73, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, - 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, - 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, - 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, - 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, - 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, - 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, - 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, - 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x46, 0x73, 0x46, 0x69, 0x6c, + 0x65, 0x4d, 0x61, 0x78, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x46, 0x73, 0x41, 0x69, 0x6f, 0x4d, 0x61, + 0x78, 0x4e, 0x72, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x46, 0x73, 0x4e, 0x72, 0x4f, 0x70, 0x65, 0x6e, + 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x4b, 0x65, 0x72, 0x6e, 0x65, 0x6c, 0x54, 0x68, 0x72, 0x65, 0x61, + 0x64, 0x73, 0x4d, 0x61, 0x78, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x56, 0x4d, 0x4d, 0x61, 0x78, 0x4d, + 0x61, 0x70, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x56, 0x4d, 0x53, 0x77, + 0x61, 0x70, 0x70, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x56, 0x4d, 0x56, + 0x66, 0x73, 0x43, 0x61, 0x63, 0x68, 0x65, 0x50, 0x72, 0x65, 0x73, 0x73, 0x75, 0x72, 0x65, 0x22, + 0x79, 0x0a, 0x0c, 0x55, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, + 0x1b, 0x0a, 0x06, 0x4e, 0x6f, 0x46, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, + 0x00, 0x52, 0x06, 0x4e, 0x6f, 0x46, 0x69, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x0f, + 0x4d, 0x61, 0x78, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0f, 0x4d, 0x61, 0x78, 0x4c, 0x6f, 0x63, 0x6b, + 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, + 0x4e, 0x6f, 0x46, 0x69, 0x6c, 0x65, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x4d, 0x61, 0x78, 0x4c, 0x6f, + 0x63, 0x6b, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x42, 0xc4, 0x01, 0x0a, 0x11, 0x63, + 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, + 0x42, 0x18, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x6c, 0x69, 0x6e, 0x75, 0x78, 0x6f, 0x73, 0x63, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, + 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, + 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, + 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, + 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, + 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, + 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, + 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -694,7 +701,6 @@ func file_pkg_proto_nbcontract_v1_customlinuxosconfig_proto_init() { } } } - file_pkg_proto_nbcontract_v1_customlinuxosconfig_proto_msgTypes[0].OneofWrappers = []interface{}{} file_pkg_proto_nbcontract_v1_customlinuxosconfig_proto_msgTypes[1].OneofWrappers = []interface{}{} file_pkg_proto_nbcontract_v1_customlinuxosconfig_proto_msgTypes[2].OneofWrappers = []interface{}{} type x struct{} diff --git a/pkg/proto/nbcontract/v1/customlinuxosconfig.proto b/pkg/proto/nbcontract/v1/customlinuxosconfig.proto index d91f1d126d1..db950c2febd 100644 --- a/pkg/proto/nbcontract/v1/customlinuxosconfig.proto +++ b/pkg/proto/nbcontract/v1/customlinuxosconfig.proto @@ -3,54 +3,61 @@ package nbcontract.v1; // Custom Linux Node OS Config message CustomLinuxOSConfig { - // The size in MB of a swap file that will be created on each node - optional int32 swap_file_size = 1; + // Enable or disable swap configuration + bool enable_swap_config = 1; - // Valid values are "always", "defer", "defer+madvise", "madvise" and "never" - optional string transparent_hugepage_support = 2; + // The size in MB of a swap file that will be created on each node + int32 swap_file_size = 2; - // Valid values are "always", "madvise" and "never" - optional string transparent_defrag = 3; + // Valid values are "always", "defer", "defer+madvise", "madvise" and "never" + // If it's unset or set to empty string, it will use the default value in the VHD "always" + string transparent_hugepage_support = 3; - // Sysctl settings for Linux agent nodes - optional SysctlConfig sysctl_config = 4; + // Valid values are "always", "madvise" and "never" + // If it's unset or set to empty string, it will use the default value in the VHD "madvise" + string transparent_defrag = 4; - // Ulimit settings for Linux agent nodes - optional UlimitConfig ulimit_config = 5; - } + // Sysctl settings for Linux agent nodes + SysctlConfig sysctl_config = 5; + + // Ulimit settings for Linux agent nodes + UlimitConfig ulimit_config = 6; +} message SysctlConfig { - optional int32 NetCoreSomaxconn = 1; - optional int32 NetCoreNetdevMaxBacklog = 2; - optional int32 NetCoreRmemDefault = 3; - optional int32 NetCoreRmemMax = 4; - optional int32 NetCoreWmemDefault = 5; - optional int32 NetCoreWmemMax = 6; - optional int32 NetCoreOptmemMax = 7; - optional int32 NetIpv4TcpMaxSynBacklog = 8; - optional int32 NetIpv4TcpMaxTwBuckets = 9; - optional int32 NetIpv4TcpFinTimeout = 10; - optional int32 NetIpv4TcpKeepaliveTime = 11; - optional int32 NetIpv4TcpKeepaliveProbes = 12; - optional int32 NetIpv4TcpkeepaliveIntvl = 13; - optional bool NetIpv4TcpTwReuse = 14; - optional string NetIpv4IpLocalPortRange = 15; - optional int32 NetIpv4NeighDefaultGcThresh1 = 16; - optional int32 NetIpv4NeighDefaultGcThresh2 = 17; - optional int32 NetIpv4NeighDefaultGcThresh3 = 18; - optional int32 NetNetfilterNfConntrackMax = 19; - optional int32 NetNetfilterNfConntrackBuckets = 20; - optional int32 FsInotifyMaxUserWatches = 21; - optional int32 FsFileMax = 22; - optional int32 FsAioMaxNr = 23; - optional int32 FsNrOpen = 24; - optional int32 KernelThreadsMax = 25; - optional int32 VMMaxMapCount = 26; - optional int32 VMSwappiness = 27; - optional int32 VMVfsCachePressure = 28; - } - - message UlimitConfig { - optional string NoFile = 1; - optional string MaxLockedMemory = 2; - } \ No newline at end of file + // using optional here to allow detecting if the field is set or not (explicit presence in proto3) + optional int32 NetCoreSomaxconn = 1; + optional int32 NetCoreNetdevMaxBacklog = 2; + optional int32 NetCoreRmemDefault = 3; + optional int32 NetCoreRmemMax = 4; + optional int32 NetCoreWmemDefault = 5; + optional int32 NetCoreWmemMax = 6; + optional int32 NetCoreOptmemMax = 7; + optional int32 NetIpv4TcpMaxSynBacklog = 8; + optional int32 NetIpv4TcpMaxTwBuckets = 9; + optional int32 NetIpv4TcpFinTimeout = 10; + optional int32 NetIpv4TcpKeepaliveTime = 11; + optional int32 NetIpv4TcpKeepaliveProbes = 12; + optional int32 NetIpv4TcpkeepaliveIntvl = 13; + optional bool NetIpv4TcpTwReuse = 14; + optional string NetIpv4IpLocalPortRange = 15; + optional int32 NetIpv4NeighDefaultGcThresh1 = 16; + optional int32 NetIpv4NeighDefaultGcThresh2 = 17; + optional int32 NetIpv4NeighDefaultGcThresh3 = 18; + optional int32 NetNetfilterNfConntrackMax = 19; + optional int32 NetNetfilterNfConntrackBuckets = 20; + optional int32 FsInotifyMaxUserWatches = 21; + optional int32 FsFileMax = 22; + optional int32 FsAioMaxNr = 23; + optional int32 FsNrOpen = 24; + optional int32 KernelThreadsMax = 25; + optional int32 VMMaxMapCount = 26; + optional int32 VMSwappiness = 27; + optional int32 VMVfsCachePressure = 28; +} + +message UlimitConfig { + // using optional here to allow detecting if the field is set or not (explicit presence in proto3) + optional string NoFile = 1; + optional string MaxLockedMemory = 2; +} \ No newline at end of file diff --git a/pkg/proto/nbcontract/v1/kubeletconfig.pb.go b/pkg/proto/nbcontract/v1/kubeletconfig.pb.go index 7e64801925a..5b708102249 100644 --- a/pkg/proto/nbcontract/v1/kubeletconfig.pb.go +++ b/pkg/proto/nbcontract/v1/kubeletconfig.pb.go @@ -80,12 +80,10 @@ type KubeletConfig struct { Taints []*Taint `protobuf:"bytes,3,rep,name=taints,proto3" json:"taints,omitempty"` StartupTaints []*Taint `protobuf:"bytes,4,rep,name=startup_taints,json=startupTaints,proto3" json:"startup_taints,omitempty"` KubeletDiskType KubeletDiskType `protobuf:"varint,5,opt,name=kubelet_disk_type,json=kubeletDiskType,proto3,enum=nbcontract.v1.KubeletDiskType" json:"kubelet_disk_type,omitempty"` - // kubelet_config_file_status specifies if the kubelet_config_file_content should be applied. - KubeletConfigFileStatus FeatureState `protobuf:"varint,6,opt,name=kubelet_config_file_status,json=kubeletConfigFileStatus,proto3,enum=nbcontract.v1.FeatureState" json:"kubelet_config_file_status,omitempty"` // kubelet_config_file_content is the content of the kubelet config file. - KubeletConfigFileContent string `protobuf:"bytes,7,opt,name=kubelet_config_file_content,json=kubeletConfigFileContent,proto3" json:"kubelet_config_file_content,omitempty"` - KubeletClientKey string `protobuf:"bytes,8,opt,name=kubelet_client_key,json=kubeletClientKey,proto3" json:"kubelet_client_key,omitempty"` - KubeletClientCertContent string `protobuf:"bytes,9,opt,name=kubelet_client_cert_content,json=kubeletClientCertContent,proto3" json:"kubelet_client_cert_content,omitempty"` + KubeletConfigFileContent string `protobuf:"bytes,6,opt,name=kubelet_config_file_content,json=kubeletConfigFileContent,proto3" json:"kubelet_config_file_content,omitempty"` + KubeletClientKey string `protobuf:"bytes,7,opt,name=kubelet_client_key,json=kubeletClientKey,proto3" json:"kubelet_client_key,omitempty"` + KubeletClientCertContent string `protobuf:"bytes,8,opt,name=kubelet_client_cert_content,json=kubeletClientCertContent,proto3" json:"kubelet_client_cert_content,omitempty"` } func (x *KubeletConfig) Reset() { @@ -155,13 +153,6 @@ func (x *KubeletConfig) GetKubeletDiskType() KubeletDiskType { return KubeletDiskType_KUBELET_DISK_TYPE_UNSPECIFIED } -func (x *KubeletConfig) GetKubeletConfigFileStatus() FeatureState { - if x != nil { - return x.KubeletConfigFileStatus - } - return FeatureState_FEATURE_STATE_UNSPECIFIED -} - func (x *KubeletConfig) GetKubeletConfigFileContent() string { if x != nil { return x.KubeletConfigFileContent @@ -247,7 +238,7 @@ var file_pkg_proto_nbcontract_v1_kubeletconfig_proto_rawDesc = []byte{ 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x1a, 0x2a, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x74, 0x61, - 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8d, 0x06, 0x0a, 0x0d, 0x4b, 0x75, 0x62, + 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb3, 0x05, 0x0a, 0x0d, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x53, 0x0a, 0x0d, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, @@ -271,55 +262,49 @@ var file_pkg_proto_nbcontract_v1_kubeletconfig_proto_rawDesc = []byte{ 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0f, 0x6b, 0x75, 0x62, 0x65, - 0x6c, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x58, 0x0a, 0x1a, 0x6b, + 0x6c, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x3d, 0x0a, 0x1b, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x66, 0x69, - 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x1b, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x2e, - 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x17, 0x6b, 0x75, - 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x46, 0x69, 0x6c, 0x65, 0x53, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x3d, 0x0a, 0x1b, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, - 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x18, 0x6b, 0x75, 0x62, 0x65, - 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x46, 0x69, 0x6c, 0x65, 0x43, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x12, 0x2c, 0x0a, 0x12, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, - 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x10, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x4b, - 0x65, 0x79, 0x12, 0x3d, 0x0a, 0x1b, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6c, - 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, - 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x18, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, - 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x65, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, - 0x74, 0x1a, 0x3f, 0x0a, 0x11, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x46, 0x6c, 0x61, 0x67, - 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x4e, 0x6f, 0x64, - 0x65, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x18, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x46, + 0x69, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x2c, 0x0a, 0x12, 0x6b, 0x75, + 0x62, 0x65, 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x6b, 0x65, 0x79, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, + 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x4b, 0x65, 0x79, 0x12, 0x3d, 0x0a, 0x1b, 0x6b, 0x75, 0x62, 0x65, + 0x6c, 0x65, 0x74, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x5f, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x18, 0x6b, + 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x65, 0x72, 0x74, + 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x1a, 0x3f, 0x0a, 0x11, 0x4b, 0x75, 0x62, 0x65, 0x6c, + 0x65, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x31, 0x0a, 0x05, 0x54, 0x61, 0x69, 0x6e, - 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x2a, 0x74, 0x0a, 0x0f, 0x4b, - 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, - 0x0a, 0x1d, 0x4b, 0x55, 0x42, 0x45, 0x4c, 0x45, 0x54, 0x5f, 0x44, 0x49, 0x53, 0x4b, 0x5f, 0x54, - 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, - 0x00, 0x12, 0x1d, 0x0a, 0x19, 0x4b, 0x55, 0x42, 0x45, 0x4c, 0x45, 0x54, 0x5f, 0x44, 0x49, 0x53, - 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4f, 0x53, 0x5f, 0x44, 0x49, 0x53, 0x4b, 0x10, 0x01, - 0x12, 0x1f, 0x0a, 0x1b, 0x4b, 0x55, 0x42, 0x45, 0x4c, 0x45, 0x54, 0x5f, 0x44, 0x49, 0x53, 0x4b, - 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x54, 0x45, 0x4d, 0x50, 0x5f, 0x44, 0x49, 0x53, 0x4b, 0x10, - 0x02, 0x42, 0xbe, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, - 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x12, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, - 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, - 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, - 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, - 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, - 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, - 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, - 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, - 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, - 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x4b, 0x75, 0x62, 0x65, + 0x6c, 0x65, 0x74, 0x4e, 0x6f, 0x64, 0x65, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x31, + 0x0a, 0x05, 0x54, 0x61, 0x69, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, + 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, + 0x74, 0x2a, 0x74, 0x0a, 0x0f, 0x4b, 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x44, 0x69, 0x73, 0x6b, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x1d, 0x4b, 0x55, 0x42, 0x45, 0x4c, 0x45, 0x54, 0x5f, + 0x44, 0x49, 0x53, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, + 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1d, 0x0a, 0x19, 0x4b, 0x55, 0x42, 0x45, 0x4c, + 0x45, 0x54, 0x5f, 0x44, 0x49, 0x53, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x4f, 0x53, 0x5f, + 0x44, 0x49, 0x53, 0x4b, 0x10, 0x01, 0x12, 0x1f, 0x0a, 0x1b, 0x4b, 0x55, 0x42, 0x45, 0x4c, 0x45, + 0x54, 0x5f, 0x44, 0x49, 0x53, 0x4b, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x54, 0x45, 0x4d, 0x50, + 0x5f, 0x44, 0x49, 0x53, 0x4b, 0x10, 0x02, 0x42, 0xbe, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, + 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x12, 0x4b, + 0x75, 0x62, 0x65, 0x6c, 0x65, 0x74, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x41, 0x7a, 0x75, 0x72, 0x65, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x6b, 0x65, 0x72, + 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x62, 0x63, 0x6f, 0x6e, + 0x74, 0x72, 0x61, 0x63, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x6e, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x72, + 0x61, 0x63, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x4e, 0x62, + 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0d, 0x4e, 0x62, + 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x19, 0x4e, 0x62, + 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x4e, 0x62, 0x63, 0x6f, 0x6e, 0x74, + 0x72, 0x61, 0x63, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -342,7 +327,6 @@ var file_pkg_proto_nbcontract_v1_kubeletconfig_proto_goTypes = []interface{}{ (*Taint)(nil), // 2: nbcontract.v1.Taint nil, // 3: nbcontract.v1.KubeletConfig.KubeletFlagsEntry nil, // 4: nbcontract.v1.KubeletConfig.KubeletNodeLabelsEntry - (FeatureState)(0), // 5: nbcontract.v1.FeatureState } var file_pkg_proto_nbcontract_v1_kubeletconfig_proto_depIdxs = []int32{ 3, // 0: nbcontract.v1.KubeletConfig.kubelet_flags:type_name -> nbcontract.v1.KubeletConfig.KubeletFlagsEntry @@ -350,12 +334,11 @@ var file_pkg_proto_nbcontract_v1_kubeletconfig_proto_depIdxs = []int32{ 2, // 2: nbcontract.v1.KubeletConfig.taints:type_name -> nbcontract.v1.Taint 2, // 3: nbcontract.v1.KubeletConfig.startup_taints:type_name -> nbcontract.v1.Taint 0, // 4: nbcontract.v1.KubeletConfig.kubelet_disk_type:type_name -> nbcontract.v1.KubeletDiskType - 5, // 5: nbcontract.v1.KubeletConfig.kubelet_config_file_status:type_name -> nbcontract.v1.FeatureState - 6, // [6:6] is the sub-list for method output_type - 6, // [6:6] is the sub-list for method input_type - 6, // [6:6] is the sub-list for extension type_name - 6, // [6:6] is the sub-list for extension extendee - 0, // [0:6] is the sub-list for field type_name + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_pkg_proto_nbcontract_v1_kubeletconfig_proto_init() } diff --git a/pkg/proto/nbcontract/v1/kubeletconfig.proto b/pkg/proto/nbcontract/v1/kubeletconfig.proto index bdc15f4d3ab..1a0bdaa4610 100644 --- a/pkg/proto/nbcontract/v1/kubeletconfig.proto +++ b/pkg/proto/nbcontract/v1/kubeletconfig.proto @@ -10,13 +10,10 @@ message KubeletConfig { repeated Taint startup_taints = 4; KubeletDiskType kubelet_disk_type = 5; - // kubelet_config_file_status specifies if the kubelet_config_file_content should be applied. - FeatureState kubelet_config_file_status = 6; - // kubelet_config_file_content is the content of the kubelet config file. - string kubelet_config_file_content = 7; - string kubelet_client_key = 8; - string kubelet_client_cert_content = 9; + string kubelet_config_file_content = 6; + string kubelet_client_key = 7; + string kubelet_client_cert_content = 8; } message Taint {