Skip to content

Commit

Permalink
add networkManager to disable dhcp on vfs
Browse files Browse the repository at this point in the history
disable dhcp on vfs for vanilly k8s CI.
if we don't disable it the device plugin will not use this devices

Signed-off-by: Sebastian Sch <sebassch@gmail.com>
  • Loading branch information
SchSeba committed Oct 5, 2023
1 parent 3241c2f commit 3996f73
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 12 deletions.
8 changes: 7 additions & 1 deletion api/v1/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"strconv"
"strings"

"github.com/go-logr/logr"
netattdefv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -41,7 +42,12 @@ const (
const invalidVfIndex = -1

var ManifestsPath = "./bindata/manifests/cni-config"
var log = logf.Log.WithName("sriovnetwork")

var log logr.Logger

func init() {
logf.Log.WithName("sriovnetwork")
}

// NicIDMap contains supported mapping of IDs with each in the format of:
// Vendor ID, Physical Function Device ID, Virtual Function Device ID
Expand Down
38 changes: 27 additions & 11 deletions hack/run-e2e-conformance-virtual-cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,24 +126,38 @@ cat << EOF > /etc/containers/registries.conf.d/003-${cluster_name}.conf
$insecure_registry
EOF

kcli ssh $cluster_name-ctlplane-0 << EOF
function update_host() {
node_name=$1
kcli ssh $node_name << EOF
sudo su
echo '$insecure_registry' > /etc/containers/registries.conf.d/003-internal.conf
systemctl restart crio
EOF
kcli ssh $cluster_name-worker-0 << EOF
sudo su
echo '$insecure_registry' > /etc/containers/registries.conf.d/003-internal.conf
systemctl restart crio
EOF
echo '[connection]
id=multi
type=ethernet
[ethernet]
[match]
driver=igbvf;
[ipv4]
method=disabled
[ipv6]
addr-gen-mode=default
method=disabled
[proxy]' > /etc/NetworkManager/system-connections/multi.nmconnection
chmod 600 /etc/NetworkManager/system-connections/multi.nmconnection
systemctl restart NetworkManager
kcli ssh $cluster_name-worker-1 << EOF
sudo su
echo '$insecure_registry' > /etc/containers/registries.conf.d/003-internal.conf
systemctl restart crio
EOF

}

update_host $cluster_name-ctlplane-0
update_host $cluster_name-worker-0
update_host $cluster_name-worker-1


kubectl create namespace container-registry

echo "## deploy internal registry"
Expand Down Expand Up @@ -349,3 +363,5 @@ if [ -z $SKIP_TEST ]; then
echo "## run sriov e2e conformance tests"
SUITE=./test/conformance JUNIT_OUTPUT=`pwd`/k8s-artifacts hack/run-e2e-conformance.sh
fi

}

0 comments on commit 3996f73

Please sign in to comment.