Skip to content

Commit 13712ce

Browse files
authored
Merge pull request bottlerocket-os#4820 from jpculp/20260429-container-bump
Update admin, control, and bootstrap containers
2 parents 7f492f1 + c375b02 commit 13712ce

5 files changed

Lines changed: 10 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
* Update `bottlerocket-core-kit` from 14.1.0 to 14.2.0 [CHANGELOG](https://github.com/bottlerocket-os/bottlerocket-core-kit/blob/develop/CHANGELOG.md#v1420) ([commits](https://github.com/bottlerocket-os/bottlerocket-core-kit/compare/v14.1.0...v14.2.0)) ([#4818])
1616
* Update `bottlerocket-kernel-kit` from 5.3.3 to 5.4.0 [CHANGELOG](https://github.com/bottlerocket-os/bottlerocket-kernel-kit/blob/develop/CHANGELOG.md#v540) ([commits](https://github.com/bottlerocket-os/bottlerocket-kernel-kit/compare/v5.3.3...v5.4.0)) ([#4818])
1717
* Use the 6.18 kernel for `aws-dev` variant ([#4802])
18+
* Update `admin-container` from 0.20.5 to 0.20.6 [CHANGELOG](https://github.com/bottlerocket-os/bottlerocket-admin-container/blob/develop/CHANGELOG.md#0206) ([commits](https://github.com/bottlerocket-os/bottlerocket-admin-container/compare/v0.20.5...v0.20.6)) ([#4820])
19+
* Update `control-container` from 0.20.5 to 0.20.6 [CHANGELOG](https://github.com/bottlerocket-os/bottlerocket-control-container/blob/develop/CHANGELOG.md#0206) ([commits](https://github.com/bottlerocket-os/bottlerocket-control-container/compare/v0.20.5...v0.20.6)) ([#4820])
20+
* Update `bootstrap-container` from 0.2.15 to 0.2.16 [CHANGELOG](https://github.com/bottlerocket-os/bottlerocket-bootstrap-container/blob/develop/CHANGELOG.md#0216) ([commits](https://github.com/bottlerocket-os/bottlerocket-bootstrap-container/compare/v0.2.15...v0.2.16)) ([#4820])
1821

1922
## Build Changes
2023
* Update `bottlerocket-sdk` from 0.72.0 to 0.73.0 ([commits](https://github.com/bottlerocket-os/bottlerocket-sdk/compare/v0.72.0...v0.73.0)) ([#4818])
@@ -32,6 +35,7 @@
3235
[#4801]: https://github.com/bottlerocket-os/bottlerocket/pull/4801
3336
[#4802]: https://github.com/bottlerocket-os/bottlerocket/pull/4802
3437
[#4818]: https://github.com/bottlerocket-os/bottlerocket/pull/4818
38+
[#4820]: https://github.com/bottlerocket-os/bottlerocket/pull/4820
3539
[bottlerocket-core-kit#886]: https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/886
3640
[bottlerocket-core-kit#896]: https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/896
3741
[bottlerocket-core-kit#901]: https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/901
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[metadata.settings.bootstrap-containers.source.setting-generator]
2-
command = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-bootstrap:v0.2.15'"
2+
command = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-bootstrap:v0.2.16'"
33
strength = "weak"
44
depth = 1

sources/shared-defaults/aws-host-containers.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ enabled = false
33
superpowered = true
44

55
[metadata.settings.host-containers.admin.source.setting-generator]
6-
command = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.20.5'"
6+
command = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-admin:v0.20.6'"
77
strength = "weak"
88

99
[metadata.settings.host-containers.admin.user-data]
@@ -14,5 +14,5 @@ enabled = true
1414
superpowered = false
1515

1616
[metadata.settings.host-containers.control.source.setting-generator]
17-
command = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.20.5'"
17+
command = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-control:v0.20.6'"
1818
strength = "weak"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[metadata.settings.bootstrap-containers.source.setting-generator]
2-
command = "schnauzer-v2 render --template 'public.ecr.aws/bottlerocket/bottlerocket-bootstrap:v0.2.15'"
2+
command = "schnauzer-v2 render --template 'public.ecr.aws/bottlerocket/bottlerocket-bootstrap:v0.2.16'"
33
strength = "weak"
44
depth = 1

sources/shared-defaults/public-host-containers.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ enabled = false
88
superpowered = true
99

1010
[metadata.settings.host-containers.admin.source.setting-generator]
11-
command = "schnauzer-v2 render --template 'public.ecr.aws/bottlerocket/bottlerocket-admin:v0.20.5'"
11+
command = "schnauzer-v2 render --template 'public.ecr.aws/bottlerocket/bottlerocket-admin:v0.20.6'"
1212
strength = "weak"
1313

1414
[settings.host-containers.control]
1515
enabled = false
1616
superpowered = false
1717

1818
[metadata.settings.host-containers.control.source.setting-generator]
19-
command = "schnauzer-v2 render --template 'public.ecr.aws/bottlerocket/bottlerocket-control:v0.20.5'"
19+
command = "schnauzer-v2 render --template 'public.ecr.aws/bottlerocket/bottlerocket-control:v0.20.6'"
2020
strength = "weak"

0 commit comments

Comments
 (0)