Skip to content

Commit

Permalink
Fix build (#41)
Browse files Browse the repository at this point in the history
turned out to be a justfile issue rather than prost

one line justfile change + run the normal build pipeline.
  • Loading branch information
clux committed Jul 15, 2024
2 parents c2897b7 + bffefea commit 0ec5756
Show file tree
Hide file tree
Showing 22 changed files with 74 additions and 73 deletions.
5 changes: 3 additions & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ protos-list:
#!/usr/bin/env bash
set -exuo pipefail
cd k8s-pb-codegen
fd -e proto | sort > 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
Expand Down Expand Up @@ -73,5 +74,5 @@ codegen:
rm -rf tmp/ && mkdir tmp
cargo run
[hide]
[private]
renovate: swagger protos codegen
62 changes: 31 additions & 31 deletions k8s-pb-codegen/protos.list
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion k8s-pb/src/api/apiserverinternal/v1alpha1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion k8s-pb/src/api/apps/v1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions k8s-pb/src/api/apps/v1beta1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s-pb/src/api/apps/v1beta2/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s-pb/src/api/autoscaling/v1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions k8s-pb/src/api/core/v1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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".
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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")]
Expand Down Expand Up @@ -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")]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion k8s-pb/src/api/discovery/v1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion k8s-pb/src/api/discovery/v1beta1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion k8s-pb/src/api/events/v1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion k8s-pb/src/api/events/v1beta1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
4 changes: 2 additions & 2 deletions k8s-pb/src/api/extensions/v1beta1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s-pb/src/api/flowcontrol/v1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s-pb/src/api/flowcontrol/v1beta1/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s-pb/src/api/flowcontrol/v1beta2/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s-pb/src/api/flowcontrol/v1beta3/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 0ec5756

Please sign in to comment.