From 1591bee88b5be6e10f085225b1de42eca71a238b Mon Sep 17 00:00:00 2001 From: Nikhil Malik Date: Mon, 13 Nov 2023 14:52:29 +0900 Subject: [PATCH 1/2] gh-434 : apt-get is recommended over apt in scripting --- .github/workflows/advanced-lb-sanity-ubuntu-22.yml | 2 +- .github/workflows/advanced-lb-sanity.yml | 2 +- .github/workflows/basic-sanity-ubuntu-22.yml | 2 +- .github/workflows/basic-sanity.yml | 2 +- .github/workflows/cluster-sanity-ubuntu-22.yml | 2 +- .github/workflows/cluster-sanity.yml | 2 +- .github/workflows/data-store-CI.yml | 4 ++-- .github/workflows/ipsec-sanity-ubuntu-22.yml | 2 +- .github/workflows/ipsec-sanity.yml | 2 +- .github/workflows/k3s-sctpmh-2.yml | 2 +- .github/workflows/k3s-sctpmh-ubuntu-22.yml | 2 +- .github/workflows/k3s-sctpmh.yml | 2 +- .github/workflows/liveness-sanity-ubuntu-22.yml | 2 +- .github/workflows/liveness-sanity.yml | 2 +- .github/workflows/nat66-sanity-ubuntu-22.yml | 2 +- .github/workflows/nat66-sanity.yml | 2 +- .github/workflows/perf.yml | 4 ++-- .github/workflows/scale-sanity-ubuntu-22.yml | 2 +- .github/workflows/scale-sanity.yml | 2 +- .github/workflows/sctp-sanity-ubuntu-22.yml | 2 +- .github/workflows/sctp-sanity.yml | 2 +- .github/workflows/tcp-sanity-ubuntu-22.yml | 2 +- .github/workflows/tcp-sanity.yml | 2 +- .github/workflows/test-scenario.yml | 4 ++-- .github/workflows/udp-sanity-ubuntu-22.yml | 2 +- .github/workflows/udp-sanity.yml | 2 +- .travis.yml | 6 +++--- cicd/docker-k3s-lb/loxilb.sh | 4 ++-- cicd/k3s-sctpmh-2/Dockerfile | 2 +- cicd/k3s-sctpmh/Dockerfile | 2 +- cicd/k8s-calico-ipvs3/node_scripts/host.sh | 2 +- cicd/sync/client.sh | 2 +- cicd/sync/ep.sh | 2 +- cicd/sync/loxilb.sh | 2 +- 34 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/advanced-lb-sanity-ubuntu-22.yml b/.github/workflows/advanced-lb-sanity-ubuntu-22.yml index 2a8c8179b..8a2b195c0 100644 --- a/.github/workflows/advanced-lb-sanity-ubuntu-22.yml +++ b/.github/workflows/advanced-lb-sanity-ubuntu-22.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool lksctp-tools + - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool lksctp-tools - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/advanced-lb-sanity.yml b/.github/workflows/advanced-lb-sanity.yml index af7497213..026698681 100644 --- a/.github/workflows/advanced-lb-sanity.yml +++ b/.github/workflows/advanced-lb-sanity.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool + - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/basic-sanity-ubuntu-22.yml b/.github/workflows/basic-sanity-ubuntu-22.yml index a49a07bb7..6dddd6746 100644 --- a/.github/workflows/basic-sanity-ubuntu-22.yml +++ b/.github/workflows/basic-sanity-ubuntu-22.yml @@ -29,7 +29,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iproute2 + - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iproute2 - run: | sudo ip netns add test sudo ip netns del test diff --git a/.github/workflows/basic-sanity.yml b/.github/workflows/basic-sanity.yml index ea804e55a..741c80a3b 100644 --- a/.github/workflows/basic-sanity.yml +++ b/.github/workflows/basic-sanity.yml @@ -20,7 +20,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev elfutils dwarves git linux-tools-$(uname -r) libbsd-dev bridge-utils unzip build-essential bison flex iproute2 + - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev elfutils dwarves git linux-tools-$(uname -r) libbsd-dev bridge-utils unzip build-essential bison flex iproute2 - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/cluster-sanity-ubuntu-22.yml b/.github/workflows/cluster-sanity-ubuntu-22.yml index bb3bb8708..c82eece1d 100644 --- a/.github/workflows/cluster-sanity-ubuntu-22.yml +++ b/.github/workflows/cluster-sanity-ubuntu-22.yml @@ -23,7 +23,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat lksctp-tools + - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat lksctp-tools - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/cluster-sanity.yml b/.github/workflows/cluster-sanity.yml index afc898c25..adeafb10b 100644 --- a/.github/workflows/cluster-sanity.yml +++ b/.github/workflows/cluster-sanity.yml @@ -23,7 +23,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat + - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/data-store-CI.yml b/.github/workflows/data-store-CI.yml index fa9b0bfe6..6f75a8a05 100644 --- a/.github/workflows/data-store-CI.yml +++ b/.github/workflows/data-store-CI.yml @@ -37,8 +37,8 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: if [[ ${{ github.event.inputs.runsOn }} == 'ubuntu-22.04' ]]; then sudo apt -y install clang-13 lksctp-tools; else sudo apt -y install clang-10; fi - - run: sudo apt -y install llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat + - run: if [[ ${{ github.event.inputs.runsOn }} == 'ubuntu-22.04' ]]; then sudo apt-get -y install clang-13 lksctp-tools; else sudo apt-get -y install clang-10; fi + - run: sudo apt-get -y install llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/ipsec-sanity-ubuntu-22.yml b/.github/workflows/ipsec-sanity-ubuntu-22.yml index 6fbd194fe..409dbd931 100644 --- a/.github/workflows/ipsec-sanity-ubuntu-22.yml +++ b/.github/workflows/ipsec-sanity-ubuntu-22.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat + - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/ipsec-sanity.yml b/.github/workflows/ipsec-sanity.yml index b5d6c3f27..4350af604 100644 --- a/.github/workflows/ipsec-sanity.yml +++ b/.github/workflows/ipsec-sanity.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat + - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/k3s-sctpmh-2.yml b/.github/workflows/k3s-sctpmh-2.yml index c17ff60d7..72af8950b 100644 --- a/.github/workflows/k3s-sctpmh-2.yml +++ b/.github/workflows/k3s-sctpmh-2.yml @@ -14,7 +14,7 @@ jobs: name: k3s-sctpmh-2-sanity runs-on: ubuntu-20.04 steps: - - run: sudo apt -y install bridge-utils iproute2 lksctp-tools iputils-ping + - run: sudo apt-get -y install bridge-utils iproute2 lksctp-tools iputils-ping - run: | echo "KUBECONFIG=--kubeconfig=/etc/rancher/k3s/k3s.yaml" >> $GITHUB_ENV - uses: actions/checkout@v2 diff --git a/.github/workflows/k3s-sctpmh-ubuntu-22.yml b/.github/workflows/k3s-sctpmh-ubuntu-22.yml index 290071260..274d4db70 100644 --- a/.github/workflows/k3s-sctpmh-ubuntu-22.yml +++ b/.github/workflows/k3s-sctpmh-ubuntu-22.yml @@ -27,7 +27,7 @@ jobs: sudo tee /etc/apt/sources.list.d/docker.list > /dev/null sudo apt-get update sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin - - run: sudo apt -y install bridge-utils iproute2 lksctp-tools iputils-ping + - run: sudo apt-get -y install bridge-utils iproute2 lksctp-tools iputils-ping - run: | echo "KUBECONFIG=--kubeconfig=/etc/rancher/k3s/k3s.yaml" >> $GITHUB_ENV - uses: actions/checkout@v2 diff --git a/.github/workflows/k3s-sctpmh.yml b/.github/workflows/k3s-sctpmh.yml index 51a2a0871..20c72484b 100644 --- a/.github/workflows/k3s-sctpmh.yml +++ b/.github/workflows/k3s-sctpmh.yml @@ -14,7 +14,7 @@ jobs: name: k3s-sctpmh-sanity runs-on: ubuntu-20.04 steps: - - run: sudo apt -y install bridge-utils iproute2 lksctp-tools iputils-ping + - run: sudo apt-get -y install bridge-utils iproute2 lksctp-tools iputils-ping - run: | echo "KUBECONFIG=--kubeconfig=/etc/rancher/k3s/k3s.yaml" >> $GITHUB_ENV - uses: actions/checkout@v2 diff --git a/.github/workflows/liveness-sanity-ubuntu-22.yml b/.github/workflows/liveness-sanity-ubuntu-22.yml index facb97df5..1edb53c91 100644 --- a/.github/workflows/liveness-sanity-ubuntu-22.yml +++ b/.github/workflows/liveness-sanity-ubuntu-22.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool lksctp-tools + - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool lksctp-tools - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/liveness-sanity.yml b/.github/workflows/liveness-sanity.yml index 47c3df8e0..47c00a36c 100644 --- a/.github/workflows/liveness-sanity.yml +++ b/.github/workflows/liveness-sanity.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool + - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/nat66-sanity-ubuntu-22.yml b/.github/workflows/nat66-sanity-ubuntu-22.yml index d7c7b0950..0bafc76c4 100644 --- a/.github/workflows/nat66-sanity-ubuntu-22.yml +++ b/.github/workflows/nat66-sanity-ubuntu-22.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool + - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/nat66-sanity.yml b/.github/workflows/nat66-sanity.yml index c6e9e3b9a..d6dacc173 100644 --- a/.github/workflows/nat66-sanity.yml +++ b/.github/workflows/nat66-sanity.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool + - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index da4be3503..9171ab5f6 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -33,8 +33,8 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: if [[ ${{ matrix.os }} == 'ubuntu-22.04' ]]; then sudo apt -y install clang-13 lksctp-tools; else sudo apt -y install clang-10; fi - - run: sudo apt -y install llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat iperf3 + - run: if [[ ${{ matrix.os }} == 'ubuntu-22.04' ]]; then sudo apt-get -y install clang-13 lksctp-tools; else sudo apt-get -y install clang-10; fi + - run: sudo apt-get -y install llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat iperf3 - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/scale-sanity-ubuntu-22.yml b/.github/workflows/scale-sanity-ubuntu-22.yml index 198980139..1d54b23f6 100644 --- a/.github/workflows/scale-sanity-ubuntu-22.yml +++ b/.github/workflows/scale-sanity-ubuntu-22.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat lksctp-tools + - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat lksctp-tools - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/scale-sanity.yml b/.github/workflows/scale-sanity.yml index 7e18a1057..97473df43 100644 --- a/.github/workflows/scale-sanity.yml +++ b/.github/workflows/scale-sanity.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat + - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/sctp-sanity-ubuntu-22.yml b/.github/workflows/sctp-sanity-ubuntu-22.yml index efe7cc89f..0ca706a7c 100644 --- a/.github/workflows/sctp-sanity-ubuntu-22.yml +++ b/.github/workflows/sctp-sanity-ubuntu-22.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool lksctp-tools + - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool lksctp-tools - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/sctp-sanity.yml b/.github/workflows/sctp-sanity.yml index 6dedc4191..94d6f1092 100644 --- a/.github/workflows/sctp-sanity.yml +++ b/.github/workflows/sctp-sanity.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool + - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/tcp-sanity-ubuntu-22.yml b/.github/workflows/tcp-sanity-ubuntu-22.yml index 39ed03c96..2cb4ad735 100644 --- a/.github/workflows/tcp-sanity-ubuntu-22.yml +++ b/.github/workflows/tcp-sanity-ubuntu-22.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool + - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/tcp-sanity.yml b/.github/workflows/tcp-sanity.yml index ee6b14aa6..905af16fa 100644 --- a/.github/workflows/tcp-sanity.yml +++ b/.github/workflows/tcp-sanity.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool + - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/test-scenario.yml b/.github/workflows/test-scenario.yml index fc449e252..1b0933f0a 100644 --- a/.github/workflows/test-scenario.yml +++ b/.github/workflows/test-scenario.yml @@ -29,8 +29,8 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: if [[ ${{ github.event.inputs.runsOn }} == 'ubuntu-22.04' ]]; then sudo apt -y install clang-13 lksctp-tools; else sudo apt -y install clang-10; fi - - run: sudo apt -y install llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat + - run: if [[ ${{ github.event.inputs.runsOn }} == 'ubuntu-22.04' ]]; then sudo apt-get -y install clang-13 lksctp-tools; else sudo apt-get -y install clang-10; fi + - run: sudo apt-get -y install llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/udp-sanity-ubuntu-22.yml b/.github/workflows/udp-sanity-ubuntu-22.yml index 2c3c12dfa..304d7393d 100644 --- a/.github/workflows/udp-sanity-ubuntu-22.yml +++ b/.github/workflows/udp-sanity-ubuntu-22.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool + - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.github/workflows/udp-sanity.yml b/.github/workflows/udp-sanity.yml index 7b23889a4..7da71a040 100644 --- a/.github/workflows/udp-sanity.yml +++ b/.github/workflows/udp-sanity.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '>=1.18.0' - run: sudo apt-get update - - run: sudo apt -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool + - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | git clone https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ diff --git a/.travis.yml b/.travis.yml index af8917602..c32388100 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,9 @@ services: before_install: - sudo apt-get update - - sudo apt -y install clang llvm libelf-dev gcc-multilib libpcap-dev - - sudo apt -y install linux-tools-$(uname -r) - - sudo apt -y install elfutils dwarves git libbsd-dev bridge-utils + - sudo apt-get -y install clang llvm libelf-dev gcc-multilib libpcap-dev + - sudo apt-get -y install linux-tools-$(uname -r) + - sudo apt-get -y install elfutils dwarves git libbsd-dev bridge-utils - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0 - docker pull loxilbio/loxilb:beta - docker run -u root --cap-add SYS_ADMIN --restart unless-stopped --privileged -dit -v /dev/log:/dev/log --entrypoint /root/loxilb-io/loxilb/loxilb --name loxilb loxilbio/loxilb:beta diff --git a/cicd/docker-k3s-lb/loxilb.sh b/cicd/docker-k3s-lb/loxilb.sh index 54d2e4614..f0a02a235 100644 --- a/cicd/docker-k3s-lb/loxilb.sh +++ b/cicd/docker-k3s-lb/loxilb.sh @@ -14,7 +14,7 @@ apt-get install -y docker-ce sudo docker run -u root --cap-add SYS_ADMIN --restart unless-stopped --privileged --entrypoint /root/loxilb-io/loxilb/loxilb -dit -v /dev/log:/dev/log --name loxilb ghcr.io/loxilb-io/loxilb:latest #docker exec -i loxilb apt update -#docker exec -i loxilb apt -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool +#docker exec -i loxilb apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool # Create mac-vlan on top of underlying eth1 interface docker network create -d macvlan -o parent=eth1 --subnet 192.168.163.0/24 --gateway 192.168.163.1 --aux-address 'host=192.168.163.252' llbnet @@ -25,7 +25,7 @@ docker network connect llbnet loxilb --ip=192.168.163.247 # Start a docker to simulate e2 sctp endpoint docker run -u root --cap-add SYS_ADMIN -dit --privileged --name e2 eyes852/ubuntu-iperf-test:0.5 docker exec -i e2 apt update -docker exec -i e2 apt -y install lksctp-tools +docker exec -i e2 apt-get -y install lksctp-tools # Turn tx checksum offload "off" in the end-point pod for LB to work properly #/vagrant/set_chksum.sh e2 off diff --git a/cicd/k3s-sctpmh-2/Dockerfile b/cicd/k3s-sctpmh-2/Dockerfile index 505f2d718..ea6a82ddd 100644 --- a/cicd/k3s-sctpmh-2/Dockerfile +++ b/cicd/k3s-sctpmh-2/Dockerfile @@ -5,7 +5,7 @@ WORKDIR / # Install any needed packages specified in requirements.txt RUN apt update -RUN apt -y install lksctp-tools +RUN apt-get -y install lksctp-tools # Make port 9999 available to the world outside this container EXPOSE 9999 diff --git a/cicd/k3s-sctpmh/Dockerfile b/cicd/k3s-sctpmh/Dockerfile index 505f2d718..ea6a82ddd 100644 --- a/cicd/k3s-sctpmh/Dockerfile +++ b/cicd/k3s-sctpmh/Dockerfile @@ -5,7 +5,7 @@ WORKDIR / # Install any needed packages specified in requirements.txt RUN apt update -RUN apt -y install lksctp-tools +RUN apt-get -y install lksctp-tools # Make port 9999 available to the world outside this container EXPOSE 9999 diff --git a/cicd/k8s-calico-ipvs3/node_scripts/host.sh b/cicd/k8s-calico-ipvs3/node_scripts/host.sh index 7e2726014..0018bc1c1 100755 --- a/cicd/k8s-calico-ipvs3/node_scripts/host.sh +++ b/cicd/k8s-calico-ipvs3/node_scripts/host.sh @@ -1,5 +1,5 @@ # Install Bird to work with k3s -sudo apt -y install bird2 lksctp-tools +sudo apt-get -y install bird2 lksctp-tools sleep 5 diff --git a/cicd/sync/client.sh b/cicd/sync/client.sh index 8eea07ef0..fef1acfbb 100644 --- a/cicd/sync/client.sh +++ b/cicd/sync/client.sh @@ -1,3 +1,3 @@ -sudo apt -y install autoconf automake libtool bison flex gcc ncurses-dev +sudo apt-get -y install autoconf automake libtool bison flex gcc ncurses-dev git clone https://github.com/satori-com/tcpkali.git sudo ip route add 20.20.20.1 via 192.168.80.11 diff --git a/cicd/sync/ep.sh b/cicd/sync/ep.sh index e838b8cc4..abe50f702 100644 --- a/cicd/sync/ep.sh +++ b/cicd/sync/ep.sh @@ -1,4 +1,4 @@ sudo ip route add 20.20.20.1 via 192.168.90.11 sudo ip route add 192.168.80.0/24 via 192.168.90.11 -sudo apt -y install autoconf automake libtool bison flex gcc ncurses-dev +sudo apt-get -y install autoconf automake libtool bison flex gcc ncurses-dev git clone https://github.com/satori-com/tcpkali.git diff --git a/cicd/sync/loxilb.sh b/cicd/sync/loxilb.sh index 02b7d1501..558ab8b79 100644 --- a/cicd/sync/loxilb.sh +++ b/cicd/sync/loxilb.sh @@ -8,7 +8,7 @@ apt-get install -y docker-ce docker run -u root --cap-add SYS_ADMIN --restart unless-stopped --privileged --entrypoint /bin/bash -dit -v /dev/log:/dev/log --net=host --name loxilb ghcr.io/loxilb-io/loxilb:latest docker exec -it loxilb apt update -docker exec -it loxilb apt -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool +docker exec -it loxilb apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool docker exec -it loxilb git clone https://github.com/loxilb-io/loxilb.git --recurse-submodules echo alias loxicmd=\"sudo docker exec -it loxilb loxicmd\" >> ~/.bashrc From aab2cde53bc679701c9e47eec2480b9e5ac672cb Mon Sep 17 00:00:00 2001 From: Nikhil Malik Date: Mon, 13 Nov 2023 16:41:47 +0900 Subject: [PATCH 2/2] gh-434 : apt-get is recommended over apt in scripting --- Dockerfile | 8 ++++---- cicd/docker-k3s-lb/loxilb.sh | 4 ++-- cicd/ipsec2/config.sh | 8 ++++---- cicd/k0s-weave/config.sh | 2 +- cicd/k3s-calico-dual-stack/config.sh | 2 +- cicd/k3s-calico/config.sh | 2 +- cicd/k3s-cilium/config.sh | 2 +- cicd/k3s-flannel-incluster-l2/host.sh | 2 +- cicd/k3s-flannel-incluster/host.sh | 2 +- cicd/k3s-flannel/config.sh | 2 +- cicd/k3s-sctpmh-2/Dockerfile | 2 +- cicd/k3s-sctpmh-2/config.sh | 2 +- cicd/k3s-sctpmh/Dockerfile | 2 +- cicd/k3s-sctpmh/config.sh | 2 +- cicd/k8s-nat64/Vagrantfile | 4 ++-- cicd/k8s/Vagrantfile | 4 ++-- cicd/sync/loxilb.sh | 2 +- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index e191ade52..c4dd020bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,17 +14,17 @@ RUN mkdir -p /opt/loxilb && \ mkdir -p /etc/bash_completion.d/ # Update Ubuntu Software repository -RUN apt update && apt install -y wget +RUN apt-get update && apt-get install -y wget # Env for golang ENV PATH="${PATH}:/usr/local/go/bin" # Install loxilb related packages -RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && echo $arch && if [ "$arch" = "arm64" ] ; then apt install -y gcc-multilib-arm-linux-gnueabihf; else apt update && apt install -y gcc-multilib;fi && \ +RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && echo $arch && if [ "$arch" = "arm64" ] ; then apt-get install -y gcc-multilib-arm-linux-gnueabihf; else apt-get update && apt-get install -y gcc-multilib;fi && \ # Arch specific packages - GoLang wget https://go.dev/dl/go1.18.linux-${arch}.tar.gz && tar -xzf go1.18.linux-${arch}.tar.gz --directory /usr/local/ && rm go1.18.linux-${arch}.tar.gz && \ # Dev and util packages - apt install -y clang llvm libelf-dev libpcap-dev vim net-tools \ + apt-get install -y clang llvm libelf-dev libpcap-dev vim net-tools \ elfutils dwarves git libbsd-dev bridge-utils wget unzip build-essential \ bison flex sudo iproute2 pkg-config tcpdump iputils-ping keepalived curl bash-completion && \ # Install loxilb's custom ntc tool @@ -61,7 +61,7 @@ RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && echo $arch && i elfutils dwarves git bison flex wget unzip && apt-get -y autoremove && \ apt-get install -y libllvm10 && \ # cleanup unnecessary packages - if [ "$arch" = "arm64" ] ; then apt purge -y gcc-multilib-arm-linux-gnueabihf; else apt update && apt purge -y gcc-multilib;fi && \ + if [ "$arch" = "arm64" ] ; then apt purge -y gcc-multilib-arm-linux-gnueabihf; else apt-get update && apt purge -y gcc-multilib;fi && \ rm -rf /var/lib/apt/lists/* && apt clean && \ echo "if [ -f /etc/bash_completion ] && ! shopt -oq posix; then" >> /root/.bashrc && \ echo " . /etc/bash_completion" >> /root/.bashrc && \ diff --git a/cicd/docker-k3s-lb/loxilb.sh b/cicd/docker-k3s-lb/loxilb.sh index f0a02a235..955f29315 100644 --- a/cicd/docker-k3s-lb/loxilb.sh +++ b/cicd/docker-k3s-lb/loxilb.sh @@ -13,7 +13,7 @@ add-apt-repository -y "deb [arch=amd64] https://download.docker.com/linux/ubuntu apt-get install -y docker-ce sudo docker run -u root --cap-add SYS_ADMIN --restart unless-stopped --privileged --entrypoint /root/loxilb-io/loxilb/loxilb -dit -v /dev/log:/dev/log --name loxilb ghcr.io/loxilb-io/loxilb:latest -#docker exec -i loxilb apt update +#docker exec -i loxilb apt-get update #docker exec -i loxilb apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool # Create mac-vlan on top of underlying eth1 interface @@ -24,7 +24,7 @@ docker network connect llbnet loxilb --ip=192.168.163.247 # Start a docker to simulate e2 sctp endpoint docker run -u root --cap-add SYS_ADMIN -dit --privileged --name e2 eyes852/ubuntu-iperf-test:0.5 -docker exec -i e2 apt update +docker exec -i e2 apt-get update docker exec -i e2 apt-get -y install lksctp-tools # Turn tx checksum offload "off" in the end-point pod for LB to work properly diff --git a/cicd/ipsec2/config.sh b/cicd/ipsec2/config.sh index 386db7471..f46b87a45 100755 --- a/cicd/ipsec2/config.sh +++ b/cicd/ipsec2/config.sh @@ -57,15 +57,15 @@ $dexec llb2 ip route add 31.31.31.0/24 via 77.77.77.2 dev vti100 $dexec llb2 ip route add 32.32.32.0/24 via 77.77.77.2 dev vti100 $dexec llb2 loxicmd create lb 20.20.20.1 --tcp=2020:8080 --endpoints=25.25.25.1:1,26.26.26.1:1 -$dexec llb1 apt update -$dexec llb1 apt install -y strongswan strongswan-swanctl systemctl +$dexec llb1 apt-get update +$dexec llb1 apt-get install -y strongswan strongswan-swanctl systemctl docker cp llb1_ipsec_config/ipsec.conf llb1:/etc/ docker cp llb1_ipsec_config/ipsec.secrets llb1:/etc/ docker cp llb1_ipsec_config/charon.conf llb1:/etc/strongswan.d/ $dexec llb1 systemctl restart strongswan-starter -$dexec llb2 apt update -$dexec llb2 apt install -y strongswan strongswan-swanctl systemctl +$dexec llb2 apt-get update +$dexec llb2 apt-get install -y strongswan strongswan-swanctl systemctl docker cp llb2_ipsec_config/ipsec.conf llb2:/etc/ docker cp llb2_ipsec_config/ipsec.secrets llb2:/etc/ docker cp llb2_ipsec_config/charon.conf llb2:/etc/strongswan.d/ diff --git a/cicd/k0s-weave/config.sh b/cicd/k0s-weave/config.sh index f261cc690..4d31303e0 100755 --- a/cicd/k0s-weave/config.sh +++ b/cicd/k0s-weave/config.sh @@ -196,7 +196,7 @@ else fi # Install Bird to work with k0s -sudo apt install bird2 --yes +sudo apt-get install bird2 --yes sleep 5 diff --git a/cicd/k3s-calico-dual-stack/config.sh b/cicd/k3s-calico-dual-stack/config.sh index a2a711ff0..bee5dd555 100755 --- a/cicd/k3s-calico-dual-stack/config.sh +++ b/cicd/k3s-calico-dual-stack/config.sh @@ -212,7 +212,7 @@ else fi # Install Bird to work with k3s -sudo apt install bird2 --yes +sudo apt-get install bird2 --yes sleep 5 diff --git a/cicd/k3s-calico/config.sh b/cicd/k3s-calico/config.sh index 765d151ea..c076daf54 100755 --- a/cicd/k3s-calico/config.sh +++ b/cicd/k3s-calico/config.sh @@ -143,7 +143,7 @@ else fi # Install Bird to work with k3s -sudo apt install bird2 --yes +sudo apt-get install bird2 --yes sleep 5 diff --git a/cicd/k3s-cilium/config.sh b/cicd/k3s-cilium/config.sh index 564e650ce..d805a508d 100755 --- a/cicd/k3s-cilium/config.sh +++ b/cicd/k3s-cilium/config.sh @@ -159,7 +159,7 @@ else fi # Install Bird to work with k3s -sudo apt install bird2 --yes +sudo apt-get install bird2 --yes sleep 5 diff --git a/cicd/k3s-flannel-incluster-l2/host.sh b/cicd/k3s-flannel-incluster-l2/host.sh index 32cc4275a..254bc4e5e 100755 --- a/cicd/k3s-flannel-incluster-l2/host.sh +++ b/cicd/k3s-flannel-incluster-l2/host.sh @@ -1,3 +1,3 @@ -sudo apt install lksctp-tools +sudo apt-get install lksctp-tools sudo ip route add 123.123.123.0/24 via 192.168.90.10 echo "Host is up" diff --git a/cicd/k3s-flannel-incluster/host.sh b/cicd/k3s-flannel-incluster/host.sh index bdb9b7356..75f32929d 100755 --- a/cicd/k3s-flannel-incluster/host.sh +++ b/cicd/k3s-flannel-incluster/host.sh @@ -4,7 +4,7 @@ chmod 777 sctp_socat_client chmod 777 udp_client echo "123.123.123.1 k8s-svc" >> /etc/hosts -sudo apt install -y bird2 socat lksctp-tools +sudo apt-get install -y bird2 socat lksctp-tools sleep 5 diff --git a/cicd/k3s-flannel/config.sh b/cicd/k3s-flannel/config.sh index 31dcfea6f..3bacb65d8 100755 --- a/cicd/k3s-flannel/config.sh +++ b/cicd/k3s-flannel/config.sh @@ -138,7 +138,7 @@ else fi # Install Bird to work with k3s -sudo apt install bird2 --yes +sudo apt-get install bird2 --yes sleep 5 diff --git a/cicd/k3s-sctpmh-2/Dockerfile b/cicd/k3s-sctpmh-2/Dockerfile index ea6a82ddd..e8be91cc2 100644 --- a/cicd/k3s-sctpmh-2/Dockerfile +++ b/cicd/k3s-sctpmh-2/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:20.04 WORKDIR / # Install any needed packages specified in requirements.txt -RUN apt update +RUN apt-get update RUN apt-get -y install lksctp-tools # Make port 9999 available to the world outside this container diff --git a/cicd/k3s-sctpmh-2/config.sh b/cicd/k3s-sctpmh-2/config.sh index 78ebc59c6..767dd891d 100755 --- a/cicd/k3s-sctpmh-2/config.sh +++ b/cicd/k3s-sctpmh-2/config.sh @@ -170,7 +170,7 @@ else fi # Install Bird to work with k3s -sudo apt install bird2 --yes +sudo apt-get install bird2 --yes sleep 5 diff --git a/cicd/k3s-sctpmh/Dockerfile b/cicd/k3s-sctpmh/Dockerfile index ea6a82ddd..e8be91cc2 100644 --- a/cicd/k3s-sctpmh/Dockerfile +++ b/cicd/k3s-sctpmh/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:20.04 WORKDIR / # Install any needed packages specified in requirements.txt -RUN apt update +RUN apt-get update RUN apt-get -y install lksctp-tools # Make port 9999 available to the world outside this container diff --git a/cicd/k3s-sctpmh/config.sh b/cicd/k3s-sctpmh/config.sh index 3141616d9..45bb94a16 100755 --- a/cicd/k3s-sctpmh/config.sh +++ b/cicd/k3s-sctpmh/config.sh @@ -149,7 +149,7 @@ else fi # Install Bird to work with k3s -sudo apt install bird2 --yes +sudo apt-get install bird2 --yes sleep 5 diff --git a/cicd/k8s-nat64/Vagrantfile b/cicd/k8s-nat64/Vagrantfile index 172fef416..d046b2612 100644 --- a/cicd/k8s-nat64/Vagrantfile +++ b/cicd/k8s-nat64/Vagrantfile @@ -116,7 +116,7 @@ Vagrant.configure("2") do |config| # Disable swap for each vm config.vm.provision "0", type: "shell", inline: "swapoff -a" config.vm.provision "shell", inline: <<-SHELL - apt update + apt-get update mkdir -p $HOME/.kube hostnamectl set-hostname node"#{i}" SHELL @@ -125,7 +125,7 @@ Vagrant.configure("2") do |config| if config.vm.hostname == "node1" || config.vm.hostname == "k8slx-01" config.vm.provision "shell", privileged: false, inline: <<-SHELL git clone https://github.com/kubernetes-sigs/kubespray.git - sudo apt update; sudo apt install -y python3-pip sshpass; sudo pip install -r kubespray/requirements.txt + sudo apt-get update; sudo apt-get install -y python3-pip sshpass; sudo pip install -r kubespray/requirements.txt cp -rfp kubespray/inventory/sample kubespray/inventory/mycluster CONFIG_FILE=kubespray/inventory/mycluster/hosts.yml python3 kubespray/contrib/inventory_builder/inventory.py 192.168.59.211 192.168.59.212 192.168.59.213 192.168.59.214 ssh-keygen -b 2048 -t rsa -f /home/vagrant/.ssh/id_rsa -q -N "" diff --git a/cicd/k8s/Vagrantfile b/cicd/k8s/Vagrantfile index 172fef416..d046b2612 100644 --- a/cicd/k8s/Vagrantfile +++ b/cicd/k8s/Vagrantfile @@ -116,7 +116,7 @@ Vagrant.configure("2") do |config| # Disable swap for each vm config.vm.provision "0", type: "shell", inline: "swapoff -a" config.vm.provision "shell", inline: <<-SHELL - apt update + apt-get update mkdir -p $HOME/.kube hostnamectl set-hostname node"#{i}" SHELL @@ -125,7 +125,7 @@ Vagrant.configure("2") do |config| if config.vm.hostname == "node1" || config.vm.hostname == "k8slx-01" config.vm.provision "shell", privileged: false, inline: <<-SHELL git clone https://github.com/kubernetes-sigs/kubespray.git - sudo apt update; sudo apt install -y python3-pip sshpass; sudo pip install -r kubespray/requirements.txt + sudo apt-get update; sudo apt-get install -y python3-pip sshpass; sudo pip install -r kubespray/requirements.txt cp -rfp kubespray/inventory/sample kubespray/inventory/mycluster CONFIG_FILE=kubespray/inventory/mycluster/hosts.yml python3 kubespray/contrib/inventory_builder/inventory.py 192.168.59.211 192.168.59.212 192.168.59.213 192.168.59.214 ssh-keygen -b 2048 -t rsa -f /home/vagrant/.ssh/id_rsa -q -N "" diff --git a/cicd/sync/loxilb.sh b/cicd/sync/loxilb.sh index 558ab8b79..a005380a7 100644 --- a/cicd/sync/loxilb.sh +++ b/cicd/sync/loxilb.sh @@ -7,7 +7,7 @@ add-apt-repository -y "deb [arch=amd64] https://download.docker.com/linux/ubuntu apt-get install -y docker-ce docker run -u root --cap-add SYS_ADMIN --restart unless-stopped --privileged --entrypoint /bin/bash -dit -v /dev/log:/dev/log --net=host --name loxilb ghcr.io/loxilb-io/loxilb:latest -docker exec -it loxilb apt update +docker exec -it loxilb apt-get update docker exec -it loxilb apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool docker exec -it loxilb git clone https://github.com/loxilb-io/loxilb.git --recurse-submodules