Merge pull request bottlerocket-os#3891 from jmt-lab/ootb/static-pods

static-pods: remove conditional compilation
bcressey · Apr 19, 2024 · 41d9aa5 · 41d9aa5
2 parents e265269 + cf7a4e6
commit 41d9aa5
Show file tree

Hide file tree

Showing 33 changed files with 518 additions and 363 deletions.
diff --git a/Release.toml b/Release.toml
@@ -297,4 +297,6 @@ version = "1.20.0"
     "migrate_v1.20.0_update-ecs-config-path.lz4",
     "migrate_v1.20.0_update-ecs-config-template-path.lz4",
     "migrate_v1.20.0_add-ntp-default-options-v0-1-0.lz4",
+    "migrate_v1.20.0_static-pods-add-prefix-v0-1-0.lz4",
+    "migrate_v1.20.0_static-pods-services-cfg-v0-1-0.lz4",
 ]
diff --git a/packages/kubernetes-1.23/Cargo.toml b/packages/kubernetes-1.23/Cargo.toml
@@ -45,6 +45,7 @@ glibc = { path = "../glibc" }
 [dependencies]
 aws-signing-helper = { path = "../aws-signing-helper" }
 ecr-credential-provider = { path = "../ecr-credential-provider" }
+static-pods = { path = "../static-pods" }
 # `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
 # and are pulled in by `release`.
 # conntrack-tools = { path = "../conntrack-tools" }

diff --git a/packages/kubernetes-1.23/kubernetes-1.23.spec b/packages/kubernetes-1.23/kubernetes-1.23.spec
@@ -69,6 +69,7 @@ Requires: %{_cross_os}containerd
 Requires: %{_cross_os}findutils
 Requires: %{_cross_os}ecr-credential-provider
 Requires: %{_cross_os}aws-signing-helper
+Requires: %{_cross_os}static-pods
 
 %description -n %{_cross_os}kubelet-1.23
 %{summary}.

diff --git a/packages/kubernetes-1.24/Cargo.toml b/packages/kubernetes-1.24/Cargo.toml
@@ -24,6 +24,7 @@ glibc = { path = "../glibc" }
 [dependencies]
 aws-signing-helper = { path = "../aws-signing-helper" }
 ecr-credential-provider = { path = "../ecr-credential-provider" }
+static-pods = { path = "../static-pods" }
 # `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
 # and are pulled in by `release`.
 # conntrack-tools = { path = "../conntrack-tools" }

diff --git a/packages/kubernetes-1.24/kubernetes-1.24.spec b/packages/kubernetes-1.24/kubernetes-1.24.spec
@@ -70,6 +70,7 @@ Requires: %{_cross_os}containerd
 Requires: %{_cross_os}findutils
 Requires: %{_cross_os}ecr-credential-provider
 Requires: %{_cross_os}aws-signing-helper
+Requires: %{_cross_os}static-pods
 
 %description -n %{_cross_os}kubelet-1.24
 %{summary}.

diff --git a/packages/kubernetes-1.25/Cargo.toml b/packages/kubernetes-1.25/Cargo.toml
@@ -24,6 +24,7 @@ glibc = { path = "../glibc" }
 [dependencies]
 aws-signing-helper = { path = "../aws-signing-helper" }
 ecr-credential-provider = { path = "../ecr-credential-provider" }
+static-pods = { path = "../static-pods" }
 # `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
 # and are pulled in by `release`.
 # conntrack-tools = { path = "../conntrack-tools" }

diff --git a/packages/kubernetes-1.25/kubernetes-1.25.spec b/packages/kubernetes-1.25/kubernetes-1.25.spec
@@ -70,6 +70,7 @@ Requires: %{_cross_os}containerd
 Requires: %{_cross_os}findutils
 Requires: %{_cross_os}ecr-credential-provider
 Requires: %{_cross_os}aws-signing-helper
+Requires: %{_cross_os}static-pods
 
 %description -n %{_cross_os}kubelet-1.25
 %{summary}.

diff --git a/packages/kubernetes-1.26/Cargo.toml b/packages/kubernetes-1.26/Cargo.toml
@@ -24,6 +24,7 @@ glibc = { path = "../glibc" }
 [dependencies]
 aws-signing-helper = { path = "../aws-signing-helper" }
 ecr-credential-provider = { path = "../ecr-credential-provider" }
+static-pods = { path = "../static-pods" }
 # `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
 # and are pulled in by `release`.
 # conntrack-tools = { path = "../conntrack-tools" }

