Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions inttest/Makefile.variables
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ smoketests := \
check-network-conformance-calico-ipv6-nft \
check-network-conformance-calico-nft \
check-network-conformance-kuberouter \
check-network-conformance-kuberouter-ipv6 \
check-network-conformance-kuberouter-ipv6-nft \
check-network-conformance-kuberouter-nft \
check-nllb \
check-nllb-ipv6 \
Expand All @@ -90,4 +92,6 @@ ipv6_smoketests := \
check-kuberouter-ipv6 \
check-network-conformance-calico-ipv6 \
check-network-conformance-calico-ipv6-nft \
check-network-conformance-kuberouter-ipv6 \
check-network-conformance-kuberouter-ipv6-nft \
check-nllb-ipv6
18 changes: 13 additions & 5 deletions inttest/network-conformance/network_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,21 @@ func (s *networkSuite) TestK0sGetsUp() {
err = s.WaitForNodeReady("worker1", kc)
s.NoError(err)

var daemonSetName string
var daemonSets []string
switch s.cni {
case "calico":
daemonSetName = "calico-node"
daemonSets = []string{"calico-node"}
case "kuberouter":
daemonSetName = "kube-router"
daemonSets = []string{"kube-router"}
}
s.T().Log("waiting to see CNI pods ready for", daemonSetName)
s.NoErrorf(common.WaitForDaemonSet(s.Context(), kc, daemonSetName, "kube-system"), "%s did not start", daemonSetName)
daemonSets = append(daemonSets, "kube-proxy", "konnectivity-agent")
for _, daemonSetName := range daemonSets {
s.T().Log("waiting to see CNI pods ready for", daemonSetName)
s.NoErrorf(common.WaitForDaemonSet(s.Context(), kc, daemonSetName, "kube-system"), "%s did not start", daemonSetName)
}

s.T().Log("waiting to see coredns pods ready")
s.Require().NoError(common.WaitForDeployment(s.Context(), kc, "coredns", "kube-system"))

restConfig, err := s.GetKubeConfig("controller0")
s.Require().NoError(err)
Expand Down Expand Up @@ -126,6 +132,8 @@ func (s *networkSuite) TestK0sGetsUp() {
Path: "/tmp/sonobuoy",
})
s.Require().NoError(err)
s.T().Log("Test status: ", status.Status)

s.Require().NoError(retrieveResults(r, ec))

s.T().Log("sonobuoy test status: ", status)
Expand Down
Loading