Skip to content

Commit

Permalink
Update to v1.28.13, v1.29.8, v1.30.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@Arnavion
Arnavion committed Aug 15, 2024
1 parent 01bbc51 commit 9c6d179
Show file tree
Hide file tree
Showing 24 changed files with 125 additions and 191 deletions.
68 changes: 0 additions & 68 deletions k8s-openapi-codegen/src/fixups/upstream_bugs.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,74 +296,6 @@ pub(crate) mod required_properties {

Err("never applied admissionregistration.k8s.io/v1alpha1.ValidatingAdmissionPolicyList required properties override".into())
}

// `ValidatingAdmissionPolicyBindingList::items`
pub(crate) fn beta1_validating_admission_policy_binding_list(spec: &mut crate::swagger20::Spec) -> Result<(), crate::Error> {
let definition_path = crate::swagger20::DefinitionPath("io.k8s.api.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList".to_owned());
if let Some(definition) = spec.definitions.get_mut(&definition_path) {
if let crate::swagger20::SchemaKind::Properties(properties) = &mut definition.kind {
if let Some(property) = properties.get_mut("items") {
if !property.1 {
property.1 = true;
return Ok(());
}
}
}
}

Err("never applied admissionregistration.k8s.io/v1beta1.ValidatingAdmissionPolicyBindingList required properties override".into())
}

// `ValidatingAdmissionPolicyList::items`
pub(crate) fn beta1_validating_admission_policy_list(spec: &mut crate::swagger20::Spec) -> Result<(), crate::Error> {
let definition_path = crate::swagger20::DefinitionPath("io.k8s.api.admissionregistration.v1beta1.ValidatingAdmissionPolicyList".to_owned());
if let Some(definition) = spec.definitions.get_mut(&definition_path) {
if let crate::swagger20::SchemaKind::Properties(properties) = &mut definition.kind {
if let Some(property) = properties.get_mut("items") {
if !property.1 {
property.1 = true;
return Ok(());
}
}
}
}

Err("never applied admissionregistration.k8s.io/v1beta1.ValidatingAdmissionPolicyList required properties override".into())
}

// `ValidatingAdmissionPolicyBindingList::items`
pub(crate) fn validating_admission_policy_binding_list(spec: &mut crate::swagger20::Spec) -> Result<(), crate::Error> {
let definition_path = crate::swagger20::DefinitionPath("io.k8s.api.admissionregistration.v1.ValidatingAdmissionPolicyBindingList".to_owned());
if let Some(definition) = spec.definitions.get_mut(&definition_path) {
if let crate::swagger20::SchemaKind::Properties(properties) = &mut definition.kind {
if let Some(property) = properties.get_mut("items") {
if !property.1 {
property.1 = true;
return Ok(());
}
}
}
}

Err("never applied admissionregistration.k8s.io/v1.ValidatingAdmissionPolicyBindingList required properties override".into())
}

// `ValidatingAdmissionPolicyList::items`
pub(crate) fn validating_admission_policy_list(spec: &mut crate::swagger20::Spec) -> Result<(), crate::Error> {
let definition_path = crate::swagger20::DefinitionPath("io.k8s.api.admissionregistration.v1.ValidatingAdmissionPolicyList".to_owned());
if let Some(definition) = spec.definitions.get_mut(&definition_path) {
if let crate::swagger20::SchemaKind::Properties(properties) = &mut definition.kind {
if let Some(property) = properties.get_mut("items") {
if !property.1 {
property.1 = true;
return Ok(());
}
}
}
}

Err("never applied admissionregistration.k8s.io/v1.ValidatingAdmissionPolicyList required properties override".into())
}
}