diff --git a/packages/kubernetes-1.26/kubernetes-1.26.spec b/packages/kubernetes-1.26/kubernetes-1.26.spec
@@ -70,6 +70,7 @@ Requires: %{_cross_os}containerd
 Requires: %{_cross_os}findutils
 Requires: %{_cross_os}ecr-credential-provider
 Requires: %{_cross_os}aws-signing-helper
+Requires: %{_cross_os}static-pods
 
 %description -n %{_cross_os}kubelet-1.26
 %{summary}.

diff --git a/packages/kubernetes-1.27/Cargo.toml b/packages/kubernetes-1.27/Cargo.toml
@@ -25,6 +25,7 @@ glibc = { path = "../glibc" }
 [dependencies]
 aws-signing-helper = { path = "../aws-signing-helper" }
 ecr-credential-provider-1_27 = { path = "../ecr-credential-provider-1.27" }
+static-pods = { path = "../static-pods" }
 # `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
 # and are pulled in by `release`.
 # conntrack-tools = { path = "../conntrack-tools" }

diff --git a/packages/kubernetes-1.27/kubernetes-1.27.spec b/packages/kubernetes-1.27/kubernetes-1.27.spec
@@ -70,6 +70,7 @@ Requires: %{_cross_os}containerd
 Requires: %{_cross_os}findutils
 Requires: %{_cross_os}ecr-credential-provider-1.27
 Requires: %{_cross_os}aws-signing-helper
+Requires: %{_cross_os}static-pods
 
 %description -n %{_cross_os}kubelet-1.27
 %{summary}.

diff --git a/packages/kubernetes-1.28/Cargo.toml b/packages/kubernetes-1.28/Cargo.toml
@@ -25,6 +25,7 @@ glibc = { path = "../glibc" }
 [dependencies]
 aws-signing-helper = { path = "../aws-signing-helper" }
 ecr-credential-provider-1_27 = { path = "../ecr-credential-provider-1.27" }
+static-pods = { path = "../static-pods" }
 # `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
 # and are pulled in by `release`.
 # conntrack-tools = { path = "../conntrack-tools" }

diff --git a/packages/kubernetes-1.28/kubernetes-1.28.spec b/packages/kubernetes-1.28/kubernetes-1.28.spec
@@ -70,6 +70,7 @@ Requires: %{_cross_os}containerd
 Requires: %{_cross_os}findutils
 Requires: %{_cross_os}ecr-credential-provider-1.27
 Requires: %{_cross_os}aws-signing-helper
+Requires: %{_cross_os}static-pods
 
 %description -n %{_cross_os}kubelet-1.28
 %{summary}.

diff --git a/packages/kubernetes-1.29/Cargo.toml b/packages/kubernetes-1.29/Cargo.toml
@@ -25,6 +25,7 @@ glibc = { path = "../glibc" }
 [dependencies]
 aws-signing-helper = { path = "../aws-signing-helper" }
 ecr-credential-provider-1_29 = { path = "../ecr-credential-provider-1.29" }
+static-pods = { path = "../static-pods" }
 # `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
 # and are pulled in by `release`.
 # conntrack-tools = { path = "../conntrack-tools" }

diff --git a/packages/kubernetes-1.29/kubernetes-1.29.spec b/packages/kubernetes-1.29/kubernetes-1.29.spec
@@ -70,6 +70,7 @@ Requires: %{_cross_os}containerd
 Requires: %{_cross_os}findutils
 Requires: %{_cross_os}ecr-credential-provider-1.29
 Requires: %{_cross_os}aws-signing-helper
+Requires: %{_cross_os}static-pods
 
 %description -n %{_cross_os}kubelet-1.29
 %{summary}.

diff --git a/packages/kubernetes-1.30/Cargo.toml b/packages/kubernetes-1.30/Cargo.toml
@@ -26,6 +26,7 @@ glibc = { path = "../glibc" }
 [dependencies]
 aws-signing-helper = { path = "../aws-signing-helper" }
 ecr-credential-provider-1_29 = { path = "../ecr-credential-provider-1.29" }
+static-pods = { path = "../static-pods" }
 # `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
 # and are pulled in by `release`.
 # conntrack-tools = { path = "../conntrack-tools" }

diff --git a/packages/kubernetes-1.30/kubernetes-1.30.spec b/packages/kubernetes-1.30/kubernetes-1.30.spec
@@ -72,6 +72,7 @@ Requires: %{_cross_os}findutils
 # TODO: update to ecr-credential-provider-1.30
 Requires: %{_cross_os}ecr-credential-provider-1.29
 Requires: %{_cross_os}aws-signing-helper
+Requires: %{_cross_os}static-pods
 
 %description -n %{_cross_os}kubelet-1.30
 %{summary}.

