Skip to content

Commit

Permalink
[hack] migrations: migrate to control container v0.7.17
Browse files Browse the repository at this point in the history
Migrate to beta dev container for testing

Signed-off-by: Gavin Inglis <[email protected]>
  • Loading branch information
ginglis13 committed Oct 9, 2024
1 parent 283bc59 commit 3f06c19
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -361,4 +361,6 @@ version = "1.25.0"
"migrate_v1.25.0_kubernetes-service-config.lz4",
"migrate_v1.25.0_aws-admin-container-v0-11-13.lz4",
"migrate_v1.25.0_public-admin-container-v0-11-13.lz4",
"migrate_v1.25.0_aws-control-container-v0-7-17.lz4",
"migrate_v1.25.0_public-control-container-v0-7-17.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 @@ -62,6 +62,8 @@ members = [
"settings-migrations/v1.25.0/kubernetes-service-config",
"settings-migrations/v1.25.0/aws-admin-container-v0-11-13",
"settings-migrations/v1.25.0/public-admin-container-v0-11-13",
"settings-migrations/v1.25.0/aws-control-container-v0-7-17",
"settings-migrations/v1.25.0/public-control-container-v0-7-17",

"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-control-container-v0-7-17"
version = "0.1.0"
authors = ["Gavin Inglis <[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_CONTROL_CTR_CMDLINE: &str =
"schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.16'";
const NEW_CONTROL_CTR_CMDLINE: &str =
"schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.7.17'";

/// We bumped the version of the default control container
fn run() -> Result<()> {
migrate(ReplaceSchnauzerMigration {
setting: "settings.host-containers.control.source",
old_schnauzer_cmdline: OLD_CONTROL_CTR_CMDLINE,
new_schnauzer_cmdline: NEW_CONTROL_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-control-container-v0-7-17"
version = "0.1.0"
authors = ["Gavin Inglis <[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::ReplaceStringMigration;
use migration_helpers::{migrate, Result};
use std::process;

const OLD_CONTROL_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.16";
// TODO (hack) update to publicly released control container
const NEW_CONTROL_CTR_SOURCE_VAL: &str =
"public.ecr.aws/o7o0w6s5/beta-bottlerocket-control-container:v0.7.17";

/// We bumped the version of the default control container
fn run() -> Result<()> {
migrate(ReplaceStringMigration {
setting: "settings.host-containers.control.source",
old_val: OLD_CONTROL_CTR_SOURCE_VAL,
new_val: NEW_CONTROL_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 3f06c19

Please sign in to comment.