From 723634641dfc37f83f59fb05b24db3b77984b817 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 2 Jan 2025 17:42:25 +0000 Subject: [PATCH 1/4] shared-defaults: Add defaults for aws bootstrap container --- sources/shared-defaults/aws-bootstrap-container.toml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sources/shared-defaults/aws-bootstrap-container.toml diff --git a/sources/shared-defaults/aws-bootstrap-container.toml b/sources/shared-defaults/aws-bootstrap-container.toml new file mode 100644 index 00000000000..b390290bd82 --- /dev/null +++ b/sources/shared-defaults/aws-bootstrap-container.toml @@ -0,0 +1,4 @@ +[metadata.settings.bootstrap-containers.source.setting-generator] +command = "schnauzer-v2 render --requires 'aws@v1(helpers=[ecr-prefix])' --template '{{ ecr-prefix settings.aws.region }}/bottlerocket-bootstrap:v0.1.1'" +strength = "weak" +depth = 1 From da80234451dd9c8c105950de0796332e4a34e828 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 2 Jan 2025 17:50:31 +0000 Subject: [PATCH 2/4] settings-defaults: Add region based Bootstrap container for AWS variants --- .../aws-dev/defaults.d/21-aws-bootstrap-container.toml | 1 + .../aws-ecs-1-nvidia/defaults.d/21-aws-bootstrap-container.toml | 1 + .../aws-ecs-1/defaults.d/21-aws-bootstrap-container.toml | 1 + .../aws-ecs-2-nvidia/defaults.d/21-aws-bootstrap-container.toml | 1 + .../aws-ecs-2/defaults.d/21-aws-bootstrap-container.toml | 1 + .../defaults.d/21-aws-bootstrap-container.toml | 1 + .../aws-k8s-1.25/defaults.d/21-aws-bootstrap-container.toml | 1 + .../defaults.d/21-aws-bootstrap-container.toml | 1 + .../aws-k8s-1.26/defaults.d/21-aws-bootstrap-container.toml | 1 + .../defaults.d/21-aws-bootstrap-container.toml | 1 + .../aws-k8s-1.31/defaults.d/21-aws-bootstrap-container.toml | 1 + .../defaults.d/21-aws-bootstrap-container.toml | 1 + .../aws-k8s-1.32/defaults.d/21-aws-bootstrap-container.toml | 1 + 13 files changed, 13 insertions(+) create mode 120000 sources/settings-defaults/aws-dev/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-ecs-1-nvidia/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-ecs-1/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-ecs-2-nvidia/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-ecs-2/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-k8s-1.25-nvidia/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-k8s-1.25/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-k8s-1.26-nvidia/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-k8s-1.26/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-k8s-1.31-nvidia/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-k8s-1.31/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-k8s-1.32/defaults.d/21-aws-bootstrap-container.toml diff --git a/sources/settings-defaults/aws-dev/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-dev/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-dev/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-ecs-1-nvidia/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-ecs-1-nvidia/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-ecs-1-nvidia/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-ecs-1/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-ecs-1/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-ecs-1/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-ecs-2-nvidia/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-ecs-2-nvidia/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-ecs-2-nvidia/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-ecs-2/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-ecs-2/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-ecs-2/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.25-nvidia/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-k8s-1.25-nvidia/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.25-nvidia/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.25/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-k8s-1.25/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.25/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.26-nvidia/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-k8s-1.26-nvidia/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.26-nvidia/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.26/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-k8s-1.26/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.26/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.31-nvidia/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-k8s-1.31-nvidia/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.31-nvidia/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.31/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-k8s-1.31/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.31/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.32/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file From aadbef3850c84b52ad4f09c5d3905aa63bfb8d51 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 2 Jan 2025 17:44:02 +0000 Subject: [PATCH 3/4] shared-defaults: Add default public Bootstrap container --- sources/shared-defaults/public-bootstrap-containers.toml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sources/shared-defaults/public-bootstrap-containers.toml diff --git a/sources/shared-defaults/public-bootstrap-containers.toml b/sources/shared-defaults/public-bootstrap-containers.toml new file mode 100644 index 00000000000..c6a7ca36895 --- /dev/null +++ b/sources/shared-defaults/public-bootstrap-containers.toml @@ -0,0 +1,4 @@ +[metadata.settings.bootstrap-containers.source.setting-generator] +command = "schnauzer-v2 render --template 'public.ecr.aws/bottlerocket/bottlerocket-bootstrap:v0.1.1'" +strength = "weak" +depth = 1 From eee98a7fac9837b2c92a746c1afda99590784086 Mon Sep 17 00:00:00 2001 From: Shikha Vyaghra Date: Thu, 2 Jan 2025 17:52:33 +0000 Subject: [PATCH 4/4] settings-defaults:add public bootstrap container for Vmware and Metal --- .../defaults.d/21-public-bootstrap-containers.toml | 1 + .../defaults.d/21-public-bootstrap-containers.toml | 1 + 2 files changed, 2 insertions(+) create mode 120000 sources/settings-defaults/metal-k8s-1.30/defaults.d/21-public-bootstrap-containers.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.32/defaults.d/21-public-bootstrap-containers.toml diff --git a/sources/settings-defaults/metal-k8s-1.30/defaults.d/21-public-bootstrap-containers.toml b/sources/settings-defaults/metal-k8s-1.30/defaults.d/21-public-bootstrap-containers.toml new file mode 120000 index 00000000000..91c980b9381 --- /dev/null +++ b/sources/settings-defaults/metal-k8s-1.30/defaults.d/21-public-bootstrap-containers.toml @@ -0,0 +1 @@ +../../../shared-defaults/public-bootstrap-containers.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.32/defaults.d/21-public-bootstrap-containers.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/21-public-bootstrap-containers.toml new file mode 120000 index 00000000000..91c980b9381 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/21-public-bootstrap-containers.toml @@ -0,0 +1 @@ +../../../shared-defaults/public-bootstrap-containers.toml \ No newline at end of file