diff --git a/kola/tests/kubeadm/kubeadm.go b/kola/tests/kubeadm/kubeadm.go index 1593b19ea..31e709141 100644 --- a/kola/tests/kubeadm/kubeadm.go +++ b/kola/tests/kubeadm/kubeadm.go @@ -67,7 +67,7 @@ func init() { register.Register(®ister.Test{ Name: "kubeadm.base", Distros: []string{"cl"}, - ExcludePlatforms: []string{"esx", "azure"}, + ExcludePlatforms: []string{"esx"}, Run: kubeadmBaseTest, }) } diff --git a/kola/tests/kubeadm/templates.go b/kola/tests/kubeadm/templates.go index abfff90ab..fa9e548ca 100644 --- a/kola/tests/kubeadm/templates.go +++ b/kola/tests/kubeadm/templates.go @@ -378,7 +378,7 @@ cat << EOF > worker-config.yaml EOF systemctl start --quiet coreos-metadata -ipv4=$(cat /run/metadata/flatcar | grep -v IPV6 | grep IP | grep -E '(PRIVATE|LOCAL)' | cut -d = -f 2) +ipv4=$(cat /run/metadata/flatcar | grep -v IPV6 | grep IP | grep -E '(PRIVATE|LOCAL|DYNAMIC)' | cut -d = -f 2) kubeadm join --config worker-config.yaml --node-name "${ipv4}"` ) diff --git a/kola/tests/kubernetes/basic.go b/kola/tests/kubernetes/basic.go index c247c3be1..d4b65f04d 100644 --- a/kola/tests/kubernetes/basic.go +++ b/kola/tests/kubernetes/basic.go @@ -52,7 +52,7 @@ func init() { Name: "google.kubernetes.basic." + r + "." + t, Run: f, ClusterSize: 0, - Platforms: []string{"gce", "do", "aws", "qemu"}, // TODO: fix packet, esx + Platforms: []string{"gce", "do", "aws", "qemu", "azure"}, // TODO: fix packet, esx Distros: []string{"cl"}, }) } diff --git a/kola/tests/kubernetes/controllerInstall.go b/kola/tests/kubernetes/controllerInstall.go index ee1d11bcc..1db49e18e 100644 --- a/kola/tests/kubernetes/controllerInstall.go +++ b/kola/tests/kubernetes/controllerInstall.go @@ -57,7 +57,7 @@ function init_config { if [ -z $ADVERTISE_IP ]; then systemctl start coreos-metadata - export ADVERTISE_IP=$(cat /run/metadata/flatcar | grep -v IPV6 | grep IP | grep -E '(PRIVATE|LOCAL)' | cut -d = -f 2) + export ADVERTISE_IP=$(cat /run/metadata/flatcar | grep -v IPV6 | grep IP | grep -E '(PRIVATE|LOCAL|DYNAMIC)' | cut -d = -f 2) fi for REQ in "${REQUIRED[@]}"; do diff --git a/kola/tests/kubernetes/workerInstall.go b/kola/tests/kubernetes/workerInstall.go index ea998f415..0fec5fa11 100644 --- a/kola/tests/kubernetes/workerInstall.go +++ b/kola/tests/kubernetes/workerInstall.go @@ -46,7 +46,7 @@ function init_config { if [ -z $ADVERTISE_IP ]; then systemctl start coreos-metadata - export ADVERTISE_IP=$(cat /run/metadata/flatcar | grep -v IPV6 | grep IP | grep -E '(PRIVATE|LOCAL)' | cut -d = -f 2) + export ADVERTISE_IP=$(cat /run/metadata/flatcar | grep -v IPV6 | grep IP | grep -E '(PRIVATE|LOCAL|DYNAMIC)' | cut -d = -f 2) fi for REQ in "${REQUIRED[@]}"; do