test: validate CoreDNS image version in e2e tests

Author: dkoshkin

test/e2e/coredns_helpers.go

@@ -8,10 +8,13 @@ package e2e
 import (
 	"context"
 
+	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/test/framework"
+
+	corednsversions "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/versions"
 )
 
 type WaitForCoreDNSToBeReadyInWorkloadClusterInput struct {
@@ -38,3 +41,34 @@ func WaitForCoreDNSToBeReadyInWorkloadCluster(
 		},
 	}, input.DeploymentIntervals...)
 }
+
+// WaitForDNSUpgradeInput is the input for WaitForDNSUpgrade.
+type WaitForDNSUpgradeInput struct {
+	WorkloadCluster     *clusterv1.Cluster
+	ClusterProxy        framework.ClusterProxy
+	DeploymentIntervals []interface{}
+}
+
+// WaitForCoreDNSImageVersion waits for the CoreDNS image to be updated to the default version,
+// based on the Kubernetes version.
+func WaitForCoreDNSImageVersion(
+	ctx context.Context,
+	input WaitForDNSUpgradeInput,
+) {
+	workloadClusterClient := input.ClusterProxy.GetWorkloadCluster(
+		ctx, input.WorkloadCluster.Namespace, input.WorkloadCluster.Name,
+	).GetClient()
+
+	defaultCoreDNSVersion, found :=
+		corednsversions.GetCoreDNSVersion(input.WorkloadCluster.Spec.Topology.Version)
+	Expect(found).To(
+		BeTrue(),
+		"failed to get default CoreDNS version for Cluster version %s",
+		input.WorkloadCluster.Spec.Topology.Version,
+	)
+
+	framework.WaitForDNSUpgrade(ctx, framework.WaitForDNSUpgradeInput{
+		Getter:     workloadClusterClient,
+		DNSVersion: defaultCoreDNSVersion,
+	})
+}

test/e2e/quick_start_test.go

@@ -280,6 +280,17 @@ var _ = Describe("Quick start", func() {
 													},
 												)
 
+												WaitForCoreDNSImageVersion(
+													ctx,
+													WaitForDNSUpgradeInput{
+														WorkloadCluster: workloadCluster,
+														ClusterProxy:    proxy,
+														DeploymentIntervals: testE2EConfig.GetIntervals(
+															flavour,
+															"wait-deployment",
+														),
+													})
+
 												WaitForCoreDNSToBeReadyInWorkloadCluster(
 													ctx,
 													WaitForCoreDNSToBeReadyInWorkloadClusterInput{

test/e2e/self_hosted_test.go

@@ -18,6 +18,7 @@ import (
 
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
 	apivariables "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/variables"
+	corednsversions "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/versions"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables"
 	"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/test/e2e/framework"
 )
@@ -142,6 +143,19 @@ var _ = Describe("Self-hosted", Serial, func() {
 														},
 													)
 
+													defaultCoreDNSVersion, found := corednsversions.GetCoreDNSVersion(
+														workloadCluster.Spec.Topology.Version,
+													)
+													if found {
+														capiframework.WaitForDNSUpgrade(
+															ctx,
+															capiframework.WaitForDNSUpgradeInput{
+																Getter:     proxy.GetClient(),
+																DNSVersion: defaultCoreDNSVersion,
+															},
+														)
+													}
+
 													WaitForCoreDNSToBeReadyInWorkloadCluster(
 														ctx,
 														WaitForCoreDNSToBeReadyInWorkloadClusterInput{