diff --git a/Makefile b/Makefile index 60b2e6aa..fc1acf84 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ SHELL = /bin/bash TOP := $(dir $(firstword $(MAKEFILE_LIST))) # Variables we update as newer versions are released -BOTTLEROCKET_SDK_VERSION = v0.42.0 +BOTTLEROCKET_SDK_VERSION = v0.45.0 BOTTLEROCKET_SDK_ARCH = $(TESTSYS_BUILD_HOST_UNAME_ARCH) BOTTLEROCKET_TOOLS_VERSION ?= v0.9.0 diff --git a/bottlerocket/agents/src/bin/ec2-karpenter-resource-agent/ec2_karpenter_provider.rs b/bottlerocket/agents/src/bin/ec2-karpenter-resource-agent/ec2_karpenter_provider.rs index fd78bfad..bfc2bbfd 100644 --- a/bottlerocket/agents/src/bin/ec2-karpenter-resource-agent/ec2_karpenter_provider.rs +++ b/bottlerocket/agents/src/bin/ec2-karpenter-resource-agent/ec2_karpenter_provider.rs @@ -28,7 +28,7 @@ use std::time::Duration; use testsys_model::{Configuration, SecretName}; use tokio::fs::read_to_string; -const KARPENTER_VERSION: &str = "0.37.0"; +const KARPENTER_VERSION: &str = "1.0.5"; const CLUSTER_KUBECONFIG: &str = "/local/cluster.kubeconfig"; const PROVISIONER_YAML: &str = "/local/provisioner.yaml"; const TAINTED_NODEGROUP_NAME: &str = "tainted-nodegroup"; @@ -517,7 +517,7 @@ impl Create for Ec2KarpenterCreator { }; let provisioner = format!( - r#"apiVersion: karpenter.sh/v1beta1 + r#"apiVersion: karpenter.sh/v1 kind: NodePool metadata: name: default @@ -526,6 +526,8 @@ spec: spec: nodeClassRef: name: my-provider + group: karpenter.k8s.aws + kind: EC2NodeClass requirements: - key: kubernetes.io/arch operator: In @@ -535,7 +537,7 @@ spec: values: ['on-demand'] {} --- -apiVersion: karpenter.k8s.aws/v1beta1 +apiVersion: karpenter.k8s.aws/v1 kind: EC2NodeClass metadata: name: my-provider