Skip to content

Commit

Permalink
fix compile errors
Browse files Browse the repository at this point in the history 
Signed-off-by: Sebastian Hoß <[email protected]>
  • Loading branch information
@sebhoss
sebhoss committed Apr 12, 2024
1 parent 618eda3 commit 8c9d515
Show file tree
Hide file tree
Showing 80 changed files with 646 additions and 8,421 deletions.
Empty file added crd-catalog/flanksource/canary-checker/canaries.flanksource.com/v1/canaries.ignore
View file
Empty file.
1 change: 1 addition & 0 deletions crd-catalog/kubernetes-sigs/gateway-api/gateway.networking.k8s.io/v1/grpcroutes.args
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--derive=PartialEq
1 change: 0 additions & 1 deletion kube-custom-resources-rs/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ bus_volcano_sh = []
cache_kubedl_io = []
caching_ibm_com = []
camel_apache_org = []
canaries_flanksource_com = []
capabilities_3scale_net = []
capsule_clastix_io = []
cassandra_datastax_com = []
Expand Down
3 changes: 1 addition & 2 deletions kube-custom-resources-rs/src/acme_cert_manager_io/v1/challenges.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use kube::CustomResource;
use serde::{Serialize, Deserialize};
use std::collections::BTreeMap;
use std::collections::HashMap;