diff --git a/packages/os/os.spec b/packages/os/os.spec
@@ -108,10 +108,6 @@ Requires: %{_cross_os}updog
 Requires: %{_cross_os}pluto
 %endif
 
-%if %{with k8s_runtime}
-Requires: %{_cross_os}static-pods
-%endif
-
 %if %{with aws_platform}
 Requires: %{_cross_os}shibaken
 Requires: %{_cross_os}cfsignal
@@ -244,13 +240,6 @@ Summary: Dynamic setting generator for kubernetes
 %{summary}.
 %endif
 
-%if %{with k8s_runtime}
-%package -n %{_cross_os}static-pods
-Summary: Manages user-defined K8S static pods
-%description -n %{_cross_os}static-pods
-%{summary}.
-%endif
-
 %if %{with aws_platform}
 %package -n %{_cross_os}shibaken
 Summary: Run tasks reliant on IMDS
@@ -384,7 +373,6 @@ echo "** Output from non-static builds:"
     -p bloodhound \
     -p xfscli \
     %{?with_aws_platform: -p shibaken} \
-    %{?with_k8s_runtime: -p static-pods} \
     %{?with_nvidia_flavor: -p driverdog} \
     %{nil}
 
@@ -418,7 +406,6 @@ for p in \
   ghostdog bootstrap-containers \
   shimpei bloodhound bottlerocket-checks \
   %{?with_aws_platform: shibaken} \
-  %{?with_k8s_runtime: static-pods} \
   %{?with_nvidia_flavor: driverdog} \
 ; do
   install -p -m 0755 ${HOME}/.cache/%{__cargo_target}/release/${p} %{buildroot}%{_cross_bindir}
@@ -699,11 +686,6 @@ install -p -m 0644 %{S:400} %{S:401} %{S:402} %{buildroot}%{_cross_licensedir}
 %{_cross_datadir}/eks/eni-max-pods
 %endif
 
-%if %{with k8s_runtime}
-%files -n %{_cross_os}static-pods
-%{_cross_bindir}/static-pods
-%endif
-
 %files -n %{_cross_os}shimpei
 %{_cross_bindir}/shimpei
 %{_cross_templatedir}/oci-default-hooks-json

