re-generate

Signed-off-by: Sebastian Hoß <[email protected]>

Author: sebhoss

.github/dependabot.yml

@@ -10,13 +10,8 @@ updates:
     assignees:
       - sebhoss
   - package-ecosystem: cargo
-    directory: /
+    directory: /code-generator
     schedule:
       interval: weekly
-    groups:
-      kube:
-        patterns:
-          - kube
-          - k8s-openapi
     assignees:
       - sebhoss

.github/workflows/verify.yml

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: The kube-custom-resources-rs Authors
 # SPDX-License-Identifier: 0BSD
 
-name: Verify code-generator
+name: Verify Commits
 on:
   pull_request:
     branches: [ main ]

.gitignore

@@ -4,3 +4,4 @@
 target/
 crd-catalog/**/*.fixed
 Cargo.lock
+.bash_history

code-generator/Cargo.toml

@@ -12,7 +12,7 @@ publish = false
 glob = { version = "0.3.2" }
 handlebars = { version = "6.3.0" }
 itertools = { version = "0.14.0" }
-k8s-openapi = { version = "~0", features = ["latest"] }
+k8s-openapi = { version = "0.25.0", features = ["latest"] }
 reqwest = { version = "0.12.12", default-features = false, features = ["blocking", "rustls-tls"] }
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = { version = "1.0.138" }

code-generator/src/bin/cargo_toml_generator.rs

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: The kube-custom-resources-rs Authors
 // SPDX-License-Identifier: 0BSD
 
-use code_generator::last_path_segment;
+use code_generator::{k8s_openapi_kubernetes_version, kube_rs_major_version, last_path_segment};
 use handlebars::{to_json, Handlebars};
 use serde_json::Map;
 use std::fs;
@@ -44,7 +44,11 @@ fn main() -> Result<()> {
             data.insert("group_name_snake_case".to_string(), to_json(group_name));
             data.insert(
                 "k8s_openapi_kubernetes_version".to_string(),
-                to_json("v1_31"),
+                to_json(k8s_openapi_kubernetes_version()),
+            );
+            data.insert(
+                "kube_rs_major_version".to_string(),
+                to_json(kube_rs_major_version()),
             );
             data.insert("versions".to_string(), to_json(&versions));
 

code-generator/src/bin/github_actions_generator.rs

@@ -7,6 +7,7 @@ use std::fs;
 use std::fs::OpenOptions;
 use std::hash::{DefaultHasher, Hash, Hasher};
 use std::io::Result;
+use code_generator::kube_rs_major_version;
 
 fn main() -> Result<()> {
     let root = concat!(env!("CARGO_MANIFEST_DIR"), "/..");
@@ -48,8 +49,8 @@ fn main() -> Result<()> {
                 to_json(format!("kcr_{group_name}")),
             );
             data.insert(
-                "k8s_openapi_kubernetes_version".to_string(),
-                to_json("1.31"),
+                "kube_rs_major_version".to_string(),
+                to_json(kube_rs_major_version()),
             );
             data.insert("cron_minute".to_string(), to_json(hash.rem_euclid(60)));
             data.insert("cron_hour".to_string(), to_json(hash.rem_euclid(22) + 1));

code-generator/src/lib.rs

@@ -9,6 +9,17 @@ use std::path::Path;
 
 pub mod catalog;
 
+const KUBERNETES_MAJOR_VERSION: usize = 33;
+
+pub fn k8s_openapi_kubernetes_version() -> String {
+    format!("v1_{}", KUBERNETES_MAJOR_VERSION)
+}
+
+pub fn kube_rs_major_version() -> String {
+    // Kubernetes was at 1.33 when kube-rs 1.0.0 was released
+    format!("{}", KUBERNETES_MAJOR_VERSION - 32)
+}
+
 pub fn last_path_segment<P: AsRef<Path>>(path: P) -> String {
     path.as_ref()
         .file_name()

code-generator/src/templates/Cargo.toml.hbs

@@ -19,7 +19,7 @@ schemars = { version = "~0" }
 serde = { version = "~1" }
 serde_json = { version = "~1" }
 k8s-openapi = { version = "~0" }
-kube = { version = "~0", default-features = false, features = ["derive"] }
+kube = { version = "~{{kube_rs_major_version}}", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
 k8s-openapi = { version = "~0", features = ["{{k8s_openapi_kubernetes_version}}"] }

code-generator/src/templates/release-crd.yml.hbs

@@ -23,7 +23,7 @@ jobs:
       - id: release
         name: Create Release Version
         if: steps.commits.outputs.count > 0
-        run: echo "version=1.$(date --utc +'%Y%m%d').$(date --utc +'%-H%M%S')" >> $GITHUB_OUTPUT
+        run: echo "version={{kube_rs_major_version}}.$(date --utc +'%Y%m%d').$(date --utc +'%-H%M%S')" >> $GITHUB_OUTPUT
       - name: Set up Rust
         if: steps.commits.outputs.count > 0
         uses: dtolnay/rust-toolchain@stable

crd-catalog/apecloud/kubeblocks/apps.kubeblocks.io/v1/componentdefinitions.yaml

@@ -2008,6 +2008,10 @@ spec:
                   description: "Provides a brief and concise explanation of the Component's purpose, functionality, and any relevant details.\nIt serves as a quick reference for users to understand the Component's role and characteristics."
                   maxLength: 256
                   type: "string"
+                disableDefaultHeadlessService:
+                  default: false
+                  description: "Specifies whether to create the default headless service.\n\n\nThis field is immutable."
+                  type: "boolean"
                 exporter:
                   description: "Defines the built-in metrics exporter container."
                   properties: