Skip to content

Commit 620baa1

Browse files
bryantbiggsbryantbiggs
committed
fix: Remove Neuron from container runtime options; no longer valid since containerd is used
1 parent 4a01b11 commit 620baa1

10 files changed

+63
-74
lines changed

‎eksnode/src/commands/calculate.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ impl CalculateMaxPodsInput {
4343
};
4444
let instance = match ec2::get_instance(&instance_type)? {
4545
Some(instance) => instance,
46-
None => return Err(anyhow!("Instance type {} is not supported or invalid", &instance_type)),
46+
None => return Err(anyhow!("Instance type {instance_type} is not supported or invalid")),
4747
};
4848

4949
let prefix_supported = resource::prefix_delegation_supported(&self.cni_version)?;

‎eksnode/src/commands/join.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ struct KubeletKubeConfig {
9797
}
9898

9999
impl JoinClusterInput {
100-
/// Get the cluster details required to join the node to the cluster
100+
/// Get the cluster info required to join the node to the cluster
101101
async fn get_cluster(&self) -> Result<eks::Cluster> {
102102
let imds_data = ec2::get_imds_data().await?;
103103
debug!("Instance metadata: {imds_data:#?}");
104104

105-
// Details required to join node to cluster
105+
// Info required to join node to cluster
106106
let cluster = eks::collect_or_get_cluster(self, &imds_data.vpc_ipv4_cidr_blocks).await?;
107-
debug!("Node details: {cluster:#?}");
107+
debug!("Cluster: {cluster:#?}");
108108

109109
Ok(cluster)
110110
}

‎eksnode/src/commands/snapshots/eksnode__commands__pull__tests__it_gets_images_to_cache_apeast1_124.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ expression: imgs
55
[
66
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/eks/pause:3.8",
77
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/eks/kube-proxy:v1.24.7-eksbuild.2",
8-
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/eks/kube-proxy:v1.24.17-eksbuild.3",
8+
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/eks/kube-proxy:v1.24.17-eksbuild.4",
99
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/eks/kube-proxy:v1.24.7-minimal-eksbuild.2",
10-
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/eks/kube-proxy:v1.24.17-minimal-eksbuild.3",
10+
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/eks/kube-proxy:v1.24.17-minimal-eksbuild.4",
1111
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/amazon-k8s-cni:v1.11.4-eksbuild.1",
1212
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/amazon-k8s-cni-init:v1.11.4-eksbuild.1",
13-
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/amazon-k8s-cni:v1.15.4-eksbuild.1",
14-
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/amazon-k8s-cni-init:v1.15.4-eksbuild.1",
13+
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/amazon-k8s-cni:v1.15.5-eksbuild.1",
14+
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/amazon-k8s-cni-init:v1.15.5-eksbuild.1",
1515
]

‎eksnode/src/commands/snapshots/eksnode__commands__pull__tests__it_gets_images_to_cache_apeast1_127.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ expression: imgs
1010
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/eks/kube-proxy:v1.27.6-minimal-eksbuild.2",
1111
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/amazon-k8s-cni:v1.12.6-eksbuild.2",
1212
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/amazon-k8s-cni-init:v1.12.6-eksbuild.2",
13-
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/amazon-k8s-cni:v1.15.4-eksbuild.1",
14-
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/amazon-k8s-cni-init:v1.15.4-eksbuild.1",
13+
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/amazon-k8s-cni:v1.15.5-eksbuild.1",
14+
"800184023465.dkr.ecr.ap-east-1.amazonaws.com/amazon-k8s-cni-init:v1.15.5-eksbuild.1",
1515
]

‎eksnode/src/commands/snapshots/eksnode__commands__pull__tests__it_gets_images_to_cache_useast1_124.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ expression: imgs
55
[
66
"602401143452.dkr.ecr.us-east-1.amazonaws.com/eks/pause:3.8",
77
"602401143452.dkr.ecr.us-east-1.amazonaws.com/eks/kube-proxy:v1.24.7-eksbuild.2",
8-
"602401143452.dkr.ecr.us-east-1.amazonaws.com/eks/kube-proxy:v1.24.17-eksbuild.3",
8+
"602401143452.dkr.ecr.us-east-1.amazonaws.com/eks/kube-proxy:v1.24.17-eksbuild.4",
99
"602401143452.dkr.ecr.us-east-1.amazonaws.com/eks/kube-proxy:v1.24.7-minimal-eksbuild.2",
10-
"602401143452.dkr.ecr.us-east-1.amazonaws.com/eks/kube-proxy:v1.24.17-minimal-eksbuild.3",
10+
"602401143452.dkr.ecr.us-east-1.amazonaws.com/eks/kube-proxy:v1.24.17-minimal-eksbuild.4",
1111
"602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:v1.11.4-eksbuild.1",
1212
"602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni-init:v1.11.4-eksbuild.1",
13-
"602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:v1.15.4-eksbuild.1",
14-
"602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni-init:v1.15.4-eksbuild.1",
13+
"602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:v1.15.5-eksbuild.1",
14+
"602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni-init:v1.15.5-eksbuild.1",
1515
]

