From 6d5d359a6f175b2679eb211303e76c1efc02c78e Mon Sep 17 00:00:00 2001 From: Lionel Jouin Date: Thu, 7 Nov 2024 22:19:09 +0100 Subject: [PATCH] [KEP-4817] make update Kubernetes-commit: d84c8d2a647aee3a7b0ac499a55e5f630c71d2a9 --- resource/v1alpha3/generated.proto | 11 +++++++++-- resource/v1alpha3/types_swagger_doc_generated.go | 6 +++--- resource/v1beta1/generated.proto | 11 +++++++++-- resource/v1beta1/types_swagger_doc_generated.go | 6 +++--- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/resource/v1alpha3/generated.proto b/resource/v1alpha3/generated.proto index 26ef30f60..13be7cbd8 100644 --- a/resource/v1alpha3/generated.proto +++ b/resource/v1alpha3/generated.proto @@ -63,11 +63,14 @@ message AllocatedDeviceStatus { // config references, the `Ready` condition should be True. // // +optional - // +listType=atomic + // +listType=map + // +listMapKey=type repeated .k8s.io.apimachinery.pkg.apis.meta.v1.Condition conditions = 4; // Data contains arbitrary driver-specific data. // + // The length of the raw data must be smaller or equal to 10 Ki. + // // +optional optional .k8s.io.apimachinery.pkg.runtime.RawExtension data = 5; @@ -533,7 +536,9 @@ message DeviceSelector { message NetworkDeviceData { // InterfaceName specifies the name of the network interface associated with // the allocated device. This might be the name of a physical or virtual - // network interface. + // network interface being configured in the pod. + // + // Must not be longer than 256 characters. // // +optional optional string interfaceName = 1; @@ -550,6 +555,8 @@ message NetworkDeviceData { // HardwareAddress represents the hardware address (e.g. MAC Address) of the device's network interface. // + // Must not be longer than 128 characters. + // // +optional optional string hardwareAddress = 3; } diff --git a/resource/v1alpha3/types_swagger_doc_generated.go b/resource/v1alpha3/types_swagger_doc_generated.go index ac517b698..1a71d64c1 100644 --- a/resource/v1alpha3/types_swagger_doc_generated.go +++ b/resource/v1alpha3/types_swagger_doc_generated.go @@ -33,7 +33,7 @@ var map_AllocatedDeviceStatus = map[string]string{ "pool": "This name together with the driver name and the device name field identify which device was allocated (`//`).\n\nMust not be longer than 253 characters and may contain one or more DNS sub-domains separated by slashes.", "device": "Device references one device instance via its name in the driver's resource pool. It must be a DNS label.", "conditions": "Conditions contains the latest observation of the device's state. If the device has been configured according to the class and claim config references, the `Ready` condition should be True.", - "data": "Data contains arbitrary driver-specific data.", + "data": "Data contains arbitrary driver-specific data.\n\nThe length of the raw data must be smaller or equal to 10 Ki.", "networkData": "NetworkData contains network-related information specific to the device.", } @@ -227,9 +227,9 @@ func (DeviceSelector) SwaggerDoc() map[string]string { var map_NetworkDeviceData = map[string]string{ "": "NetworkDeviceData provides network-related details for the allocated device. This information may be filled by drivers or other components to configure or identify the device within a network context.", - "interfaceName": "InterfaceName specifies the name of the network interface associated with the allocated device. This might be the name of a physical or virtual network interface.", + "interfaceName": "InterfaceName specifies the name of the network interface associated with the allocated device. This might be the name of a physical or virtual network interface being configured in the pod.\n\nMust not be longer than 256 characters.", "ips": "IPs lists the network addresses assigned to the device's network interface. This can include both IPv4 and IPv6 addresses. The IPs are in the CIDR notation, which includes both the address and the associated subnet mask. e.g.: \"192.0.2.5/24\" for IPv4 and \"2001:db8::5/64\" for IPv6.", - "hardwareAddress": "HardwareAddress represents the hardware address (e.g. MAC Address) of the device's network interface.", + "hardwareAddress": "HardwareAddress represents the hardware address (e.g. MAC Address) of the device's network interface.\n\nMust not be longer than 128 characters.", } func (NetworkDeviceData) SwaggerDoc() map[string]string { diff --git a/resource/v1beta1/generated.proto b/resource/v1beta1/generated.proto index 869af6a03..6d525d5b8 100644 --- a/resource/v1beta1/generated.proto +++ b/resource/v1beta1/generated.proto @@ -63,11 +63,14 @@ message AllocatedDeviceStatus { // config references, the `Ready` condition should be True. // // +optional - // +listType=atomic + // +listType=map + // +listMapKey=type repeated .k8s.io.apimachinery.pkg.apis.meta.v1.Condition conditions = 4; // Data contains arbitrary driver-specific data. // + // The length of the raw data must be smaller or equal to 10 Ki. + // // +optional optional .k8s.io.apimachinery.pkg.runtime.RawExtension data = 5; @@ -541,7 +544,9 @@ message DeviceSelector { message NetworkDeviceData { // InterfaceName specifies the name of the network interface associated with // the allocated device. This might be the name of a physical or virtual - // network interface. + // network interface being configured in the pod. + // + // Must not be longer than 256 characters. // // +optional optional string interfaceName = 1; @@ -558,6 +563,8 @@ message NetworkDeviceData { // HardwareAddress represents the hardware address (e.g. MAC Address) of the device's network interface. // + // Must not be longer than 128 characters. + // // +optional optional string hardwareAddress = 3; } diff --git a/resource/v1beta1/types_swagger_doc_generated.go b/resource/v1beta1/types_swagger_doc_generated.go index 20aebf757..1d0176cbc 100644 --- a/resource/v1beta1/types_swagger_doc_generated.go +++ b/resource/v1beta1/types_swagger_doc_generated.go @@ -33,7 +33,7 @@ var map_AllocatedDeviceStatus = map[string]string{ "pool": "This name together with the driver name and the device name field identify which device was allocated (`//`).\n\nMust not be longer than 253 characters and may contain one or more DNS sub-domains separated by slashes.", "device": "Device references one device instance via its name in the driver's resource pool. It must be a DNS label.", "conditions": "Conditions contains the latest observation of the device's state. If the device has been configured according to the class and claim config references, the `Ready` condition should be True.", - "data": "Data contains arbitrary driver-specific data.", + "data": "Data contains arbitrary driver-specific data.\n\nThe length of the raw data must be smaller or equal to 10 Ki.", "networkData": "NetworkData contains network-related information specific to the device.", } @@ -236,9 +236,9 @@ func (DeviceSelector) SwaggerDoc() map[string]string { var map_NetworkDeviceData = map[string]string{ "": "NetworkDeviceData provides network-related details for the allocated device. This information may be filled by drivers or other components to configure or identify the device within a network context.", - "interfaceName": "InterfaceName specifies the name of the network interface associated with the allocated device. This might be the name of a physical or virtual network interface.", + "interfaceName": "InterfaceName specifies the name of the network interface associated with the allocated device. This might be the name of a physical or virtual network interface being configured in the pod.\n\nMust not be longer than 256 characters.", "ips": "IPs lists the network addresses assigned to the device's network interface. This can include both IPv4 and IPv6 addresses. The IPs are in the CIDR notation, which includes both the address and the associated subnet mask. e.g.: \"192.0.2.5/24\" for IPv4 and \"2001:db8::5/64\" for IPv6.", - "hardwareAddress": "HardwareAddress represents the hardware address (e.g. MAC Address) of the device's network interface.", + "hardwareAddress": "HardwareAddress represents the hardware address (e.g. MAC Address) of the device's network interface.\n\nMust not be longer than 128 characters.", } func (NetworkDeviceData) SwaggerDoc() map[string]string {