diff --git a/packages/static-pods/Cargo.toml b/packages/static-pods/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "static-pods"
+version = "0.1.0"
+edition = "2021"
+publish = false
+build = "../build.rs"
+
+[package.metadata.build-package]
+source-groups = [
+    "api/static-pods"
+]
+
+[lib]
+path = "../packages.rs"
+
+[build-dependencies]
+glibc = { path = "../glibc" }
+
+[dependencies]
diff --git a/packages/static-pods/static-pods-toml b/packages/static-pods/static-pods-toml
@@ -0,0 +1,15 @@
+[required-extensions]
+kubernetes = "v1"
+std = { version = "v1", helpers = ["if_not_null"] }
++++
+{{#if_not_null settings.kubernetes.static-pods}}
+{{#each settings.kubernetes.static-pods}}
+["{{@key}}"]
+{{#if_not_null this.enabled}}
+enabled = {{this.enabled}}
+{{/if_not_null}}
+{{#if_not_null this.manifest}}
+manifest = "{{{this.manifest}}}"
+{{/if_not_null}}
+{{/each}}
+{{/if_not_null}}
diff --git a/packages/static-pods/static-pods.spec b/packages/static-pods/static-pods.spec
@@ -0,0 +1,38 @@
+%global _cross_first_party 1
+%undefine _debugsource_packages
+
+Name: %{_cross_os}static-pods
+Version: 0.0
+Release: 0%{?dist}
+Summary: Manages user-defined K*S static pods
+License: Apache-2.0 OR MIT
+URL: https://github.com/bottlerocket-os/bottlerocket
+
+Source0: static-pods-toml
+
+BuildRequires: %{_cross_os}glibc-devel
+
+%description
+%{summary}.
+
+%prep
+%setup -T -c
+%cargo_prep
+
+%build
+mkdir bin
+
+echo "** Compile static-pods agent"
+%cargo_build --manifest-path %{_builddir}/sources/Cargo.toml \
+    -p static-pods
+
+%install
+install -d %{buildroot}%{_cross_bindir}
+install -p -m 0755 ${HOME}/.cache/%{__cargo_target}/release/static-pods %{buildroot}%{_cross_bindir}
+
+install -d %{buildroot}%{_cross_templatedir}
+install -p -m 0644 %{S:0} %{buildroot}%{_cross_templatedir}
+
+%files
+%{_cross_bindir}/static-pods
+%{_cross_templatedir}/static-pods-toml
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/Cargo.toml b/sources/Cargo.toml
@@ -80,6 +80,8 @@ members = [
     "api/migration/migrations/v1.20.0/update-ecs-config-path",
     "api/migration/migrations/v1.20.0/update-ecs-config-template-path",
     "api/migration/migrations/v1.20.0/add-ntp-default-options-v0-1-0",
+    "api/migration/migrations/v1.20.0/static-pods-add-prefix-v0-1-0",
+    "api/migration/migrations/v1.20.0/static-pods-services-cfg-v0-1-0",
 
     "bloodhound",
 

diff --git a/sources/api/migration/migrations/v1.20.0/static-pods-add-prefix-v0-1-0/Cargo.toml b/sources/api/migration/migrations/v1.20.0/static-pods-add-prefix-v0-1-0/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "static-pods-add-prefix-v0-1-0"
+version = "0.1.0"
+authors = ["Jarrett Tierney <[email protected]>"]
+license = "Apache-2.0 OR MIT"
+edition = "2021"
+publish = false
+exclude = ["README.md"]
+
+[dependencies]
+migration-helpers = { path = "../../../migration-helpers", version = "0.1.0" }
diff --git a/sources/api/migration/migrations/v1.20.0/static-pods-add-prefix-v0-1-0/src/main.rs b/sources/api/migration/migrations/v1.20.0/static-pods-add-prefix-v0-1-0/src/main.rs
@@ -0,0 +1,16 @@
+use migration_helpers::common_migrations::AddPrefixesMigration;
+use migration_helpers::{migrate, Result};
+use std::process;
+
+fn run() -> Result<()> {
+    migrate(AddPrefixesMigration(vec![
+        "configuration-files.static-pods-toml",
+    ]))
+}
+
+fn main() {
+    if let Err(e) = run() {
+        eprintln!("{}", e);
+        process::exit(1);
+    }
+}
diff --git a/sources/api/migration/migrations/v1.20.0/static-pods-services-cfg-v0-1-0/Cargo.toml b/sources/api/migration/migrations/v1.20.0/static-pods-services-cfg-v0-1-0/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "static-pods-services-cfg-v0-1-0"
+version = "0.1.0"
+authors = ["Jarrett Tierney <[email protected]>"]
+license = "Apache-2.0 OR MIT"
+edition = "2021"
+publish = false
+exclude = ["README.md"]
+
+[dependencies]
+migration-helpers = { path = "../../../migration-helpers", version = "0.1.0" }
diff --git a/sources/api/migration/migrations/v1.20.0/static-pods-services-cfg-v0-1-0/src/main.rs b/sources/api/migration/migrations/v1.20.0/static-pods-services-cfg-v0-1-0/src/main.rs
@@ -0,0 +1,18 @@
+use migration_helpers::common_migrations::{ListReplacement, ReplaceListsMigration};
+use migration_helpers::{migrate, Result};
+use std::process;
+
+fn run() -> Result<()> {
+    migrate(ReplaceListsMigration(vec![ListReplacement {
+        setting: "services.static-pods.configuration-files",
+        old_vals: &[],
+        new_vals: &["static-pods-toml"],
+    }]))
+}
+
+fn main() {
+    if let Err(e) = run() {
+        eprintln!("{}", e);
+        process::exit(1);
+    }
+}
diff --git a/sources/api/static-pods/Cargo.toml b/sources/api/static-pods/Cargo.toml
@@ -10,16 +10,14 @@ build = "build.rs"
 exclude = ["README.md"]
 
 [dependencies]
-constants = { path = "../../constants", version = "0.1" }
 base64 = "0.21"
 log = "0.4"
-models = { path = "../../models", version = "0.1" }
-schnauzer = { path = "../schnauzer", version = "0.1" }
+modeled-types = { path = "../../models/modeled-types", version = "0.1" }
+serde = { version = "1", features = ["default"]}
 simplelog = "0.12"
 snafu = "0.8"
-tokio = { version = "~1.32", default-features = false, features = ["macros", "rt-multi-thread", "time"] }  # LTS
+toml = "0.8"
 tempfile = "3"
 
 [build-dependencies]
-bottlerocket-variant = { version = "0.1", path = "../../bottlerocket-variant" }
 generate-readme = { version = "0.1", path = "../../generate-readme" }
diff --git a/sources/api/static-pods/build.rs b/sources/api/static-pods/build.rs
@@ -1,7 +1,3 @@
-use bottlerocket_variant::Variant;
-
 fn main() {
-    let variant = Variant::from_env().unwrap();
-    variant.emit_cfgs();
-    generate_readme::from_file("src/static_pods.rs").unwrap();
+    generate_readme::from_main().unwrap();
 }