‎eksnode/src/commands/snapshots/eksnode__commands__pull__tests__it_gets_images_to_cache_useast1_127.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ expression: imgs
1010
"602401143452.dkr.ecr.us-east-1.amazonaws.com/eks/kube-proxy:v1.27.6-minimal-eksbuild.2",
1111
"602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:v1.12.6-eksbuild.2",
1212
"602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni-init:v1.12.6-eksbuild.2",
13-
"602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:v1.15.4-eksbuild.1",
14-
"602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni-init:v1.15.4-eksbuild.1",
13+
"602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:v1.15.5-eksbuild.1",
14+
"602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni-init:v1.15.5-eksbuild.1",
1515
]

‎eksnode/src/commands/snapshots/eksnode__commands__pull__tests__it_gets_images_to_cache_usgoveast1_fips_124.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ expression: imgs
55
[
66
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/eks/pause:3.8",
77
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/eks/kube-proxy:v1.24.7-eksbuild.2",
8-
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/eks/kube-proxy:v1.24.17-eksbuild.3",
8+
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/eks/kube-proxy:v1.24.17-eksbuild.4",
99
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/eks/kube-proxy:v1.24.7-minimal-eksbuild.2",
10-
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/eks/kube-proxy:v1.24.17-minimal-eksbuild.3",
10+
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/eks/kube-proxy:v1.24.17-minimal-eksbuild.4",
1111
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.11.4-eksbuild.1",
1212
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.11.4-eksbuild.1",
13-
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.15.4-eksbuild.1",
14-
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.15.4-eksbuild.1",
13+
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.15.5-eksbuild.1",
14+
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.15.5-eksbuild.1",
1515
]

‎eksnode/src/commands/snapshots/eksnode__commands__pull__tests__it_gets_images_to_cache_usgoveast1_fips_127.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ expression: imgs
1010
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/eks/kube-proxy:v1.27.6-minimal-eksbuild.2",
1111
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.12.6-eksbuild.2",
1212
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.12.6-eksbuild.2",
13-
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.15.4-eksbuild.1",
14-
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.15.4-eksbuild.1",
13+
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/amazon-k8s-cni:v1.15.5-eksbuild.1",
14+
"151742754352.dkr.ecr-fips.us-gov-east-1.amazonaws.com/amazon-k8s-cni-init:v1.15.5-eksbuild.1",
1515
]

‎eksnode/src/containerd/mod.rs‎

Lines changed: 39 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,18 @@ use taplo::formatter;
99

1010
use crate::utils;
1111

12+
pub const SANDBOX_IMAGE_SERVICE: &str = "sandbox-image.service";
1213
pub const SANDBOX_IMAGE_SERVICE_PATH: &str = "/etc/systemd/system/sandbox-image.service";
1314
pub const SANDBOX_IMAGE_TAG: &str = "3.8";
1415

1516
/// Embeds the contents of the `templates/` directory into the binary
16-
///
17-
/// This struct contains both the templates used for rendering the playbook
18-
/// as well as the static data used for populating the playbook templates
19-
/// embedded into the binary for distribution
2017
#[derive(RustEmbed)]
2118
#[folder = "src/containerd/templates/"]
2219
pub struct Templates;
2320

2421
#[derive(Copy, Clone, Debug, ValueEnum, Serialize, Deserialize)]
2522
pub enum DefaultRuntime {
2623
Containerd,
27-
Neuron,
2824
Nvidia,
2925
}
3026

@@ -35,7 +31,7 @@ impl Default for DefaultRuntime {
3531
}
3632

