Skip to content

Commit 6a406cf

Browse files
SimewuSimewu
committed
Stabilize K8s and Helm
1 parent 1cf3a1b commit 6a406cf

2 files changed

Lines changed: 34 additions & 28 deletions

File tree

‎RAN_Intelligent_Controllers/Near-Real-Time-RIC/install_patch_files/ric-dep/bin/install_k8s_and_helm.sh‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ else # Use docker-ce
165165

166166
# Code from (https://docs.docker.com/engine/install/ubuntu/#install-using-the-repository):
167167
sudo apt-get update
168-
sudo $APTVARS apt-get install -y ca-certificates curl
168+
sudo $APTVARS apt-get install -y curl gnupg ca-certificates
169169
sudo install -m 0755 -d /etc/apt/keyrings
170170
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
171171
sudo chmod a+r /etc/apt/keyrings/docker.asc
@@ -235,14 +235,16 @@ echo "### k8s cni version = "${KUBECNIV}
235235
echo
236236
echo "Updating Kubernetes keyring..."
237237
sudo mkdir -p /etc/apt/keyrings
238-
sudo curl -fsSL https://pkgs.k8s.io/core:/stable:/v${KUBEV}/deb/Release.key | gpg --dearmor --yes | sudo tee /etc/apt/keyrings/kubernetes-apt-keyring.gpg >/dev/null
239-
sudo echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v${KUBEV}/deb/ /" | sudo tee /etc/apt/sources.list.d/kubernetes.list
238+
sudo curl -fsSL "https://pkgs.k8s.io/core:/stable:/v${KUBEV}/deb/Release.key" | gpg --dearmor --yes | sudo tee /etc/apt/keyrings/kubernetes-apt-keyring.gpg >/dev/null
239+
echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v${KUBEV}/deb/ /" | sudo tee /etc/apt/sources.list.d/kubernetes.list >/dev/null
240240

241241
echo
242242
echo "Updating Helm keyring..."
243-
sudo mkdir -p /etc/apt/keyrings
244-
sudo curl -fsSL https://baltocdn.com/helm/signing.asc | gpg --dearmor --yes | sudo tee /etc/apt/keyrings/helm-apt-keyring.gpg >/dev/null
245-
sudo echo "deb [signed-by=/etc/apt/keyrings/helm-apt-keyring.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list
243+
sudo rm -f /etc/apt/sources.list.d/helm-stable-debian.list
244+
sudo rm -f /etc/apt/keyrings/helm-apt-keyring.gpg
245+
sudo install -d -m 0755 /usr/share/keyrings
246+
curl -fsSL https://packages.buildkite.com/helm-linux/helm-debian/gpgkey | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg >/dev/null
247+
echo "deb [signed-by=/usr/share/keyrings/helm.gpg] https://packages.buildkite.com/helm-linux/helm-debian/any/ any main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list >/dev/null
246248

247249
# If this errors you can remove Kubernetes with `sudo rm /etc/apt/sources.list.d/kubernetes.list` or remove Helm with `sudo rm /etc/apt/sources.list.d/helm-stable-debian.list`
248250
sudo apt-get update
@@ -332,8 +334,8 @@ if [[ $(cat /opt/config/stack_name.txt) == *aux* ]]; then
332334
fi
333335

334336
# Load necessary kernel modules
335-
sudo modprobe overlay
336-
sudo modprobe br_netfilter
337+
sudo modprobe overlay || true
338+
sudo modprobe br_netfilter || true
337339

338340
# Load IP Virtual Server (IPVS) modules
339341
sudo modprobe ip_vs
@@ -345,18 +347,19 @@ sudo modprobe ip_vs_sh
345347
sudo modprobe sctp
346348

347349
# Get the kernel major version
348-
KERNEL_VERSION=$(uname -r | cut -d'-' -f1)
349-
MAJOR_VERSION=$(echo $KERNEL_VERSION | cut -d'.' -f1)
350+
KERNEL_VERSION="$(uname -r | cut -d'-' -f1)"
351+
MAJOR_VERSION="$(echo "$KERNEL_VERSION" | cut -d'.' -f1)"
350352

351353
# Conditional loading of connection tracking modules based on kernel version
352354
if [ "$MAJOR_VERSION" -lt 5 ]; then
353355
# For older kernels (before version 5), load IPv4 and IPv6 specific modules
354-
sudo modprobe nf_conntrack_ipv4
355-
sudo modprobe nf_conntrack_ipv6
356-
sudo modprobe nf_conntrack_proto_sctp
356+
sudo modprobe nf_conntrack_ipv4 || true
357+
sudo modprobe nf_conntrack_ipv6 || true
358+
sudo modprobe nf_conntrack_proto_sctp || true
357359
else
358360
# For newer kernels (version 5 and later), use the unified nf_conntrack module
359-
sudo modprobe nf_conntrack
361+
sudo modprobe nf_conntrack || true
362+
sudo modprobe nf_conntrack_sctp || true
360363
fi
361364