// `Status` has extra group-version-kind entries than the original `"":v1:Status` that cause it to not be detected as a `Resource`.
Expand Down
20 changes: 3 additions & 17 deletions k8s-openapi-codegen/src/supported_version.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ impl SupportedVersion {
SupportedVersion::V1_25 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.25.16/api/openapi-spec/swagger.json",
SupportedVersion::V1_26 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.26.15/api/openapi-spec/swagger.json",
SupportedVersion::V1_27 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.27.16/api/openapi-spec/swagger.json",
SupportedVersion::V1_28 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.28.12/api/openapi-spec/swagger.json",
SupportedVersion::V1_29 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.29.7/api/openapi-spec/swagger.json",
SupportedVersion::V1_30 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.30.3/api/openapi-spec/swagger.json",
SupportedVersion::V1_28 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.28.13/api/openapi-spec/swagger.json",
SupportedVersion::V1_29 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.29.8/api/openapi-spec/swagger.json",
SupportedVersion::V1_30 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.30.4/api/openapi-spec/swagger.json",
SupportedVersion::V1_31 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.31.0/api/openapi-spec/swagger.json",
}
}
Expand Down Expand Up @@ -125,10 +125,6 @@ impl SupportedVersion {
SupportedVersion::V1_28 => &[
crate::fixups::upstream_bugs::connect_options_gvk,
crate::fixups::upstream_bugs::optional_properties::eventsv1_event,
crate::fixups::upstream_bugs::required_properties::alpha1_validating_admission_policy_binding_list,
crate::fixups::upstream_bugs::required_properties::alpha1_validating_admission_policy_list,
crate::fixups::upstream_bugs::required_properties::beta1_validating_admission_policy_binding_list,
crate::fixups::upstream_bugs::required_properties::beta1_validating_admission_policy_list,
crate::fixups::upstream_bugs::required_properties::config_map_env_source,
crate::fixups::upstream_bugs::required_properties::config_map_key_selector,
crate::fixups::upstream_bugs::required_properties::config_map_projection,
Expand All @@ -146,10 +142,6 @@ impl SupportedVersion {
SupportedVersion::V1_29 => &[
crate::fixups::upstream_bugs::connect_options_gvk,
crate::fixups::upstream_bugs::optional_properties::eventsv1_event,
crate::fixups::upstream_bugs::required_properties::alpha1_validating_admission_policy_binding_list,
crate::fixups::upstream_bugs::required_properties::alpha1_validating_admission_policy_list,
crate::fixups::upstream_bugs::required_properties::beta1_validating_admission_policy_binding_list,
crate::fixups::upstream_bugs::required_properties::beta1_validating_admission_policy_list,
crate::fixups::upstream_bugs::required_properties::config_map_env_source,
crate::fixups::upstream_bugs::required_properties::config_map_key_selector,
crate::fixups::upstream_bugs::required_properties::config_map_projection,
Expand All @@ -165,10 +157,6 @@ impl SupportedVersion {
SupportedVersion::V1_30 => &[
crate::fixups::upstream_bugs::connect_options_gvk,
crate::fixups::upstream_bugs::optional_properties::eventsv1_event,
crate::fixups::upstream_bugs::required_properties::alpha1_validating_admission_policy_binding_list,
crate::fixups::upstream_bugs::required_properties::alpha1_validating_admission_policy_list,
crate::fixups::upstream_bugs::required_properties::beta1_validating_admission_policy_binding_list,
crate::fixups::upstream_bugs::required_properties::beta1_validating_admission_policy_list,
crate::fixups::upstream_bugs::required_properties::config_map_env_source,
crate::fixups::upstream_bugs::required_properties::config_map_key_selector,
crate::fixups::upstream_bugs::required_properties::config_map_projection,
Expand All @@ -177,8 +165,6 @@ impl SupportedVersion {
crate::fixups::upstream_bugs::required_properties::secret_env_source,
crate::fixups::upstream_bugs::required_properties::secret_key_selector,
crate::fixups::upstream_bugs::required_properties::secret_projection,
crate::fixups::upstream_bugs::required_properties::validating_admission_policy_binding_list,
crate::fixups::upstream_bugs::required_properties::validating_admission_policy_list,
crate::fixups::upstream_bugs::status_extra_gvk,
],

Expand Down
Loading

0 comments on commit 9c6d179

Please sign in to comment.