Skip to content

Commit

Permalink
migrations: migrate to admin container v0.11.10
Browse files Browse the repository at this point in the history
Signed-off-by: Yutong Sun <[email protected]>
  • Loading branch information
ytsssun committed Aug 19, 2024
1 parent 031e732 commit db97ccd
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -330,4 +330,7 @@ version = "1.21.1"
"migrate_v1.21.0_k8s-reserved-cpus-v0-1-0.lz4",
"migrate_v1.21.0_add-hostname-override-source.lz4",
]
"(1.21.0, 1.21.1)" = []
"(1.21.0, 1.21.1)" = [
"migrate_v1.21.1_aws-admin-container-v0-11-10.lz4",
"migrate_v1.21.1_public-admin-container-v0-11-10.lz4",
]
14 changes: 14 additions & 0 deletions sources/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions sources/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ members = [
"settings-migrations/v1.21.0/pod-infra-container-image-services",
"settings-migrations/v1.21.0/k8s-reserved-cpus-v0-1-0",
"settings-migrations/v1.21.0/add-hostname-override-source",
"settings-migrations/v1.21.1/aws-admin-container-v0-11-10",
"settings-migrations/v1.21.1/public-admin-container-v0-11-10",

"settings-plugins/aws-dev",
"settings-plugins/aws-ecs-1",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[package]
name = "aws-admin-container-v0-11-10"
version = "0.1.0"
authors = ["Yutong Sun <[email protected]>"]
license = "Apache-2.0 OR MIT"
edition = "2021"
publish = false
# Don't rebuild crate just because of changes to README.
exclude = ["README.md"]


# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
migration-helpers.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
use migration_helpers::common_migrations::ReplaceSchnauzerMigration;
use migration_helpers::{migrate, Result};
use std::process;

const OLD_ADMIN_CTR_CMDLINE: &str =
"schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.11.9'";
const NEW_ADMIN_CTR_CMDLINE: &str =
"schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.11.10'";

/// We bumped the version of the default admin container
fn run() -> Result<()> {
migrate(ReplaceSchnauzerMigration {
setting: "settings.host-containers.admin.source",
old_schnauzer_cmdline: OLD_ADMIN_CTR_CMDLINE,
new_schnauzer_cmdline: NEW_ADMIN_CTR_CMDLINE,
})
}

// Returning a Result from main makes it print a Debug representation of the error, but with Snafu
// we have nice Display representations of the error, so we wrap "main" (run) and print any error.
// https://github.com/shepmaster/snafu/issues/110
fn main() {
if let Err(e) = run() {
eprintln!("{}", e);
process::exit(1);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[package]
name = "public-admin-container-v0-11-10"
version = "0.1.0"
authors = ["Yutong Sun <[email protected]>"]
license = "Apache-2.0 OR MIT"
edition = "2021"
publish = false
# Don't rebuild crate just because of changes to README.
exclude = ["README.md"]


# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
migration-helpers.workspace = true
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
use migration_helpers::common_migrations::ReplaceStringMigration;
use migration_helpers::{migrate, Result};
use std::process;

const OLD_ADMIN_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.9";
const NEW_ADMIN_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.10";

/// We bumped the version of the default admin container
fn run() -> Result<()> {
migrate(ReplaceStringMigration {
setting: "settings.host-containers.admin.source",
old_val: OLD_ADMIN_CTR_SOURCE_VAL,
new_val: NEW_ADMIN_CTR_SOURCE_VAL,
})
}

// Returning a Result from main makes it print a Debug representation of the error, but with Snafu
// we have nice Display representations of the error, so we wrap "main" (run) and print any error.
// https://github.com/shepmaster/snafu/issues/110
fn main() {
if let Err(e) = run() {
eprintln!("{}", e);
process::exit(1);
}
}

0 comments on commit db97ccd

Please sign in to comment.