From 6361f347e3dde61a3d4b8e0031cd987359d58c97 Mon Sep 17 00:00:00 2001 From: Piyush Jena Date: Fri, 16 Aug 2024 12:10:38 +0000 Subject: [PATCH] version upgrade --- Release.toml | 6 ++- Twoliter.lock | 4 +- Twoliter.toml | 2 +- sources/Cargo.lock | 42 ------------------- sources/Cargo.toml | 10 +---- .../add-hostname-override-source/Cargo.toml | 0 .../add-hostname-override-source/src/main.rs | 0 .../k8s-reserved-cpus-v0-1-0/Cargo.toml | 0 .../k8s-reserved-cpus-v0-1-0/src/main.rs | 0 .../pluto-remove-generators-v0-1-0/Cargo.toml | 0 .../src/main.rs | 0 .../Cargo.toml | 0 .../src/main.rs | 0 .../Cargo.toml | 0 .../src/main.rs | 0 .../Cargo.toml | 0 .../src/main.rs | 0 .../Cargo.toml | 0 .../src/main.rs | 0 .../Cargo.toml | 0 .../src/main.rs | 0 21 files changed, 10 insertions(+), 54 deletions(-) rename sources/settings-migrations/{ => archived}/v1.21.0/add-hostname-override-source/Cargo.toml (100%) rename sources/settings-migrations/{ => archived}/v1.21.0/add-hostname-override-source/src/main.rs (100%) rename sources/settings-migrations/{ => archived}/v1.21.0/k8s-reserved-cpus-v0-1-0/Cargo.toml (100%) rename sources/settings-migrations/{ => archived}/v1.21.0/k8s-reserved-cpus-v0-1-0/src/main.rs (100%) rename sources/settings-migrations/{ => archived}/v1.21.0/pluto-remove-generators-v0-1-0/Cargo.toml (100%) rename sources/settings-migrations/{ => archived}/v1.21.0/pluto-remove-generators-v0-1-0/src/main.rs (100%) rename sources/settings-migrations/{ => archived}/v1.21.0/pod-infra-container-image-affected-services/Cargo.toml (100%) rename sources/settings-migrations/{ => archived}/v1.21.0/pod-infra-container-image-affected-services/src/main.rs (100%) rename sources/settings-migrations/{ => archived}/v1.21.0/pod-infra-container-image-remove-settings-generator/Cargo.toml (100%) rename sources/settings-migrations/{ => archived}/v1.21.0/pod-infra-container-image-remove-settings-generator/src/main.rs (100%) rename sources/settings-migrations/{ => archived}/v1.21.0/pod-infra-container-image-services/Cargo.toml (100%) rename sources/settings-migrations/{ => archived}/v1.21.0/pod-infra-container-image-services/src/main.rs (100%) rename sources/settings-migrations/{v1.21.0 => v1.22.0}/bootstrap-commands-config-file-v0-1-0/Cargo.toml (100%) rename sources/settings-migrations/{v1.21.0 => v1.22.0}/bootstrap-commands-config-file-v0-1-0/src/main.rs (100%) rename sources/settings-migrations/{v1.21.0 => v1.22.0}/bootstrap-commands-services-cfg-v0-1-0/Cargo.toml (100%) rename sources/settings-migrations/{v1.21.0 => v1.22.0}/bootstrap-commands-services-cfg-v0-1-0/src/main.rs (100%) diff --git a/Release.toml b/Release.toml index f9d1128709a..0e0be6553c1 100644 --- a/Release.toml +++ b/Release.toml @@ -1,4 +1,4 @@ -version = "1.21.1" +version = "1.22.0" [migrations] "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"] @@ -331,3 +331,7 @@ version = "1.21.1" "migrate_v1.21.0_add-hostname-override-source.lz4", ] "(1.21.0, 1.21.1)" = [] +"(1.21.1, 1.22.0)" = [ + "migrate_v1.22.0_bootstrap-commands-config-file-v0-1-0.lz4", + "migrate_v1.22.0_bootstrap-commands-services-cfg-v0-1-0.lz4", +] diff --git a/Twoliter.lock b/Twoliter.lock index 80784613241..1dfa1530558 100644 --- a/Twoliter.lock +++ b/Twoliter.lock @@ -1,6 +1,6 @@ schema-version = 1 -release-version = "1.21.1" -digest = "LpSwgiMza/wG9ykmKncR1DZU2IlTfyoDccqATvjyDrA=" +release-version = "1.22.0" +digest = "+MkUjackD2QmLVjYEaJJ5L8Puk6V0jJcNxKQ2dEdnjg=" [sdk] name = "bottlerocket-sdk" diff --git a/Twoliter.toml b/Twoliter.toml index 8e54cd775d2..c4ca01cce31 100644 --- a/Twoliter.toml +++ b/Twoliter.toml @@ -1,5 +1,5 @@ schema-version = 1 -release-version = "1.21.1" +release-version = "1.22.0" [vendor.bottlerocket] registry = "public.ecr.aws/bottlerocket" diff --git a/sources/Cargo.lock b/sources/Cargo.lock index bc5abc3b884..4c1f92083f0 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -50,13 +50,6 @@ dependencies = [ "core_extensions", ] -[[package]] -name = "add-hostname-override-source" -version = "0.1.0" -dependencies = [ - "migration-helpers", -] - [[package]] name = "addr2line" version = "0.21.0" @@ -1239,13 +1232,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "k8s-reserved-cpus-v0-1-0" -version = "0.1.0" -dependencies = [ - "migration-helpers", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -1586,34 +1572,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pluto-remove-generators-v0-1-0" -version = "0.1.0" -dependencies = [ - "migration-helpers", -] - -[[package]] -name = "pod-infra-container-image-affected-services" -version = "0.1.0" -dependencies = [ - "migration-helpers", -] - -[[package]] -name = "pod-infra-container-image-remove-settings-generator" -version = "0.1.0" -dependencies = [ - "migration-helpers", -] - -[[package]] -name = "pod-infra-container-image-services" -version = "0.1.0" -dependencies = [ - "migration-helpers", -] - [[package]] name = "powerfmt" version = "0.2.0" diff --git a/sources/Cargo.toml b/sources/Cargo.toml index 52a43a3d737..6bedde2940a 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -35,14 +35,8 @@ members = [ "settings-defaults/vmware-k8s-1.30", # (all previous migrations archived; add new ones after this line) - "settings-migrations/v1.21.0/pluto-remove-generators-v0-1-0", - "settings-migrations/v1.21.0/pod-infra-container-image-affected-services", - "settings-migrations/v1.21.0/pod-infra-container-image-remove-settings-generator", - "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.0/bootstrap-commands-config-file-v0-1-0", - "settings-migrations/v1.21.0/bootstrap-commands-services-cfg-v0-1-0", + "settings-migrations/v1.22.0/bootstrap-commands-config-file-v0-1-0", + "settings-migrations/v1.22.0/bootstrap-commands-services-cfg-v0-1-0", "settings-plugins/aws-dev", "settings-plugins/aws-ecs-1", diff --git a/sources/settings-migrations/v1.21.0/add-hostname-override-source/Cargo.toml b/sources/settings-migrations/archived/v1.21.0/add-hostname-override-source/Cargo.toml similarity index 100% rename from sources/settings-migrations/v1.21.0/add-hostname-override-source/Cargo.toml rename to sources/settings-migrations/archived/v1.21.0/add-hostname-override-source/Cargo.toml diff --git a/sources/settings-migrations/v1.21.0/add-hostname-override-source/src/main.rs b/sources/settings-migrations/archived/v1.21.0/add-hostname-override-source/src/main.rs similarity index 100% rename from sources/settings-migrations/v1.21.0/add-hostname-override-source/src/main.rs rename to sources/settings-migrations/archived/v1.21.0/add-hostname-override-source/src/main.rs diff --git a/sources/settings-migrations/v1.21.0/k8s-reserved-cpus-v0-1-0/Cargo.toml b/sources/settings-migrations/archived/v1.21.0/k8s-reserved-cpus-v0-1-0/Cargo.toml similarity index 100% rename from sources/settings-migrations/v1.21.0/k8s-reserved-cpus-v0-1-0/Cargo.toml rename to sources/settings-migrations/archived/v1.21.0/k8s-reserved-cpus-v0-1-0/Cargo.toml diff --git a/sources/settings-migrations/v1.21.0/k8s-reserved-cpus-v0-1-0/src/main.rs b/sources/settings-migrations/archived/v1.21.0/k8s-reserved-cpus-v0-1-0/src/main.rs similarity index 100% rename from sources/settings-migrations/v1.21.0/k8s-reserved-cpus-v0-1-0/src/main.rs rename to sources/settings-migrations/archived/v1.21.0/k8s-reserved-cpus-v0-1-0/src/main.rs diff --git a/sources/settings-migrations/v1.21.0/pluto-remove-generators-v0-1-0/Cargo.toml b/sources/settings-migrations/archived/v1.21.0/pluto-remove-generators-v0-1-0/Cargo.toml similarity index 100% rename from sources/settings-migrations/v1.21.0/pluto-remove-generators-v0-1-0/Cargo.toml rename to sources/settings-migrations/archived/v1.21.0/pluto-remove-generators-v0-1-0/Cargo.toml diff --git a/sources/settings-migrations/v1.21.0/pluto-remove-generators-v0-1-0/src/main.rs b/sources/settings-migrations/archived/v1.21.0/pluto-remove-generators-v0-1-0/src/main.rs similarity index 100% rename from sources/settings-migrations/v1.21.0/pluto-remove-generators-v0-1-0/src/main.rs rename to sources/settings-migrations/archived/v1.21.0/pluto-remove-generators-v0-1-0/src/main.rs diff --git a/sources/settings-migrations/v1.21.0/pod-infra-container-image-affected-services/Cargo.toml b/sources/settings-migrations/archived/v1.21.0/pod-infra-container-image-affected-services/Cargo.toml similarity index 100% rename from sources/settings-migrations/v1.21.0/pod-infra-container-image-affected-services/Cargo.toml rename to sources/settings-migrations/archived/v1.21.0/pod-infra-container-image-affected-services/Cargo.toml diff --git a/sources/settings-migrations/v1.21.0/pod-infra-container-image-affected-services/src/main.rs b/sources/settings-migrations/archived/v1.21.0/pod-infra-container-image-affected-services/src/main.rs similarity index 100% rename from sources/settings-migrations/v1.21.0/pod-infra-container-image-affected-services/src/main.rs rename to sources/settings-migrations/archived/v1.21.0/pod-infra-container-image-affected-services/src/main.rs diff --git a/sources/settings-migrations/v1.21.0/pod-infra-container-image-remove-settings-generator/Cargo.toml b/sources/settings-migrations/archived/v1.21.0/pod-infra-container-image-remove-settings-generator/Cargo.toml similarity index 100% rename from sources/settings-migrations/v1.21.0/pod-infra-container-image-remove-settings-generator/Cargo.toml rename to sources/settings-migrations/archived/v1.21.0/pod-infra-container-image-remove-settings-generator/Cargo.toml diff --git a/sources/settings-migrations/v1.21.0/pod-infra-container-image-remove-settings-generator/src/main.rs b/sources/settings-migrations/archived/v1.21.0/pod-infra-container-image-remove-settings-generator/src/main.rs similarity index 100% rename from sources/settings-migrations/v1.21.0/pod-infra-container-image-remove-settings-generator/src/main.rs rename to sources/settings-migrations/archived/v1.21.0/pod-infra-container-image-remove-settings-generator/src/main.rs diff --git a/sources/settings-migrations/v1.21.0/pod-infra-container-image-services/Cargo.toml b/sources/settings-migrations/archived/v1.21.0/pod-infra-container-image-services/Cargo.toml similarity index 100% rename from sources/settings-migrations/v1.21.0/pod-infra-container-image-services/Cargo.toml rename to sources/settings-migrations/archived/v1.21.0/pod-infra-container-image-services/Cargo.toml diff --git a/sources/settings-migrations/v1.21.0/pod-infra-container-image-services/src/main.rs b/sources/settings-migrations/archived/v1.21.0/pod-infra-container-image-services/src/main.rs similarity index 100% rename from sources/settings-migrations/v1.21.0/pod-infra-container-image-services/src/main.rs rename to sources/settings-migrations/archived/v1.21.0/pod-infra-container-image-services/src/main.rs diff --git a/sources/settings-migrations/v1.21.0/bootstrap-commands-config-file-v0-1-0/Cargo.toml b/sources/settings-migrations/v1.22.0/bootstrap-commands-config-file-v0-1-0/Cargo.toml similarity index 100% rename from sources/settings-migrations/v1.21.0/bootstrap-commands-config-file-v0-1-0/Cargo.toml rename to sources/settings-migrations/v1.22.0/bootstrap-commands-config-file-v0-1-0/Cargo.toml diff --git a/sources/settings-migrations/v1.21.0/bootstrap-commands-config-file-v0-1-0/src/main.rs b/sources/settings-migrations/v1.22.0/bootstrap-commands-config-file-v0-1-0/src/main.rs similarity index 100% rename from sources/settings-migrations/v1.21.0/bootstrap-commands-config-file-v0-1-0/src/main.rs rename to sources/settings-migrations/v1.22.0/bootstrap-commands-config-file-v0-1-0/src/main.rs diff --git a/sources/settings-migrations/v1.21.0/bootstrap-commands-services-cfg-v0-1-0/Cargo.toml b/sources/settings-migrations/v1.22.0/bootstrap-commands-services-cfg-v0-1-0/Cargo.toml similarity index 100% rename from sources/settings-migrations/v1.21.0/bootstrap-commands-services-cfg-v0-1-0/Cargo.toml rename to sources/settings-migrations/v1.22.0/bootstrap-commands-services-cfg-v0-1-0/Cargo.toml diff --git a/sources/settings-migrations/v1.21.0/bootstrap-commands-services-cfg-v0-1-0/src/main.rs b/sources/settings-migrations/v1.22.0/bootstrap-commands-services-cfg-v0-1-0/src/main.rs similarity index 100% rename from sources/settings-migrations/v1.21.0/bootstrap-commands-services-cfg-v0-1-0/src/main.rs rename to sources/settings-migrations/v1.22.0/bootstrap-commands-services-cfg-v0-1-0/src/main.rs