Yamlgen: Upgrade to serde-yaml 0.9

.github/workflows/ci.yml

@@ -28,7 +28,10 @@ jobs:
       - run: rustup update stable
       - run: make build
       - name: Ensure git is clean
-        run: test -z "$(git status --untracked-files=all --porcelain)"
+        shell: bash
+        run: |
+          git --no-pager diff
+          test -z "$(git status --untracked-files=all --porcelain)"
 
   build-container:
     name: brupop-image
@@ -37,4 +40,7 @@ jobs:
       - uses: actions/checkout@v3
       - run: make brupop-image
       - name: Ensure git is clean
-        run: test -z "$(git status --untracked-files=all --porcelain)"
+        shell: bash
+        run: |
+          git --no-pager diff
+          test -z "$(git status --untracked-files=all --porcelain)"

apiserver/Cargo.toml

@@ -36,7 +36,7 @@ lazy_static = "1.4"
 log = "0.4"
 mockall = { version = "0.11", optional = true }
 reqwest = { version = "0.11", features =  [ "json", "native-tls" ] }
-schemars = "0.8.10"
+schemars = "0.8.11"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
 snafu = "0.7"

deny.toml

@@ -41,9 +41,6 @@ skip-tree = [
     { name = "clap", version = "2.34.0" },
     # structopt-derive uses an older version of heck, which clashed with the one used by strum_macros.
     { name = "structopt-derive", version = "0.4.18"},
-    # use "rustls-tls" feature in kube to build correct k8s client for IPv6 cluster
-    # with "rustls-tls" enabled, kube uses mixed versions of hyper-rustls
-    { name = "kube", version = "0.75.0"},
     # aws-smithy-client brings in several lagging dependencies that can be ignored
     # since it is only used in the integration tests
     { name = "integ" }

models/Cargo.toml

@@ -18,7 +18,7 @@ maplit = "1.0"
 mockall = { version = "0.11", optional = true }
 regex = "1.7"
 reqwest = "0.11"
-schemars = "0.8.10"
+schemars = "0.8.11"
 semver = "1.0"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"

yamlgen/Cargo.toml

@@ -9,4 +9,4 @@ license = "Apache-2.0 OR MIT"
 models = { path = "../models", version = "0.1.0" }
 dotenv = "0.15"
 kube = { version = "0.76.0", default-features = true, features = [ "derive", "runtime" ] }
-serde_yaml = "0.8"
+serde_yaml = "0.9"

yamlgen/build.rs

@@ -28,6 +28,7 @@ use std::path::PathBuf;
 
 const YAMLGEN_DIR: &str = env!("CARGO_MANIFEST_DIR");
 const HEADER: &str = "# This file is generated. Do not edit.\n";
+const YAML_DOC_LEADER: &str = "---\n";
 
 fn main() {
     dotenv::dotenv().ok();
@@ -46,6 +47,9 @@ fn main() {
     let apiserver_internal_port = env::var("APISERVER_INTERNAL_PORT").ok().unwrap();
     let apiserver_service_port = env::var("APISERVER_SERVICE_PORT").ok().unwrap();
     brupop_resources.write_all(HEADER.as_bytes()).unwrap();
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(
         &brupop_resources,
         &combined_crds(apiserver_service_port.clone()),
@@ -70,6 +74,9 @@ fn main() {
     if !max_concurrent_update.eq("unlimited") {
         max_concurrent_update.parse::<usize>().unwrap();
     }
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(&brupop_resources, &brupop_namespace()).unwrap();
 
     // cert-manager and secret
@@ -80,14 +87,29 @@ fn main() {
     brupop_resources.write_all(contents.as_bytes()).unwrap();
 
     // apiserver resources
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(&brupop_resources, &apiserver_service_account()).unwrap();
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(&brupop_resources, &apiserver_cluster_role()).unwrap();
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(&brupop_resources, &apiserver_cluster_role_binding()).unwrap();
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(
         &brupop_resources,
         &apiserver_auth_delegator_cluster_role_binding(),
     )
     .unwrap();
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(
         &brupop_resources,
         &apiserver_deployment(
@@ -97,16 +119,32 @@ fn main() {
         ),
     )
     .unwrap();
+
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(
         &brupop_resources,
         &apiserver_service(apiserver_internal_port, apiserver_service_port.clone()),
     )
     .unwrap();
 
     // agent resources
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(&brupop_resources, &agent_service_account()).unwrap();
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(&brupop_resources, &agent_cluster_role()).unwrap();
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(&brupop_resources, &agent_cluster_role_binding()).unwrap();
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(
         &brupop_resources,
         &agent_daemonset(
@@ -119,10 +157,25 @@ fn main() {
     .unwrap();
 
     // controller resources
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(&brupop_resources, &controller_service_account()).unwrap();
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(&brupop_resources, &controller_cluster_role()).unwrap();
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(&brupop_resources, &controller_cluster_role_binding()).unwrap();
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(&brupop_resources, &controller_priority_class()).unwrap();
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(
         &brupop_resources,
         &controller_deployment(
@@ -134,5 +187,9 @@ fn main() {
         ),
     )
     .unwrap();
+
+    brupop_resources
+        .write_all(YAML_DOC_LEADER.as_bytes())
+        .unwrap();
     serde_yaml::to_writer(&brupop_resources, &controller_service()).unwrap();
 }