#[derive(CustomResource, Serialize, Deserialize, Clone, Debug, PartialEq)]
#[kube(group = "acme.cert-manager.io", version = "v1", kind = "Challenge", plural = "challenges")]
Expand Down Expand Up @@ -523,7 +522,7 @@ pub struct ChallengeSolverDns01Webhook {
/// For details on the schema of this field, consult the webhook provider
/// implementation's documentation.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub config: Option<HashMap<String, serde_json::Value>>,
pub config: Option<BTreeMap<String, serde_json::Value>>,
/// The API group name that should be used when POSTing ChallengePayload
/// resources to the webhook apiserver.
/// This should be the same as the GroupName specified in the webhook
Expand Down
3 changes: 1 addition & 2 deletions kube-custom-resources-rs/src/apps_kubeblocks_io/v1alpha1/configconstraints.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use kube::CustomResource;
use serde::{Serialize, Deserialize};
use std::collections::BTreeMap;
use std::collections::HashMap;
use k8s_openapi::apimachinery::pkg::util::intstr::IntOrString;

/// ConfigConstraintSpec defines the desired state of ConfigConstraint
Expand Down Expand Up @@ -65,7 +64,7 @@ pub struct ConfigConstraintConfigurationSchema {
pub cue: Option<String>,
/// Transforms the schema from CUE to json for further OpenAPI validation
#[serde(default, skip_serializing_if = "Option::is_none")]
pub schema: Option<HashMap<String, serde_json::Value>>,
pub schema: Option<BTreeMap<String, serde_json::Value>>,
}

#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
Expand Down
3 changes: 1 addition & 2 deletions kube-custom-resources-rs/src/apps_kubeblocks_io/v1beta1/configconstraints.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use kube::CustomResource;
use serde::{Serialize, Deserialize};
use std::collections::BTreeMap;
use std::collections::HashMap;
use k8s_openapi::apimachinery::pkg::util::intstr::IntOrString;

/// ConfigConstraintSpec defines the desired state of ConfigConstraint
Expand Down Expand Up @@ -65,7 +64,7 @@ pub struct ConfigConstraintConfigSchema {
pub cue: Option<String>,
/// Transforms the schema from CUE to json for further OpenAPI validation
#[serde(default, skip_serializing_if = "Option::is_none", rename = "schemaInJSON")]
pub schema_in_json: Option<HashMap<String, serde_json::Value>>,
pub schema_in_json: Option<BTreeMap<String, serde_json::Value>>,
}

#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
Expand Down
3 changes: 1 addition & 2 deletions kube-custom-resources-rs/src/awx_ansible_com/v1beta1/awxs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use kube::CustomResource;
use serde::{Serialize, Deserialize};
use std::collections::BTreeMap;
use std::collections::HashMap;

#[derive(CustomResource, Serialize, Deserialize, Clone, Debug, Default, PartialEq)]
#[kube(group = "awx.ansible.com", version = "v1beta1", kind = "AWX", plural = "awxs")]
Expand Down Expand Up @@ -848,7 +847,7 @@ pub struct AWXExtraSettings {
#[serde(default, skip_serializing_if = "Option::is_none")]
pub setting: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub value: Option<HashMap<String, serde_json::Value>>,
pub value: Option<BTreeMap<String, serde_json::Value>>,
}

#[derive(Serialize, Deserialize, Clone, Debug, Default, PartialEq)]
Expand Down
25 changes: 12 additions & 13 deletions kube-custom-resources-rs/src/camel_apache_org/v1/kamelets.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use kube::CustomResource;
use serde::{Serialize, Deserialize};
use std::collections::BTreeMap;
use std::collections::HashMap;
use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;

/// the desired specification
Expand Down Expand Up @@ -115,7 +114,7 @@ pub struct KameletDataTypesTypesSchema {
pub description: Option<String>,
/// JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub example: Option<HashMap<String, serde_json::Value>>,
pub example: Option<BTreeMap<String, serde_json::Value>>,
/// ExternalDocumentation allows referencing an external resource for extended documentation.
#[serde(default, skip_serializing_if = "Option::is_none", rename = "externalDocs")]
pub external_docs: Option<KameletDataTypesTypesSchemaExternalDocs>,
Expand Down Expand Up @@ -144,16 +143,16 @@ pub struct KameletDataTypesTypesSchemaExternalDocs {
pub struct KameletDataTypesTypesSchemaProperties {
/// default is a default value for undefined object fields.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub default: Option<HashMap<String, serde_json::Value>>,
pub default: Option<BTreeMap<String, serde_json::Value>>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub deprecated: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub description: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "enum")]
pub r#enum: Option<Vec<HashMap<String, serde_json::Value>>>,
pub r#enum: Option<Vec<BTreeMap<String, serde_json::Value>>>,
/// JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub example: Option<HashMap<String, serde_json::Value>>,
pub example: Option<BTreeMap<String, serde_json::Value>>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "exclusiveMaximum")]
pub exclusive_maximum: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "exclusiveMinimum")]
Expand Down Expand Up @@ -210,7 +209,7 @@ pub struct KameletDefinition {
pub description: Option<String>,
/// JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub example: Option<HashMap<String, serde_json::Value>>,
pub example: Option<BTreeMap<String, serde_json::Value>>,
/// ExternalDocumentation allows referencing an external resource for extended documentation.
#[serde(default, skip_serializing_if = "Option::is_none", rename = "externalDocs")]
pub external_docs: Option<KameletDefinitionExternalDocs>,
Expand Down Expand Up @@ -239,16 +238,16 @@ pub struct KameletDefinitionExternalDocs {
pub struct KameletDefinitionProperties {
/// default is a default value for undefined object fields.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub default: Option<HashMap<String, serde_json::Value>>,
pub default: Option<BTreeMap<String, serde_json::Value>>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub deprecated: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub description: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "enum")]
pub r#enum: Option<Vec<HashMap<String, serde_json::Value>>>,
pub r#enum: Option<Vec<BTreeMap<String, serde_json::Value>>>,
/// JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub example: Option<HashMap<String, serde_json::Value>>,
pub example: Option<BTreeMap<String, serde_json::Value>>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "exclusiveMaximum")]
pub exclusive_maximum: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "exclusiveMinimum")]
Expand Down Expand Up @@ -363,7 +362,7 @@ pub struct KameletTypesSchema {
pub description: Option<String>,
/// JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub example: Option<HashMap<String, serde_json::Value>>,
pub example: Option<BTreeMap<String, serde_json::Value>>,
/// ExternalDocumentation allows referencing an external resource for extended documentation.
#[serde(default, skip_serializing_if = "Option::is_none", rename = "externalDocs")]
pub external_docs: Option<KameletTypesSchemaExternalDocs>,
Expand Down Expand Up @@ -392,16 +391,16 @@ pub struct KameletTypesSchemaExternalDocs {
pub struct KameletTypesSchemaProperties {
/// default is a default value for undefined object fields.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub default: Option<HashMap<String, serde_json::Value>>,
pub default: Option<BTreeMap<String, serde_json::Value>>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub deprecated: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub description: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "enum")]
pub r#enum: Option<Vec<HashMap<String, serde_json::Value>>>,
pub r#enum: Option<Vec<BTreeMap<String, serde_json::Value>>>,
/// JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub example: Option<HashMap<String, serde_json::Value>>,
pub example: Option<BTreeMap<String, serde_json::Value>>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "exclusiveMaximum")]
pub exclusive_maximum: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "exclusiveMinimum")]
Expand Down
25 changes: 12 additions & 13 deletions kube-custom-resources-rs/src/camel_apache_org/v1alpha1/kamelets.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use kube::CustomResource;
use serde::{Serialize, Deserialize};
use std::collections::BTreeMap;
use std::collections::HashMap;
use k8s_openapi::apimachinery::pkg::apis::meta::v1::Condition;

