Skip to content

Commit a757daf

Browse files
authored
Merge pull request #990 from gthao313/k8s
update bottlerocket sample to use latest k8s version
2 parents c306f2a + 173d168 commit a757daf

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

bottlerocket/samples/Makefile.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ ARCH = { value = "x86_64", condition = { env_not_set = ["ARCH"] } }
88
CLUSTER_TYPE = { value = "eks", condition = { env_not_set = ["CLUSTER_TYPE"] } }
99
ASSUME_ROLE = { value = "~", condition = { env_not_set = ["ASSUME_ROLE"] } }
1010
AWS_REGION = { value = "us-west-2", condition = { env_not_set = ["AWS_REGION"] } }
11-
UPGRADE_VERSION = { value = "v1.20.4", condition = { env_not_set = ["UPGRADE_VERSION"] } }
11+
UPGRADE_VERSION = { value = "v1.36.0", condition = { env_not_set = ["UPGRADE_VERSION"] } }
1212
STARTING_VERSION = { script = ["""\
1313
aws ssm get-parameter \
1414
--region us-west-2 \
15-
--name "/aws/service/bottlerocket/aws-k8s-1.24/arm64/latest/image_version" \
15+
--name "/aws/service/bottlerocket/aws-k8s-1.32/arm64/latest/image_version" \
1616
--query Parameter.Value \
1717
--output text \
1818
| awk -F- '{printf "v%s", $1}' \
1919
"""], condition = { env_not_set = ["STARTING_VERSION"] } }
2020
SONOBUOY_MODE = { value = "quick", condition = { env_not_set = ["SONOBUOY_MODE"] } }
2121
TARGETS_URL = { value = "https://updates.bottlerocket.aws/targets", condition = { env_not_set = ["TARGETS_URL"] } }
22-
K8S_VERSION = { value = "v1.24", condition = { env_not_set = ["K8S_VERSION"] } }
22+
K8S_VERSION = { value = "v1.32", condition = { env_not_set = ["K8S_VERSION"] } }
2323
SINGLE_IMAGE_REPO = { value = "false", condition = { env_not_set = ["SINGLE_IMAGE_REPO"] } }
2424

2525
# The following variable needs a value only if `SINGLE_IMAGE_REPO` is "true". This value should be the name of the repository containing all agent images.
@@ -334,22 +334,22 @@ VARIANT = { value = "aws-ecs-1", condition = { env_not_set = ["VARIANT"] } }
334334
VARIANT = { value = "aws-ecs-1-nvidia", condition = { env_not_set = ["VARIANT"] } }
335335

336336
[tasks.sonobuoy-migration-test.env]
337-
VARIANT = { value = "aws-k8s-1.24", condition = { env_not_set = ["VARIANT"] } }
337+
VARIANT = { value = "aws-k8s-1.32", condition = { env_not_set = ["VARIANT"] } }
338338

339339
[tasks.sonobuoy-test.env]
340-
VARIANT = { value = "aws-k8s-1.24", condition = { env_not_set = ["VARIANT"] } }
340+
VARIANT = { value = "aws-k8s-1.32", condition = { env_not_set = ["VARIANT"] } }
341341

342342
[tasks.sonobuoy-test-karpenter.env]
343-
VARIANT = { value = "aws-k8s-1.24", condition = { env_not_set = ["VARIANT"] } }
343+
VARIANT = { value = "aws-k8s-1.32", condition = { env_not_set = ["VARIANT"] } }
344344

345345
[tasks.k8s-workload-test.env]
346-
VARIANT = { value = "aws-k8s-1.24-nvidia", condition = { env_not_set = ["VARIANT"] } }
346+
VARIANT = { value = "aws-k8s-1.32-nvidia", condition = { env_not_set = ["VARIANT"] } }
347347

348348
[tasks.vmware-migration-test.env]
349-
VARIANT = { value = "vmware-k8s-1.24", condition = { env_not_set = ["VARIANT"] } }
349+
VARIANT = { value = "vmware-k8s-1.32", condition = { env_not_set = ["VARIANT"] } }
350350

351351
[tasks.vmware-sonobuoy-test.env]
352-
VARIANT = { value = "vmware-k8s-1.24", condition = { env_not_set = ["VARIANT"] } }
352+
VARIANT = { value = "vmware-k8s-1.32", condition = { env_not_set = ["VARIANT"] } }
353353

354354
[tasks.metal-sonobuoy-test.env]
355-
VARIANT = { value = "metal-k8s-1.24", condition = { env_not_set = ["VARIANT"] } }
355+
VARIANT = { value = "metal-k8s-1.32", condition = { env_not_set = ["VARIANT"] } }

0 commit comments

Comments
 (0)