3733
pub fn create_sandbox_image_service<P: AsRef<Path>>(path: P, pause_image: &str, chown: bool) -> Result<()> {
38-
let tmpl = Templates::get("sandbox-image.service").unwrap();
34+
let tmpl = Templates::get(SANDBOX_IMAGE_SERVICE).unwrap();
3935
let tmpl = std::str::from_utf8(tmpl.data.as_ref())?;
4036

4137
let contents = tmpl.replace(
@@ -61,54 +57,54 @@ fn merge(a: &mut JsonValue, b: &JsonValue) {
6157

6258
fn get_plugins_config(default_runtime: &DefaultRuntime, sandbox_image: &str) -> Result<JsonValue> {
6359
let mut base = json!({
64-
"io.containerd.grpc.v1.cri": {
65-
"sandbox_image": sandbox_image,
66-
"cni": {
67-
"bin_dir": "/opt/cni/bin",
68-
"conf_dir": "/etc/cni/net.d"
69-
},
70-
"containerd": {
71-
"discard_unpacked_layers": true,
72-
},
73-
"registry": {
74-
"config_path": "/etc/containerd/certs.d"
75-
}
76-
}
60+
"io.containerd.grpc.v1.cri": {
61+
"sandbox_image": sandbox_image,
62+
"cni": {
63+
"bin_dir": "/opt/cni/bin",
64+
"conf_dir": "/etc/cni/net.d"
65+
},
66+
"containerd": {
67+
"discard_unpacked_layers": true,
68+
},
69+
"registry": {
70+
"config_path": "/etc/containerd/certs.d"
71+
}
72+
}
7773
});
7874

7975
let runtime = match default_runtime {
8076
DefaultRuntime::Nvidia => json!({
81-
"io.containerd.grpc.v1.cri": {
82-
"containerd": {
83-
"default_runtime_name": "nvidia",
84-
85-
"runtimes": {
86-
"nvidia": {
87-
"runtime_type": "io.containerd.runc.v2",
88-
"options": {
89-
"SystemdCgroup": true,
90-
"BinaryName": "/usr/bin/nvidia-container-runtime"
91-
}
92-
}
77+
"io.containerd.grpc.v1.cri": {
78+
"containerd": {
79+
"default_runtime_name": "nvidia",
80+
81+
"runtimes": {
82+
"nvidia": {
83+
"runtime_type": "io.containerd.runc.v2",
84+
"options": {
85+
"SystemdCgroup": true,
86+
"BinaryName": "/usr/bin/nvidia-container-runtime"
9387
}
9488
}
89+
}
9590
}
91+
}
9692
}),
9793
_ => json!({
98-
"io.containerd.grpc.v1.cri": {
99-
"containerd": {
100-
"default_runtime_name": "runc",
101-
102-
"runtimes": {
103-
"runc": {
104-
"runtime_type": "io.containerd.runc.v2",
105-
"options": {
106-
"SystemdCgroup": true
107-
}
108-
}
109-
}
94+
"io.containerd.grpc.v1.cri": {
95+
"containerd": {
96+
"default_runtime_name": "runc",
97+
98+
"runtimes": {
99+
"runc": {
100+
"runtime_type": "io.containerd.runc.v2",
101+
"options": {
102+
"SystemdCgroup": true
110103
}
111104
}
105+
}
106+
}
107+
}
112108
}),
113109
};
114110
merge(&mut base, &runtime);
@@ -407,13 +403,6 @@ mod tests {
407403
insta::assert_debug_snapshot!(buf);
408404
}
409405

410-
#[test]
411-
fn it_creates_neuron_containerd_config() {
412-
let sandbox_img = "602401143452.dkr.ecr.us-east-1.amazonaws.com/eks/pause:3.8";
413-
let config = ContainerdConfiguration::new(&DefaultRuntime::Neuron, sandbox_img).unwrap();
414-
insta::assert_debug_snapshot!(config);
415-
}
416-
417406
#[test]
418407
fn it_creates_nvidia_containerd_config() {
419408
let sandbox_img = "602401143452.dkr.ecr.us-east-1.amazonaws.com/eks/pause:3.8";

‎eksnode/src/eks.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ fn collect_cluster(node: &JoinClusterInput, cluster_dns_ip: IpAddr) -> Result<Op
129129
Ok(None)
130130
}
131131

132-
/// Extract cluster details from CLI input, or get directly from cluster
132+
/// Collect cluster details from CLI input, or get from cluster describe call
133133
///
134134
/// If all the necessary details required to join a node to the cluster are provided, then
135-
/// we can save an API call. Otherwise, we need to describe the cluster to get the details.
135+
/// we can save an API call. Otherwise, we need to describe the cluster to get the required info.
136136
pub async fn collect_or_get_cluster(node: &JoinClusterInput, vpc_ipv4_cidr_blocks: &[Ipv4Net]) -> Result<Cluster> {
137137
// DNS cluster IP is not related to cluster - if it cannot be derived, it should fail
138138
let cluster_dns_ip = match node.cluster_dns_ip {

0 commit comments

Comments
 (0)