Add v1.34.0

Author: Arnavion

Cargo.toml

@@ -52,7 +52,8 @@ v1_30 = []
 v1_31 = []
 v1_32 = []
 v1_33 = []
-latest = ["v1_33"]
+v1_34 = []
+latest = ["v1_34"]
 # Enable `schemars::JsonSchema` implementations on resource types.
 schemars = ["dep:schemars"]
 

build.rs

@@ -2,7 +2,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     use std::io::Write;
 
     const MIN: usize = 30;
-    const MAX: usize = 33;
+    const MAX: usize = 34;
 
     println!("cargo::rerun-if-env-changed=K8S_OPENAPI_ENABLED_VERSION");
 

devenv.sh

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 session_name='k8s-openapi'
-max_version='1.33'
+max_version='1.34'
 
 if ! tmux has-session -t "=$session_name"; then
     cd "$(dirname "$0")"

k8s-openapi-codegen/src/fixups/upstream_bugs.rs

@@ -70,6 +70,25 @@ pub(crate) mod optional_properties {
         Err("never applied events.k8s.io/v1.Event optional properties override".into())
     }
 
+    // `NetworkPolicySpec::podSelector`
+    //
+    // Ref: https://github.com/kubernetes/kubernetes/pull/131354
+    pub(crate) fn networkingv1_networkpolicyspec(spec: &mut crate::swagger20::Spec) -> Result<(), crate::Error> {
+        let definition_path = crate::swagger20::DefinitionPath("io.k8s.api.networking.v1.NetworkPolicySpec".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("podSelector") {
+                    if property.1 {
+                        property.1 = false;
+                        return Ok(());
+                    }
+                }
+            }
+        }
+
+        Err("never applied networking.k8s.io/v1.NetworkPolicySpec optional properties override".into())
+    }
+
     // `StatefulSetSpec::serviceName`
     //
     // Ref: https://github.com/kubernetes/kubernetes/pull/130233

k8s-openapi-codegen/src/supported_version.rs

@@ -3,6 +3,7 @@ pub(crate) const ALL: &[SupportedVersion] = &[
     SupportedVersion::V1_31,
     SupportedVersion::V1_32,
     SupportedVersion::V1_33,
+    SupportedVersion::V1_34,
 ];
 
 #[derive(Clone, Copy, Debug)]
@@ -11,6 +12,7 @@ pub(crate) enum SupportedVersion {
     V1_31,
     V1_32,
     V1_33,
+    V1_34,
 }
 
 impl SupportedVersion {
@@ -20,6 +22,7 @@ impl SupportedVersion {
             SupportedVersion::V1_31 => "1.31",
             SupportedVersion::V1_32 => "1.32",
             SupportedVersion::V1_33 => "1.33",
+            SupportedVersion::V1_34 => "1.34",
         }
     }
 
@@ -29,6 +32,7 @@ impl SupportedVersion {
             SupportedVersion::V1_31 => "v1_31",
             SupportedVersion::V1_32 => "v1_32",
             SupportedVersion::V1_33 => "v1_33",
+            SupportedVersion::V1_34 => "v1_34",
         }
     }
 
@@ -38,6 +42,7 @@ impl SupportedVersion {
             SupportedVersion::V1_31 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.31.12/api/openapi-spec/swagger.json",
             SupportedVersion::V1_32 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.32.8/api/openapi-spec/swagger.json",
             SupportedVersion::V1_33 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.33.4/api/openapi-spec/swagger.json",
+            SupportedVersion::V1_34 => "https://raw.githubusercontent.com/kubernetes/kubernetes/v1.34.0/api/openapi-spec/swagger.json",
         }
     }
 