362365
# Ensure modules are loaded on boot

‎RAN_Intelligent_Controllers/Non-Real-Time-RIC/install_patch_files/dep/ric-dep/bin/install_k8s_and_helm.sh‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ else # Use docker-ce
165165

166166
# Code from (https://docs.docker.com/engine/install/ubuntu/#install-using-the-repository):
167167
sudo apt-get update
168-
sudo $APTVARS apt-get install -y ca-certificates curl
168+
sudo $APTVARS apt-get install -y curl gnupg ca-certificates
169169
sudo install -m 0755 -d /etc/apt/keyrings
170170
sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
171171
sudo chmod a+r /etc/apt/keyrings/docker.asc
@@ -235,14 +235,16 @@ echo "### k8s cni version = "${KUBECNIV}
235235
echo
236236
echo "Updating Kubernetes keyring..."
237237
sudo mkdir -p /etc/apt/keyrings
238-
sudo curl -fsSL https://pkgs.k8s.io/core:/stable:/v${KUBEV}/deb/Release.key | gpg --dearmor --yes | sudo tee /etc/apt/keyrings/kubernetes-apt-keyring.gpg >/dev/null
239-
sudo echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v${KUBEV}/deb/ /" | sudo tee /etc/apt/sources.list.d/kubernetes.list
238+
sudo curl -fsSL "https://pkgs.k8s.io/core:/stable:/v${KUBEV}/deb/Release.key" | gpg --dearmor --yes | sudo tee /etc/apt/keyrings/kubernetes-apt-keyring.gpg >/dev/null
239+
echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v${KUBEV}/deb/ /" | sudo tee /etc/apt/sources.list.d/kubernetes.list >/dev/null
240240

241241
echo
242242
echo "Updating Helm keyring..."
243-
sudo mkdir -p /etc/apt/keyrings
244-
sudo curl -fsSL https://baltocdn.com/helm/signing.asc | gpg --dearmor --yes | sudo tee /etc/apt/keyrings/helm-apt-keyring.gpg >/dev/null
245-
sudo echo "deb [signed-by=/etc/apt/keyrings/helm-apt-keyring.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list
243+
sudo rm -f /etc/apt/sources.list.d/helm-stable-debian.list
244+
sudo rm -f /etc/apt/keyrings/helm-apt-keyring.gpg
245+
sudo install -d -m 0755 /usr/share/keyrings
246+
curl -fsSL https://packages.buildkite.com/helm-linux/helm-debian/gpgkey | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg >/dev/null
247+
echo "deb [signed-by=/usr/share/keyrings/helm.gpg] https://packages.buildkite.com/helm-linux/helm-debian/any/ any main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list >/dev/null
246248

247249
# If this errors you can remove Kubernetes with `sudo rm /etc/apt/sources.list.d/kubernetes.list` or remove Helm with `sudo rm /etc/apt/sources.list.d/helm-stable-debian.list`
248250
sudo apt-get update
@@ -332,8 +334,8 @@ if [[ $(cat /opt/config/stack_name.txt) == *aux* ]]; then
332334
fi
333335

334336
# Load necessary kernel modules
335-
sudo modprobe overlay
336-
sudo modprobe br_netfilter
337+
sudo modprobe overlay || true
338+
sudo modprobe br_netfilter || true
337339

338340
# Load IP Virtual Server (IPVS) modules
339341
sudo modprobe ip_vs
@@ -345,18 +347,19 @@ sudo modprobe ip_vs_sh
345347
sudo modprobe sctp
346348

347349
# Get the kernel major version
348-
KERNEL_VERSION=$(uname -r | cut -d'-' -f1)
349-
MAJOR_VERSION=$(echo $KERNEL_VERSION | cut -d'.' -f1)
350+
KERNEL_VERSION="$(uname -r | cut -d'-' -f1)"
351+
MAJOR_VERSION="$(echo "$KERNEL_VERSION" | cut -d'.' -f1)"
350352

351353
# Conditional loading of connection tracking modules based on kernel version
352354
if [ "$MAJOR_VERSION" -lt 5 ]; then
353355
# For older kernels (before version 5), load IPv4 and IPv6 specific modules
354-
sudo modprobe nf_conntrack_ipv4
355-
sudo modprobe nf_conntrack_ipv6
356-
sudo modprobe nf_conntrack_proto_sctp
356+
sudo modprobe nf_conntrack_ipv4 || true
357+
sudo modprobe nf_conntrack_ipv6 || true
358+
sudo modprobe nf_conntrack_proto_sctp || true
357359
else
358360
# For newer kernels (version 5 and later), use the unified nf_conntrack module
359-
sudo modprobe nf_conntrack
361+
sudo modprobe nf_conntrack || true
362+
sudo modprobe nf_conntrack_sctp || true
360363
fi
361364

362365
# Ensure modules are loaded on boot

0 commit comments

Comments
 (0)