github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-19 16:40:58 +00:00
Code Issues Projects Releases Wiki Activity

Update e2e related tools (#1212)

Browse Source
This commit is contained in:
Tomofumi Hayashi
2024-01-24 22:39:54 +09:00
committed by GitHub
parent 3477c9c827
commit 6812ce0ed6
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/get_tools.sh
View File

@@ -5,7 +5,7 @@ if [ ! -d bin ]; then
mkdir bin mkdir bin
fi fi
curl -Lo ./bin/kind "https://github.com/kubernetes-sigs/kind/releases/download/v0.12.0/kind-$(uname)-amd64" curl -Lo ./bin/kind "https://github.com/kubernetes-sigs/kind/releases/download/v0.20.0/kind-$(uname)-amd64"
chmod +x ./bin/kind chmod +x ./bin/kind
curl -Lo ./bin/kubectl https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl curl -Lo ./bin/kubectl https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
chmod +x ./bin/kubectl chmod +x ./bin/kubectl

6
e2e/setup_cluster.sh
View File

@@ -11,6 +11,10 @@ OCI_BIN="${OCI_BIN:-docker}"
# Acceptable values are `multus-daemonset.yml`. `multus-daemonset-thick.yml`. # Acceptable values are `multus-daemonset.yml`. `multus-daemonset-thick.yml`.
# Defaults to `multus-daemonset-thick.yml`. # Defaults to `multus-daemonset-thick.yml`.
MULTUS_MANIFEST="${MULTUS_MANIFEST:-multus-daemonset-thick.yml}" MULTUS_MANIFEST="${MULTUS_MANIFEST:-multus-daemonset-thick.yml}"
# define the dockerfile to build multus.
# Acceptable values are `Dockerfile`. `Dockerfile.thick`.
# Defaults to `Dockerfile.thick`.
MULTUS_DOCKERFILE="${MULTUS_MANIFEST:-Dockerfile.thick}"
kind_network='kind' kind_network='kind'
reg_name='kind-registry' reg_name='kind-registry'
@@ -19,7 +23,7 @@ running="$($OCI_BIN inspect -f '{{.State.Running}}' "${reg_name}" 2>/dev/null ||
if [ "${running}" != 'true' ]; then if [ "${running}" != 'true' ]; then
# run registry and push the multus image # run registry and push the multus image
$OCI_BIN run -d --restart=always -p "${reg_port}:5000" --name "${reg_name}" registry:2 $OCI_BIN run -d --restart=always -p "${reg_port}:5000" --name "${reg_name}" registry:2
$OCI_BIN build -t localhost:5000/multus:e2e -f ../images/Dockerfile .. $OCI_BIN build -t localhost:5000/multus:e2e -f ../images/${MULTUS_DOCKERFILE} ..
$OCI_BIN push localhost:5000/multus:e2e $OCI_BIN push localhost:5000/multus:e2e
fi fi
reg_host="${reg_name}" reg_host="${reg_name}"

4
e2e/templates/cni-install.yml.j2
View File

@@ -7,9 +7,9 @@ metadata:
data: data:
install_cni.sh: | install_cni.sh: |
cd /tmp cd /tmp
wget https://github.com/containernetworking/plugins/releases/download/v1.1.1/cni-plugins-linux-amd64-v1.1.1.tgz wget https://github.com/containernetworking/plugins/releases/download/v1.4.0/cni-plugins-linux-amd64-v1.4.0.tgz
cd /host/opt/cni/bin cd /host/opt/cni/bin
tar xvfzp /tmp/cni-plugins-linux-amd64-v1.1.1.tgz tar xvfzp /tmp/cni-plugins-linux-amd64-v1.4.0.tgz
sleep infinite sleep infinite
--- ---
apiVersion: apps/v1 apiVersion: apps/v1