Skip to content

Commit

Permalink
Use latest golang in Vagrant based tests
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Grunert <[email protected]>
  • Loading branch information
saschagrunert committed Oct 30, 2023
1 parent edb34ac commit c33f280
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
run: make vagrant-up-fedora
- name: Show environment information
run: |
$RUN kubectl wait --for=condition=ready --timeout=60s node fedora
$RUN kubectl wait --for=condition=ready --timeout=60s nodes --all
$RUN kubectl get nodes -o wide
- name: Set up git config
run: |
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
run: make vagrant-up-ubuntu
- name: Show environment information
run: |
$RUN kubectl wait --for=condition=ready --timeout=60s node ubuntu2204
$RUN kubectl wait --for=condition=ready --timeout=60s nodes --all
$RUN kubectl get nodes -o wide
- name: Set up git config
run: |
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
run: make vagrant-up-ubuntu
- name: Show environment information
run: |
$RUN kubectl wait --for=condition=ready --timeout=60s node ubuntu2204
$RUN kubectl wait --for=condition=ready --timeout=60s nodes --all
$RUN kubectl get nodes -o wide
- name: Set up git config
run: |
Expand Down
8 changes: 0 additions & 8 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ dependencies:
match: GO_VERSION
- path: .github/workflows/olm_tests.yaml
match: GO_VERSION
- path: hack/ci/Vagrantfile-fedora
match: GO_VERSION
- path: hack/ci/Vagrantfile-ubuntu
match: GO_VERSION
- path: hack/ci/Vagrantfile-flatcar
match: GO_VERSION
- path: Makefile
match: CI_IMAGE

Expand Down Expand Up @@ -100,8 +94,6 @@ dependencies:
refPaths:
- path: hack/ci/Vagrantfile-ubuntu
match: config.vm.box
- path: .github/workflows/test.yml
match: node

- name: debian-base-digest
version: sha256:b9335fa66cdb5c1562c4f952e2d99f904dbe1618a6ed0d52487e70cf6cc280fd
Expand Down
5 changes: 3 additions & 2 deletions hack/ci/Vagrantfile-fedora
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ Vagrant.configure("2") do |config|
# Use a non-localhost DNS to avoid cluster DNS lookup loops
echo "nameserver 8.8.8.8" > /etc/resolv.conf
GO_VERSION=1.21
curl -sSfL -o- https://go.dev/dl/go$GO_VERSION.0.linux-amd64.tar.gz |
# Install Go
GO_VERSION=$(curl -sSfL "https://go.dev/VERSION?m=text" | head -n1)
curl -sSfL -o- https://go.dev/dl/$GO_VERSION.linux-amd64.tar.gz |
tar xfz - -C /usr/local
echo 'export PATH=$PATH:/usr/local/go/bin' >> /etc/profile
Expand Down
5 changes: 3 additions & 2 deletions hack/ci/Vagrantfile-flatcar
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ Vagrant.configure("2") do |config|
crictl --runtime-endpoint="unix:///run/containerd/containerd.sock" images
# Install Go
GO_VERSION=1.21
mkdir /opt/go
curl -sSfL -o- https://go.dev/dl/go$GO_VERSION.0.linux-amd64.tar.gz | tar xfz - -C /opt
GO_VERSION=$(curl -sSfL "https://go.dev/VERSION?m=text" | head -n1)
curl -sSfL -o- https://go.dev/dl/$GO_VERSION.linux-amd64.tar.gz |
tar xfz - -C /opt
# Configure the kernel modules
cat <<EOF | tee /etc/modules-load.d/k8s.conf
Expand Down
5 changes: 3 additions & 2 deletions hack/ci/Vagrantfile-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ Vagrant.configure("2") do |config|
# Use a non-localhost DNS to avoid cluster DNS lookup loops
echo "nameserver 8.8.8.8" > /etc/resolv.conf
GO_VERSION=1.21
curl -sSfL -o- https://go.dev/dl/go$GO_VERSION.0.linux-amd64.tar.gz |
# Install Go
GO_VERSION=$(curl -sSfL "https://go.dev/VERSION?m=text" | head -n1)
curl -sSfL -o- https://go.dev/dl/$GO_VERSION.linux-amd64.tar.gz |
tar xfz - -C /usr/local
# Kubernetes
Expand Down
3 changes: 1 addition & 2 deletions hack/ci/install-kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ set -euox pipefail

# Setup cluster
IP=$(ip route get 1.2.3.4 | cut -d ' ' -f7 | tr -d '[:space:]')
NODENAME=$(hostname -s)
swapoff -a
modprobe br_netfilter
sysctl -w net.ipv4.ip_forward=1
kubeadm init --apiserver-cert-extra-sans="$IP" --node-name "$NODENAME"
kubeadm init --apiserver-cert-extra-sans="$IP"

# Setup kubectl
USER=vagrant
Expand Down

0 comments on commit c33f280

Please sign in to comment.