-
Notifications
You must be signed in to change notification settings - Fork 499
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3947 from KCSesh/kssessio-dev
Update the host containers for 1.20.0
- Loading branch information
Showing
13 changed files
with
208 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
sources/api/migration/migrations/v1.20.0/aws-admin-container-v0-11-8/Cargo.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 1,16 @@ | ||
| [package] | ||
| name = "aws-admin-container-v0-11-8" | ||
| version = "0.1.0" | ||
| authors = ["Kyle Sessions <[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 = { path = "../../../migration-helpers", version = "0.1.0"} | ||
|
|
27 changes: 27 additions & 0 deletions
27
sources/api/migration/migrations/v1.20.0/aws-admin-container-v0-11-8/src/main.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.7'"; | ||
| 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.8'"; | ||
|
|
||
| /// 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); | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
sources/api/migration/migrations/v1.20.0/aws-control-container-v0-7-12/Cargo.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 1,16 @@ | ||
| [package] | ||
| name = "aws-control-container-v0-7-12" | ||
| version = "0.1.0" | ||
| authors = ["Kyle Sessions <[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 = { path = "../../../migration-helpers", version = "0.1.0"} | ||
|
|
27 changes: 27 additions & 0 deletions
27
sources/api/migration/migrations/v1.20.0/aws-control-container-v0-7-12/src/main.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.11'"; | ||
| 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.12'"; | ||
|
|
||
| /// 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); | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
sources/api/migration/migrations/v1.20.0/public-admin-container-v0-11-8/Cargo.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 1,16 @@ | ||
| [package] | ||
| name = "public-admin-container-v0-11-8" | ||
| version = "0.1.0" | ||
| authors = ["Kyle Sessions <[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 = { path = "../../../migration-helpers", version = "0.1.0"} | ||
|
|
25 changes: 25 additions & 0 deletions
25
sources/api/migration/migrations/v1.20.0/public-admin-container-v0-11-8/src/main.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.7"; | ||
| const NEW_ADMIN_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.8"; | ||
|
|
||
| /// 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); | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
sources/api/migration/migrations/v1.20.0/public-control-container-v0-7-12/Cargo.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 1,16 @@ | ||
| [package] | ||
| name = "public-control-container-v0-7-12" | ||
| version = "0.1.0" | ||
| authors = ["Kyle Sessions <[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 = { path = "../../../migration-helpers", version = "0.1.0"} | ||
|
|
25 changes: 25 additions & 0 deletions
25
sources/api/migration/migrations/v1.20.0/public-control-container-v0-7-12/src/main.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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_CONTROL_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.11"; | ||
| const NEW_CONTROL_CTR_SOURCE_VAL: &str = "public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.12"; | ||
|
|
||
| /// 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); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters