Skip to content

Commit

Permalink
K8s-9979: Fix testing
Browse files Browse the repository at this point in the history
  • Loading branch information
gizquierdo-s11 committed May 14, 2024
1 parent ad4d724 commit 5edab2a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion pkg/userdata/amzn2/testdata/kubelet-v1.29.2-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -451,4 +451,4 @@ write_files:
runcmd:
- systemctl enable --now setup.service
- systemctl enable --now setup.service
28 changes: 17 additions & 11 deletions pkg/userdata/centos/testdata/kubelet-v1.29.2-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ write_files:
sysctl --system
source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi
yum install -y \
device-mapper-persistent-data \
lvm2 \
Expand All @@ -79,23 +85,23 @@ write_files:
curl \
ipvsadm
yum install -y yum-utils
yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
mkdir -p /etc/systemd/system/containerd.service.d
cat <<EOF | tee /etc/crictl.yaml
runtime-endpoint: unix:///run/containerd/containerd.sock
EOF
mkdir -p /etc/systemd/system/containerd.service.d
cat <<EOF | tee /etc/systemd/system/containerd.service.d/environment.conf
[Service]
Restart=always
EnvironmentFile=-/etc/environment
EOF
cat <<EOF | tee /etc/crictl.yaml
runtime-endpoint: unix:///run/containerd/containerd.sock
EOF
yum install -y \
containerd-1.6* \
yum-plugin-versionlock
yum versionlock add containerd
yum install -y containerd.io-1.6* yum-plugin-versionlock
yum versionlock add containerd.io
systemctl daemon-reload
systemctl enable --now containerd
Expand Down Expand Up @@ -327,7 +333,7 @@ write_files:
kubeReserved:
cpu: 200m
ephemeral-storage: 1Gi
memory: 200Mi
memory: 300Mi
logging:
flushFrequency: 0
options:
Expand All @@ -349,7 +355,7 @@ write_files:
systemReserved:
cpu: 200m
ephemeral-storage: 1Gi
memory: 200Mi
memory: 500Mi
tlsCipherSuites:
- TLS_AES_128_GCM_SHA256
- TLS_AES_256_GCM_SHA384
Expand Down
Loading

0 comments on commit 5edab2a

Please sign in to comment.