From aca7d1fc50778d8420eff7ac86c6a7e8ae3239dc Mon Sep 17 00:00:00 2001 From: clux Date: Mon, 15 Jul 2024 22:15:55 +0100 Subject: [PATCH 1/3] Fix build turned out to be a justfile issue rather than prost Signed-off-by: clux --- justfile | 2 +- k8s-pb-codegen/protos.list | 62 +++++++++---------- .../src/api/apiserverinternal/v1alpha1/mod.rs | 2 +- k8s-pb/src/api/apps/v1/mod.rs | 2 +- k8s-pb/src/api/apps/v1beta1/mod.rs | 6 +- k8s-pb/src/api/apps/v1beta2/mod.rs | 4 +- k8s-pb/src/api/autoscaling/v1/mod.rs | 4 +- k8s-pb/src/api/core/v1/mod.rs | 16 ++--- k8s-pb/src/api/discovery/v1/mod.rs | 2 +- k8s-pb/src/api/discovery/v1beta1/mod.rs | 2 +- k8s-pb/src/api/events/v1/mod.rs | 2 +- k8s-pb/src/api/events/v1beta1/mod.rs | 2 +- k8s-pb/src/api/extensions/v1beta1/mod.rs | 4 +- k8s-pb/src/api/flowcontrol/v1/mod.rs | 4 +- k8s-pb/src/api/flowcontrol/v1beta1/mod.rs | 4 +- k8s-pb/src/api/flowcontrol/v1beta2/mod.rs | 4 +- k8s-pb/src/api/flowcontrol/v1beta3/mod.rs | 4 +- k8s-pb/src/api/storage/v1/mod.rs | 2 +- k8s-pb/src/api/storage/v1beta1/mod.rs | 2 +- .../pkg/apis/apiextensions/v1/mod.rs | 2 +- .../pkg/apis/apiextensions/v1beta1/mod.rs | 2 +- .../src/apimachinery/pkg/apis/meta/v1/mod.rs | 10 +-- 22 files changed, 72 insertions(+), 72 deletions(-) diff --git a/justfile b/justfile index 3f9eab6..e334218 100644 --- a/justfile +++ b/justfile @@ -73,5 +73,5 @@ codegen: rm -rf tmp/ && mkdir tmp cargo run -[hide] +[private] renovate: swagger protos codegen diff --git a/k8s-pb-codegen/protos.list b/k8s-pb-codegen/protos.list index b4a825c..a5cbf43 100644 --- a/k8s-pb-codegen/protos.list +++ b/k8s-pb-codegen/protos.list @@ -1,71 +1,71 @@ -protos/api/admission/v1/generated.proto -protos/api/admission/v1beta1/generated.proto -protos/api/admissionregistration/v1/generated.proto protos/api/admissionregistration/v1alpha1/generated.proto protos/api/admissionregistration/v1beta1/generated.proto -protos/api/apidiscovery/v2/generated.proto +protos/api/admissionregistration/v1/generated.proto +protos/api/admission/v1beta1/generated.proto +protos/api/admission/v1/generated.proto protos/api/apidiscovery/v2beta1/generated.proto +protos/api/apidiscovery/v2/generated.proto protos/api/apiserverinternal/v1alpha1/generated.proto -protos/api/apps/v1/generated.proto protos/api/apps/v1beta1/generated.proto protos/api/apps/v1beta2/generated.proto -protos/api/authentication/v1/generated.proto +protos/api/apps/v1/generated.proto protos/api/authentication/v1alpha1/generated.proto protos/api/authentication/v1beta1/generated.proto -protos/api/authorization/v1/generated.proto +protos/api/authentication/v1/generated.proto protos/api/authorization/v1beta1/generated.proto +protos/api/authorization/v1/generated.proto protos/api/autoscaling/v1/generated.proto -protos/api/autoscaling/v2/generated.proto protos/api/autoscaling/v2beta1/generated.proto protos/api/autoscaling/v2beta2/generated.proto -protos/api/batch/v1/generated.proto +protos/api/autoscaling/v2/generated.proto protos/api/batch/v1beta1/generated.proto -protos/api/certificates/v1/generated.proto +protos/api/batch/v1/generated.proto protos/api/certificates/v1alpha1/generated.proto protos/api/certificates/v1beta1/generated.proto -protos/api/coordination/v1/generated.proto +protos/api/certificates/v1/generated.proto protos/api/coordination/v1beta1/generated.proto +protos/api/coordination/v1/generated.proto protos/api/core/v1/generated.proto -protos/api/discovery/v1/generated.proto protos/api/discovery/v1beta1/generated.proto -protos/api/events/v1/generated.proto +protos/api/discovery/v1/generated.proto protos/api/events/v1beta1/generated.proto +protos/api/events/v1/generated.proto +protos/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto +protos/apiextensions-apiserver/pkg/apis/apiextensions/v1/generated.proto protos/api/extensions/v1beta1/generated.proto -protos/api/flowcontrol/v1/generated.proto protos/api/flowcontrol/v1beta1/generated.proto protos/api/flowcontrol/v1beta2/generated.proto protos/api/flowcontrol/v1beta3/generated.proto +protos/api/flowcontrol/v1/generated.proto protos/api/imagepolicy/v1alpha1/generated.proto -protos/api/networking/v1/generated.proto +protos/apimachinery/pkg/api/resource/generated.proto +protos/apimachinery/pkg/apis/meta/v1beta1/generated.proto +protos/apimachinery/pkg/apis/meta/v1/generated.proto +protos/apimachinery/pkg/apis/testapigroup/v1/generated.proto +protos/apimachinery/pkg/runtime/generated.proto +protos/apimachinery/pkg/runtime/schema/generated.proto +protos/apimachinery/pkg/util/intstr/generated.proto protos/api/networking/v1alpha1/generated.proto protos/api/networking/v1beta1/generated.proto -protos/api/node/v1/generated.proto +protos/api/networking/v1/generated.proto protos/api/node/v1alpha1/generated.proto protos/api/node/v1beta1/generated.proto -protos/api/policy/v1/generated.proto +protos/api/node/v1/generated.proto protos/api/policy/v1beta1/generated.proto -protos/api/rbac/v1/generated.proto +protos/api/policy/v1/generated.proto protos/api/rbac/v1alpha1/generated.proto protos/api/rbac/v1beta1/generated.proto +protos/api/rbac/v1/generated.proto protos/api/resource/v1alpha2/generated.proto -protos/api/scheduling/v1/generated.proto protos/api/scheduling/v1alpha1/generated.proto protos/api/scheduling/v1beta1/generated.proto -protos/api/storage/v1/generated.proto +protos/api/scheduling/v1/generated.proto +protos/api/storagemigration/v1alpha1/generated.proto protos/api/storage/v1alpha1/generated.proto protos/api/storage/v1beta1/generated.proto -protos/api/storagemigration/v1alpha1/generated.proto -protos/apiextensions-apiserver/pkg/apis/apiextensions/v1/generated.proto -protos/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto -protos/apimachinery/pkg/api/resource/generated.proto -protos/apimachinery/pkg/apis/meta/v1/generated.proto -protos/apimachinery/pkg/apis/meta/v1beta1/generated.proto -protos/apimachinery/pkg/apis/testapigroup/v1/generated.proto -protos/apimachinery/pkg/runtime/generated.proto -protos/apimachinery/pkg/runtime/schema/generated.proto -protos/apimachinery/pkg/util/intstr/generated.proto -protos/kube-aggregator/pkg/apis/apiregistration/v1/generated.proto +protos/api/storage/v1/generated.proto protos/kube-aggregator/pkg/apis/apiregistration/v1beta1/generated.proto +protos/kube-aggregator/pkg/apis/apiregistration/v1/generated.proto protos/metrics/pkg/apis/custom_metrics/v1beta1/generated.proto protos/metrics/pkg/apis/custom_metrics/v1beta2/generated.proto protos/metrics/pkg/apis/external_metrics/v1beta1/generated.proto diff --git a/k8s-pb/src/api/apiserverinternal/v1alpha1/mod.rs b/k8s-pb/src/api/apiserverinternal/v1alpha1/mod.rs index dca50c3..e3008c1 100644 --- a/k8s-pb/src/api/apiserverinternal/v1alpha1/mod.rs +++ b/k8s-pb/src/api/apiserverinternal/v1alpha1/mod.rs @@ -86,7 +86,7 @@ pub struct StorageVersionList { } /// StorageVersionSpec is an empty spec. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct StorageVersionSpec {} /// API server instances report the versions they can decode and the version they /// encode objects to when persisting objects in the backend. diff --git a/k8s-pb/src/api/apps/v1/mod.rs b/k8s-pb/src/api/apps/v1/mod.rs index 9827441..0adc37d 100644 --- a/k8s-pb/src/api/apps/v1/mod.rs +++ b/k8s-pb/src/api/apps/v1/mod.rs @@ -700,7 +700,7 @@ pub struct StatefulSetList { /// StatefulSetOrdinals describes the policy used for replica ordinal assignment /// in this StatefulSet. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct StatefulSetOrdinals { /// start is the number representing the first replica's index. It may be used /// to number replicas from an alternate index (eg: 1-indexed) over the default diff --git a/k8s-pb/src/api/apps/v1beta1/mod.rs b/k8s-pb/src/api/apps/v1beta1/mod.rs index 86ea0b3..1039da4 100644 --- a/k8s-pb/src/api/apps/v1beta1/mod.rs +++ b/k8s-pb/src/api/apps/v1beta1/mod.rs @@ -242,7 +242,7 @@ pub struct DeploymentStrategy { } /// DEPRECATED. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct RollbackConfig { /// The revision to rollback to. If set to 0, rollback to the last revision. /// +optional @@ -329,7 +329,7 @@ pub struct Scale { } /// ScaleSpec describes the attributes of a scale subresource #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ScaleSpec { /// replicas is the number of observed instances of the scaled object. /// +optional @@ -427,7 +427,7 @@ pub struct StatefulSetList { /// StatefulSetOrdinals describes the policy used for replica ordinal assignment /// in this StatefulSet. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct StatefulSetOrdinals { /// start is the number representing the first replica's index. It may be used /// to number replicas from an alternate index (eg: 1-indexed) over the default diff --git a/k8s-pb/src/api/apps/v1beta2/mod.rs b/k8s-pb/src/api/apps/v1beta2/mod.rs index 579140a..3bfda98 100644 --- a/k8s-pb/src/api/apps/v1beta2/mod.rs +++ b/k8s-pb/src/api/apps/v1beta2/mod.rs @@ -657,7 +657,7 @@ pub struct Scale { } /// ScaleSpec describes the attributes of a scale subresource #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ScaleSpec { /// desired number of instances for the scaled object. /// +optional @@ -756,7 +756,7 @@ pub struct StatefulSetList { /// StatefulSetOrdinals describes the policy used for replica ordinal assignment /// in this StatefulSet. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct StatefulSetOrdinals { /// start is the number representing the first replica's index. It may be used /// to number replicas from an alternate index (eg: 1-indexed) over the default diff --git a/k8s-pb/src/api/autoscaling/v1/mod.rs b/k8s-pb/src/api/autoscaling/v1/mod.rs index 480836d..1a88945 100644 --- a/k8s-pb/src/api/autoscaling/v1/mod.rs +++ b/k8s-pb/src/api/autoscaling/v1/mod.rs @@ -224,7 +224,7 @@ pub struct HorizontalPodAutoscalerSpec { } /// current status of a horizontal pod autoscaler #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct HorizontalPodAutoscalerStatus { /// observedGeneration is the most recent generation observed by this autoscaler. /// +optional @@ -532,7 +532,7 @@ pub struct Scale { } /// ScaleSpec describes the attributes of a scale subresource. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ScaleSpec { /// replicas is the desired number of instances for the scaled object. /// +optional diff --git a/k8s-pb/src/api/core/v1/mod.rs b/k8s-pb/src/api/core/v1/mod.rs index 0851255..f25542d 100644 --- a/k8s-pb/src/api/core/v1/mod.rs +++ b/k8s-pb/src/api/core/v1/mod.rs @@ -461,7 +461,7 @@ pub struct ClaimSource { } /// ClientIPConfig represents the configurations of Client IP based session affinity. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ClientIpConfig { /// timeoutSeconds specifies the seconds of ClientIP type session sticky time. /// The value must be >0 && <=86400(for 1 day) if ServiceAffinity == "ClientIP". @@ -1047,7 +1047,7 @@ pub struct ContainerState { } /// ContainerStateRunning is a running state of a container. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ContainerStateRunning { /// Time at which the container was last (re-)started /// +optional @@ -1195,7 +1195,7 @@ pub struct ContainerStatus { } /// DaemonEndpoint contains information about a single Daemon endpoint. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct DaemonEndpoint { /// Port number of the given endpoint. #[prost(int32, optional, tag = "1")] @@ -1833,7 +1833,7 @@ pub struct EventList { /// EventSeries contain information on series of events, i.e. thing that was/is happening /// continuously for some time. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct EventSeries { /// Number of occurrences in this series up to the last heartbeat time #[prost(int32, optional, tag = "1")] @@ -2858,7 +2858,7 @@ pub struct NodeConfigStatus { } /// NodeDaemonEndpoints lists ports opened by daemons running on the Node. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct NodeDaemonEndpoints { /// Endpoint on which Kubelet is listening. /// +optional @@ -2905,7 +2905,7 @@ pub struct NodeRuntimeHandler { } /// NodeRuntimeHandlerFeatures is a set of runtime features. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct NodeRuntimeHandlerFeatures { /// RecursiveReadOnlyMounts is set to true if the runtime handler supports RecursiveReadOnlyMounts. /// +featureGate=RecursiveReadOnlyMounts @@ -6497,7 +6497,7 @@ pub struct ServiceStatus { } /// SessionAffinityConfig represents the configurations of session affinity. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct SessionAffinityConfig { /// clientIP contains the configurations of Client IP based session affinity. /// +optional @@ -6506,7 +6506,7 @@ pub struct SessionAffinityConfig { } /// SleepAction describes a "sleep" action. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct SleepAction { /// Seconds is the number of seconds to sleep. #[prost(int64, optional, tag = "1")] diff --git a/k8s-pb/src/api/discovery/v1/mod.rs b/k8s-pb/src/api/discovery/v1/mod.rs index 02500fb..56bf8f5 100644 --- a/k8s-pb/src/api/discovery/v1/mod.rs +++ b/k8s-pb/src/api/discovery/v1/mod.rs @@ -57,7 +57,7 @@ pub struct Endpoint { } /// EndpointConditions represents the current condition of an endpoint. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct EndpointConditions { /// ready indicates that this endpoint is prepared to receive traffic, /// according to whatever system is managing the endpoint. A nil value diff --git a/k8s-pb/src/api/discovery/v1beta1/mod.rs b/k8s-pb/src/api/discovery/v1beta1/mod.rs index 7e8ef06..90ef63f 100644 --- a/k8s-pb/src/api/discovery/v1beta1/mod.rs +++ b/k8s-pb/src/api/discovery/v1beta1/mod.rs @@ -61,7 +61,7 @@ pub struct Endpoint { } /// EndpointConditions represents the current condition of an endpoint. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct EndpointConditions { /// ready indicates that this endpoint is prepared to receive traffic, /// according to whatever system is managing the endpoint. A nil value diff --git a/k8s-pb/src/api/events/v1/mod.rs b/k8s-pb/src/api/events/v1/mod.rs index 0dbc31b..91ada0d 100644 --- a/k8s-pb/src/api/events/v1/mod.rs +++ b/k8s-pb/src/api/events/v1/mod.rs @@ -103,7 +103,7 @@ pub struct EventList { /// The default event reporter in "k8s.io/client-go/tools/events/event_broadcaster.go" shows /// how this struct is updated on heartbeats and can guide customized reporter implementations. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct EventSeries { /// count is the number of occurrences in this series up to the last heartbeat time. #[prost(int32, optional, tag = "1")] diff --git a/k8s-pb/src/api/events/v1beta1/mod.rs b/k8s-pb/src/api/events/v1beta1/mod.rs index b78bc8b..23567bf 100644 --- a/k8s-pb/src/api/events/v1beta1/mod.rs +++ b/k8s-pb/src/api/events/v1beta1/mod.rs @@ -105,7 +105,7 @@ pub struct EventList { /// EventSeries contain information on series of events, i.e. thing that was/is happening /// continuously for some time. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct EventSeries { /// count is the number of occurrences in this series up to the last heartbeat time. #[prost(int32, optional, tag = "1")] diff --git a/k8s-pb/src/api/extensions/v1beta1/mod.rs b/k8s-pb/src/api/extensions/v1beta1/mod.rs index 1e72947..51bb565 100644 --- a/k8s-pb/src/api/extensions/v1beta1/mod.rs +++ b/k8s-pb/src/api/extensions/v1beta1/mod.rs @@ -1025,7 +1025,7 @@ pub struct ReplicaSetStatus { } /// DEPRECATED. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct RollbackConfig { /// The revision to rollback to. If set to 0, rollback to the last revision. /// +optional @@ -1137,7 +1137,7 @@ pub struct Scale { } /// describes the attributes of a scale subresource #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ScaleSpec { /// desired number of instances for the scaled object. /// +optional diff --git a/k8s-pb/src/api/flowcontrol/v1/mod.rs b/k8s-pb/src/api/flowcontrol/v1/mod.rs index 4d5458e..b54dd5f 100644 --- a/k8s-pb/src/api/flowcontrol/v1/mod.rs +++ b/k8s-pb/src/api/flowcontrol/v1/mod.rs @@ -4,7 +4,7 @@ /// In the mandatory exempt configuration object the values in the fields /// here can be modified by authorized users, unlike the rest of the `spec`. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ExemptPriorityLevelConfiguration { /// `nominalConcurrencyShares` (NCS) contributes to the computation of the /// NominalConcurrencyLimit (NominalCL) of this level. @@ -417,7 +417,7 @@ pub struct PriorityLevelConfigurationStatus { } /// QueuingConfiguration holds the configuration parameters for queuing #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueuingConfiguration { /// `queues` is the number of queues for this priority level. The /// queues exist independently at each apiserver. The value must be diff --git a/k8s-pb/src/api/flowcontrol/v1beta1/mod.rs b/k8s-pb/src/api/flowcontrol/v1beta1/mod.rs index bf30767..3fc2b21 100644 --- a/k8s-pb/src/api/flowcontrol/v1beta1/mod.rs +++ b/k8s-pb/src/api/flowcontrol/v1beta1/mod.rs @@ -4,7 +4,7 @@ /// In the mandatory exempt configuration object the values in the fields /// here can be modified by authorized users, unlike the rest of the `spec`. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ExemptPriorityLevelConfiguration { /// `nominalConcurrencyShares` (NCS) contributes to the computation of the /// NominalConcurrencyLimit (NominalCL) of this level. @@ -408,7 +408,7 @@ pub struct PriorityLevelConfigurationStatus { } /// QueuingConfiguration holds the configuration parameters for queuing #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueuingConfiguration { /// `queues` is the number of queues for this priority level. The /// queues exist independently at each apiserver. The value must be diff --git a/k8s-pb/src/api/flowcontrol/v1beta2/mod.rs b/k8s-pb/src/api/flowcontrol/v1beta2/mod.rs index bf30767..3fc2b21 100644 --- a/k8s-pb/src/api/flowcontrol/v1beta2/mod.rs +++ b/k8s-pb/src/api/flowcontrol/v1beta2/mod.rs @@ -4,7 +4,7 @@ /// In the mandatory exempt configuration object the values in the fields /// here can be modified by authorized users, unlike the rest of the `spec`. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ExemptPriorityLevelConfiguration { /// `nominalConcurrencyShares` (NCS) contributes to the computation of the /// NominalConcurrencyLimit (NominalCL) of this level. @@ -408,7 +408,7 @@ pub struct PriorityLevelConfigurationStatus { } /// QueuingConfiguration holds the configuration parameters for queuing #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueuingConfiguration { /// `queues` is the number of queues for this priority level. The /// queues exist independently at each apiserver. The value must be diff --git a/k8s-pb/src/api/flowcontrol/v1beta3/mod.rs b/k8s-pb/src/api/flowcontrol/v1beta3/mod.rs index 1e6cb00..1a8eeeb 100644 --- a/k8s-pb/src/api/flowcontrol/v1beta3/mod.rs +++ b/k8s-pb/src/api/flowcontrol/v1beta3/mod.rs @@ -4,7 +4,7 @@ /// In the mandatory exempt configuration object the values in the fields /// here can be modified by authorized users, unlike the rest of the `spec`. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ExemptPriorityLevelConfiguration { /// `nominalConcurrencyShares` (NCS) contributes to the computation of the /// NominalConcurrencyLimit (NominalCL) of this level. @@ -412,7 +412,7 @@ pub struct PriorityLevelConfigurationStatus { } /// QueuingConfiguration holds the configuration parameters for queuing #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct QueuingConfiguration { /// `queues` is the number of queues for this priority level. The /// queues exist independently at each apiserver. The value must be diff --git a/k8s-pb/src/api/storage/v1/mod.rs b/k8s-pb/src/api/storage/v1/mod.rs index ab4e424..97655f6 100644 --- a/k8s-pb/src/api/storage/v1/mod.rs +++ b/k8s-pb/src/api/storage/v1/mod.rs @@ -608,7 +608,7 @@ pub struct VolumeError { } /// VolumeNodeResources is a set of resource limits for scheduling of volumes. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct VolumeNodeResources { /// count indicates the maximum number of unique volumes managed by the CSI driver that can be used on a node. /// A volume that is both attached and mounted on a node is considered to be used once, not twice. diff --git a/k8s-pb/src/api/storage/v1beta1/mod.rs b/k8s-pb/src/api/storage/v1beta1/mod.rs index 1976dbe..091e0fb 100644 --- a/k8s-pb/src/api/storage/v1beta1/mod.rs +++ b/k8s-pb/src/api/storage/v1beta1/mod.rs @@ -610,7 +610,7 @@ pub struct VolumeError { } /// VolumeNodeResources is a set of resource limits for scheduling of volumes. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct VolumeNodeResources { /// count indicates the maximum number of unique volumes managed by the CSI driver that can be used on a node. /// A volume that is both attached and mounted on a node is considered to be used once, not twice. diff --git a/k8s-pb/src/apiextensions_apiserver/pkg/apis/apiextensions/v1/mod.rs b/k8s-pb/src/apiextensions_apiserver/pkg/apis/apiextensions/v1/mod.rs index 0401ab5..69047c5 100644 --- a/k8s-pb/src/apiextensions_apiserver/pkg/apis/apiextensions/v1/mod.rs +++ b/k8s-pb/src/apiextensions_apiserver/pkg/apis/apiextensions/v1/mod.rs @@ -361,7 +361,7 @@ pub struct CustomResourceSubresourceScale { /// * PUT requests to the /status subresource take a custom resource object, and ignore changes to anything except the status stanza /// * PUT/POST/PATCH requests to the custom resource ignore changes to the status stanza #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct CustomResourceSubresourceStatus {} /// CustomResourceSubresources defines the status and scale subresources for CustomResources. #[allow(clippy::derive_partial_eq_without_eq)] diff --git a/k8s-pb/src/apiextensions_apiserver/pkg/apis/apiextensions/v1beta1/mod.rs b/k8s-pb/src/apiextensions_apiserver/pkg/apis/apiextensions/v1beta1/mod.rs index 094efbc..6bd85ae 100644 --- a/k8s-pb/src/apiextensions_apiserver/pkg/apis/apiextensions/v1beta1/mod.rs +++ b/k8s-pb/src/apiextensions_apiserver/pkg/apis/apiextensions/v1beta1/mod.rs @@ -426,7 +426,7 @@ pub struct CustomResourceSubresourceScale { /// * PUT requests to the /status subresource take a custom resource object, and ignore changes to anything except the status stanza /// * PUT/POST/PATCH requests to the custom resource ignore changes to the status stanza #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct CustomResourceSubresourceStatus {} /// CustomResourceSubresources defines the status and scale subresources for CustomResources. #[allow(clippy::derive_partial_eq_without_eq)] diff --git a/k8s-pb/src/apimachinery/pkg/apis/meta/v1/mod.rs b/k8s-pb/src/apimachinery/pkg/apis/meta/v1/mod.rs index 350b509..67bfe40 100644 --- a/k8s-pb/src/apimachinery/pkg/apis/meta/v1/mod.rs +++ b/k8s-pb/src/apimachinery/pkg/apis/meta/v1/mod.rs @@ -315,7 +315,7 @@ pub struct DeleteOptions { /// marshaling to YAML and JSON. In particular, it marshals into strings, which /// can be used as map keys in json. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Duration { #[prost(int64, optional, tag = "1")] pub duration: ::core::option::Option, @@ -686,7 +686,7 @@ pub struct ManagedFieldsEntry { /// +protobuf.as=Timestamp /// +protobuf.options.(gogoproto.goproto_stringer)=false #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MicroTime { /// Represents seconds of UTC time since Unix epoch /// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to @@ -939,7 +939,7 @@ pub struct PartialObjectMetadataList { } /// Patch is provided to give a concrete name and type to the Kubernetes PATCH request body. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Patch {} /// PatchOptions may be provided when patching an API object. /// PatchOptions is meant to be a superset of UpdateOptions. @@ -1156,7 +1156,7 @@ pub struct TableOptions { /// +protobuf.as=Timestamp /// +protobuf.options.(gogoproto.goproto_stringer)=false #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Time { /// Represents seconds of UTC time since Unix epoch /// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to @@ -1174,7 +1174,7 @@ pub struct Time { /// protobuf marshalling/unmarshalling. It is generated into a serialization /// that matches Time. Do not use in Go structs. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Timestamp { /// Represents seconds of UTC time since Unix epoch /// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to From 3570a1b326f1d888c29daf3aabff8252e099a1d6 Mon Sep 17 00:00:00 2001 From: clux Date: Mon, 15 Jul 2024 22:19:53 +0100 Subject: [PATCH 2/3] eehh. try to force a sort order better. Signed-off-by: clux --- justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/justfile b/justfile index e334218..5d064b3 100644 --- a/justfile +++ b/justfile @@ -32,7 +32,7 @@ protos-list: #!/usr/bin/env bash set -exuo pipefail cd k8s-pb-codegen - fd -e proto | sort > protos.list + fd -e proto | sort -hf > protos.list # Download and generate all protos dependent files protos: protos-dl protos-patch protos-list From bffefeaf3aefbed2d58a2530548593f76e1ace95 Mon Sep 17 00:00:00 2001 From: clux Date: Mon, 15 Jul 2024 22:28:10 +0100 Subject: [PATCH 3/3] ok wtf... Signed-off-by: clux --- justfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/justfile b/justfile index 5d064b3..6100d51 100644 --- a/justfile +++ b/justfile @@ -32,7 +32,8 @@ protos-list: #!/usr/bin/env bash set -exuo pipefail cd k8s-pb-codegen - fd -e proto | sort -hf > protos.list + sort --version + fd -e proto | sort -fd > protos.list # Download and generate all protos dependent files protos: protos-dl protos-patch protos-list