/// the desired specification.
Expand Down Expand Up @@ -115,7 +114,7 @@ pub struct KameletDataTypesTypesSchema {
pub description: Option<String>,
/// JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub example: Option<HashMap<String, serde_json::Value>>,
pub example: Option<BTreeMap<String, serde_json::Value>>,
/// ExternalDocumentation allows referencing an external resource for extended documentation.
#[serde(default, skip_serializing_if = "Option::is_none", rename = "externalDocs")]
pub external_docs: Option<KameletDataTypesTypesSchemaExternalDocs>,
Expand Down Expand Up @@ -144,16 +143,16 @@ pub struct KameletDataTypesTypesSchemaExternalDocs {
pub struct KameletDataTypesTypesSchemaProperties {
/// default is a default value for undefined object fields.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub default: Option<HashMap<String, serde_json::Value>>,
pub default: Option<BTreeMap<String, serde_json::Value>>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub deprecated: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub description: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "enum")]
pub r#enum: Option<Vec<HashMap<String, serde_json::Value>>>,
pub r#enum: Option<Vec<BTreeMap<String, serde_json::Value>>>,
/// JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub example: Option<HashMap<String, serde_json::Value>>,
pub example: Option<BTreeMap<String, serde_json::Value>>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "exclusiveMaximum")]
pub exclusive_maximum: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "exclusiveMinimum")]
Expand Down Expand Up @@ -210,7 +209,7 @@ pub struct KameletDefinition {
pub description: Option<String>,
/// JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub example: Option<HashMap<String, serde_json::Value>>,
pub example: Option<BTreeMap<String, serde_json::Value>>,
/// ExternalDocumentation allows referencing an external resource for extended documentation.
#[serde(default, skip_serializing_if = "Option::is_none", rename = "externalDocs")]
pub external_docs: Option<KameletDefinitionExternalDocs>,
Expand Down Expand Up @@ -239,16 +238,16 @@ pub struct KameletDefinitionExternalDocs {
pub struct KameletDefinitionProperties {
/// default is a default value for undefined object fields.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub default: Option<HashMap<String, serde_json::Value>>,
pub default: Option<BTreeMap<String, serde_json::Value>>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub deprecated: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub description: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "enum")]
pub r#enum: Option<Vec<HashMap<String, serde_json::Value>>>,
pub r#enum: Option<Vec<BTreeMap<String, serde_json::Value>>>,
/// JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub example: Option<HashMap<String, serde_json::Value>>,
pub example: Option<BTreeMap<String, serde_json::Value>>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "exclusiveMaximum")]
pub exclusive_maximum: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "exclusiveMinimum")]
Expand Down Expand Up @@ -363,7 +362,7 @@ pub struct KameletTypesSchema {
pub description: Option<String>,
/// JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub example: Option<HashMap<String, serde_json::Value>>,
pub example: Option<BTreeMap<String, serde_json::Value>>,
/// ExternalDocumentation allows referencing an external resource for extended documentation.
#[serde(default, skip_serializing_if = "Option::is_none", rename = "externalDocs")]
pub external_docs: Option<KameletTypesSchemaExternalDocs>,
Expand Down Expand Up @@ -392,16 +391,16 @@ pub struct KameletTypesSchemaExternalDocs {
pub struct KameletTypesSchemaProperties {
/// default is a default value for undefined object fields.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub default: Option<HashMap<String, serde_json::Value>>,
pub default: Option<BTreeMap<String, serde_json::Value>>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub deprecated: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none")]
pub description: Option<String>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "enum")]
pub r#enum: Option<Vec<HashMap<String, serde_json::Value>>>,
pub r#enum: Option<Vec<BTreeMap<String, serde_json::Value>>>,
/// JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub example: Option<HashMap<String, serde_json::Value>>,
pub example: Option<BTreeMap<String, serde_json::Value>>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "exclusiveMaximum")]
pub exclusive_maximum: Option<bool>,
#[serde(default, skip_serializing_if = "Option::is_none", rename = "exclusiveMinimum")]
Expand Down
1 change: 0 additions & 1 deletion kube-custom-resources-rs/src/canaries_flanksource_com/mod.rs
View file

This file was deleted.

Loading

0 comments on commit 8c9d515

Please sign in to comment.