Skip to content

Commit 0f5675d

Browse files
committed
Update test
1 parent b093039 commit 0f5675d

File tree

6 files changed

+28
-70
lines changed

6 files changed

+28
-70
lines changed

.github/workflows/test.yaml

Lines changed: 12 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,52 +29,25 @@ jobs:
2929
steps:
3030
- uses: actions/checkout@v3
3131

32-
- name: Install conntrack
33-
run: |
34-
sudo apt update
35-
sudo apt install -y conntrack
32+
- name: Set up minikube
33+
uses: sagikazarmark/setup-minikube-action@v0
3634

37-
# Install Kubernetes use apt source with specified version
38-
- name: Install Kubernetes
39-
run: |
40-
sudo snap install kubelet --channel=${{ matrix.kube-release }}/stable --classic
41-
sudo snap install kubectl --channel=${{ matrix.kube-release }}/stable --classic
42-
sudo snap install kubeadm --channel=${{ matrix.kube-release }}/stable --classic
43-
wget -O crictl-linux-amd64.tar.gz https://github.com/kubernetes-sigs/cri-tools/releases/download/v${{ matrix.kube-release }}.0/crictl-v${{ matrix.kube-release }}.0-linux-amd64.tar.gz && \
44-
sudo tar zxvf crictl-linux-amd64.tar.gz -C /usr/local/bin && \
45-
rm -f crictl-linux-amd64.tar.gz
35+
- name: Launch minikube cluster
36+
run: minikube start --kubernetes-version=v1.23.15
4637

47-
- name: Swap off
38+
- name: Get pods
4839
run: |
49-
sudo swapoff -a
50-
sudo sed -i '/ swap / s/^\(.*\)$/#\1/g' /etc/fstab
51-
52-
- name: Start Kubelet
40+
kubectl get pods -o wide --all-namespaces
41+
42+
- name: Get nodes
5343
run: |
54-
sudo mkdir /etc/systemd/system/kubelet.service.d/
55-
sudo cp ./test/etc/systemd/system/kubelet.service.d/10-kubeadm.conf /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
56-
sudo sed -i "s#/usr/bin#/snap/bin#" /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
57-
sudo cp ./test/etc/systemd/system/kubelet.service /etc/systemd/system/kubelet.service
58-
sudo cp ./test/var/lib/kubelet/kubeadm-flags.env /var/lib/kubelet/kubeadm-flags.env
59-
sudo cp ./test/var/lib/kubelet/config.yaml /var/lib/kubelet/config.yaml
60-
sudo systemctl daemon-reload
61-
sudo systemctl enable kubelet --now
62-
sleep 2
63-
sudo systemctl status kubelet || journalctl -xe -u kubelet || true
44+
kubectl get nodes -o wide
6445
65-
- name: Initialize Kubernetes
46+
- name: Install cri-dockerd
6647
run: |
67-
sudo kubeadm init || {
68-
journalctl -xeu kubelet
69-
exit 1
70-
}
48+
minikube cp install.sh /home/docker/install.sh
49+
minikube ssh -- sudo bash -c "FORCE=y /home/docker/install.sh"
7150
72-
- name: Setup kubeconfig
73-
run: |
74-
mkdir -p $HOME/.kube
75-
sudo cp -i /etc/kubernetes/admin.conf $HOME/.kube/config
76-
sudo chown $(id -u):$(id -g) $HOME/.kube/config
77-
7851
- name: Get pods
7952
run: |
8053
kubectl get pods -o wide --all-namespaces

install.sh

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,25 @@ function check_container_runtime_of_kubelet() {
5353
fi
5454
}
5555

56+
function download() {
57+
local url=$1
58+
local output=$2
59+
echo "Downloading ${url} to ${output}"
60+
if command -v wget > /dev/null; then
61+
wget -O "${output}" "${url}"
62+
elif command -v curl > /dev/null; then
63+
curl -L -o "${output}" "${url}"
64+
else
65+
echo "Neither wget nor curl is installed"
66+
exit 1
67+
fi
68+
}
69+
5670
function install_cri_dockerd() {
57-
if [[ ! -s "${BIN_PATH}/${BIN_NAME}" ]]; then
71+
if [[ ! -x "${BIN_PATH}/${BIN_NAME}" ]]; then
5872
echo "Installing cri-dockerd"
5973
if [[ ! -s "${TAR_PATH}/${TAR_NAME}" ]]; then
60-
echo "Downloading binary of cri-dockerd"
61-
mkdir -p "${TAR_PATH}" && wget -O "${TAR_PATH}/${TAR_NAME}" "${BIN_URL}"
74+
mkdir -p "${TAR_PATH}" && download "${BIN_URL}" "${TAR_PATH}/${TAR_NAME}"
6275
fi
6376
tar -xzvf "${TAR_PATH}/${TAR_NAME}" -C "${BIN_PATH}" "${BIN_NAME}" && chmod +x "${BIN_PATH}/${BIN_NAME}"
6477
echo "Binary of cri-dockerd is installed"

test/etc/systemd/system/kubelet.service

Lines changed: 0 additions & 14 deletions
This file was deleted.

test/etc/systemd/system/kubelet.service.d/10-kubeadm.conf

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/var/lib/kubelet/config.yaml

Lines changed: 0 additions & 2 deletions
This file was deleted.

test/var/lib/kubelet/kubeadm-flags.env

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)