Skip to content

Commit f3f44d9

Browse files
committed
feat: Remove spegel layer configuration
1 parent fcec146 commit f3f44d9

File tree

3 files changed

+4
-18
lines changed

3 files changed

+4
-18
lines changed

cluster_connect.sh.tpl

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,4 @@ fi
1919
--use-max-pods ${use_max_pods} \
2020
--kubelet-extra-args '--node-labels=${node_labels} --register-with-taints=${node_taints} ${kubelet_extra_args}' \
2121
--b64-cluster-ca ${base64_cluster_ca} \
22-
--apiserver-endpoint ${api_server_url}
23-
24-
%{ if discard_unpacked_layers == false }
25-
# Retain unpacked layers. We avoid using the configuration merge capability of containerd due to a known bug.
26-
# For more details, refer to: https://github.com/containerd/containerd/issues/5837
27-
sed -i '/discard_unpacked_layers = true/s/true/false/' /etc/containerd/config.toml
28-
systemctl restart containerd
29-
%{ endif }
22+
--apiserver-endpoint ${api_server_url}

node_group_advanced.tf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,9 @@ resource "aws_launch_template" "quortex_launch_tpl" {
121121
)
122122
: "${k}=${v}"]
123123
)
124-
use_max_pods = var.node_use_max_pods
125-
cni_version = try(var.vpc_cni_addon.version, "")
126-
show_max_allowed = var.node_use_max_pods_allowed
127-
discard_unpacked_layers = var.discard_unpacked_layers
124+
use_max_pods = var.node_use_max_pods
125+
cni_version = try(var.vpc_cni_addon.version, "")
126+
show_max_allowed = var.node_use_max_pods_allowed
128127
}
129128
)
130129
}

variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,6 @@ variable "node_use_max_pods" {
210210
description = "Set to false to prevent EKS from setting --max-pods in Kubelet config. By default, EKS sets the maximum number of pods that can run on the node, based on the instance type. Disabling this can be useful when using a CNI other than the default, like Calico."
211211
}
212212

213-
variable "discard_unpacked_layers" {
214-
type = bool
215-
default = true
216-
description = "Set to false to keep unpacked layers on the node after the image is pulled. By default, EKS will clean up the unpacked layers to save disk space."
217-
}
218-
219213
variable "node_use_max_pods_allowed" {
220214
type = bool
221215
default = false

0 commit comments

Comments
 (0)