@@ -48,6 +53,7 @@ impl SupportedVersion {
                 crate::fixups::upstream_bugs::connect_options_gvk,
                 crate::fixups::upstream_bugs::optional_properties::appsv1_statefulsetspec,
                 crate::fixups::upstream_bugs::optional_properties::eventsv1_event,
+                crate::fixups::upstream_bugs::optional_properties::networkingv1_networkpolicyspec,
                 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,
@@ -63,6 +69,7 @@ impl SupportedVersion {
                 crate::fixups::upstream_bugs::connect_options_gvk,
                 crate::fixups::upstream_bugs::optional_properties::appsv1_statefulsetspec,
                 crate::fixups::upstream_bugs::optional_properties::eventsv1_event,
+                crate::fixups::upstream_bugs::optional_properties::networkingv1_networkpolicyspec,
                 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,
@@ -77,6 +84,7 @@ impl SupportedVersion {
                 crate::fixups::upstream_bugs::connect_options_gvk,
                 crate::fixups::upstream_bugs::optional_properties::appsv1_statefulsetspec,
                 crate::fixups::upstream_bugs::optional_properties::eventsv1_event,
+                crate::fixups::upstream_bugs::optional_properties::networkingv1_networkpolicyspec,
                 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,
@@ -88,6 +96,20 @@ impl SupportedVersion {
             ],
 
             SupportedVersion::V1_33 => &[
+                crate::fixups::upstream_bugs::connect_options_gvk,
+                crate::fixups::upstream_bugs::optional_properties::eventsv1_event,
+                crate::fixups::upstream_bugs::optional_properties::networkingv1_networkpolicyspec,
+                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,
+                crate::fixups::upstream_bugs::required_properties::config_map_volume_source,
+                crate::fixups::upstream_bugs::required_properties::local_object_reference,
+                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,
+            ],
+
+            SupportedVersion::V1_34 => &[
                 crate::fixups::upstream_bugs::connect_options_gvk,
                 crate::fixups::upstream_bugs::optional_properties::eventsv1_event,
                 crate::fixups::upstream_bugs::required_properties::config_map_env_source,

k8s-openapi-tests-macro-deps/Cargo.toml

@@ -23,3 +23,4 @@ test_v1_30 = ["k8s-openapi/v1_30"]
 test_v1_31 = ["k8s-openapi/v1_31"]
 test_v1_32 = ["k8s-openapi/v1_32"]
 test_v1_33 = ["k8s-openapi/v1_33"]
+test_v1_34 = ["k8s-openapi/v1_34"]

k8s-openapi-tests/Cargo.toml

@@ -57,3 +57,4 @@ test_v1_30 = ["k8s-openapi/v1_30"]
 test_v1_31 = ["k8s-openapi/v1_31"]
 test_v1_32 = ["k8s-openapi/v1_32"]
 test_v1_33 = ["k8s-openapi/v1_33"]
+test_v1_34 = ["k8s-openapi/v1_34"]

k8s-openapi-tests/build.rs

@@ -4,7 +4,7 @@ fn main() {
     // Assert that the DEP_K8S_OPENAPI_*_VERSION is set by the k8s-openapi crate's build script correctly.
 
     const MIN: usize = 30;
-    const MAX: usize = 33;
+    const MAX: usize = 34;
 
     let enabled_version = {
         let mut enabled_versions = (MIN..=MAX).filter(|v| std::env::var(format!("CARGO_FEATURE_TEST_V1_{v}")).is_ok());

k8s-openapi-tests/src/deployment.rs

@@ -37,16 +37,29 @@ async fn list() {
         .labels.expect("couldn't get dns deployment spec template metadata labels");
     assert_eq!(dns_deployment_spec_template_metadata_labels.remove("k8s-app"), Some("kube-dns".to_string()));
 
-    let dns_container_liveness_probe_http_get_action =
+    let dns_container =
         dns_deployment_spec_template
         .spec.expect("couldn't get dns deployment spec template spec")
         .containers
-        .into_iter().find(|container| container.name == "coredns").expect("couldn't get dns container spec")
+        .into_iter().find(|container| container.name == "coredns").expect("couldn't get dns container spec");
+
+    let dns_container_liveness_probe_http_get_action =
+        dns_container
         .liveness_probe.expect("couldn't get dns container spec liveness probe")
         .http_get.expect("couldn't get dns container spec liveness probe HTTP get action");
 
     assert_eq!(dns_container_liveness_probe_http_get_action.path, Some("/health".to_string()));
-    assert_eq!(dns_container_liveness_probe_http_get_action.port, util::intstr::IntOrString::Int(8080));
+    let port = match &dns_container_liveness_probe_http_get_action.port {
+        util::intstr::IntOrString::Int(port) => *port,
+        util::intstr::IntOrString::String(port_name) =>
+            dns_container.ports
+                .into_iter()
+                .flatten()
+                .find(|port| port.name.as_ref() == Some(port_name))
+                .expect("could not find named port")
+                .container_port,
+    };
+    assert_eq!(port, 8080);
 
     let dns_deployment_status = dns_deployment.status.expect("couldn't get dns deployment status");
     assert!(dns_deployment_status.replicas > Some(0));

k8s-openapi-tests/src/lib.rs

@@ -49,6 +49,7 @@ impl Client {
         #[cfg(feature = "test_v1_31")] let replays_directory = "v1-31";
         #[cfg(feature = "test_v1_32")] let replays_directory = "v1-32";
         #[cfg(feature = "test_v1_33")] let replays_directory = "v1-33";
+        #[cfg(feature = "test_v1_34")] let replays_directory = "v1-34";
 
         let replays_directory =
             std::path::Path::new(concat!(env!("CARGO_MANIFEST_DIR")))