Merge pull request kubernetes-sigs#10060 from sbueringer/pr-add-conformance-tests

🌱 Add conformance e2e tests

Author: k8s-ci-robot

scripts/ci-e2e-lib.sh

@@ -65,6 +65,13 @@ k8s::prepareKindestImages() {
     kind::prepareKindestImage "$resolveVersion"
   fi
 
+  if [ -n "${KUBERNETES_VERSION_LATEST_CI:-}" ]; then
+    k8s::resolveVersion "KUBERNETES_VERSION_LATEST_CI" "$KUBERNETES_VERSION_LATEST_CI"
+    export KUBERNETES_VERSION_LATEST_CI=$resolveVersion
+
+    kind::prepareKindestImage "$resolveVersion"
+  fi
+
   if [ -n "${BUILD_NODE_IMAGE_TAG:-}" ]; then
     k8s::resolveVersion "BUILD_NODE_IMAGE_TAG" "$BUILD_NODE_IMAGE_TAG"
     export BUILD_NODE_IMAGE_TAG=$resolveVersion

scripts/ci-e2e.sh

@@ -44,6 +44,7 @@ capi:buildDockerImages
 # - KUBERNETES_VERSION
 # - KUBERNETES_VERSION_UPGRADE_TO
 # - KUBERNETES_VERSION_UPGRADE_FROM
+# - KUBERNETES_VERSION_LATEST_CI
 k8s::prepareKindestImages
 
 # pre-pull all the images that will be used in the e2e, thus making the actual test run

test/e2e/config/docker.yaml

@@ -241,6 +241,7 @@ variables:
   KUBERNETES_VERSION: "v1.29.0"
   KUBERNETES_VERSION_UPGRADE_FROM: "v1.28.0"
   KUBERNETES_VERSION_UPGRADE_TO: "v1.29.0"
+  KUBERNETES_VERSION_LATEST_CI: "ci/latest-1.30"
   ETCD_VERSION_UPGRADE_TO: "3.5.10-0"
   COREDNS_VERSION_UPGRADE_TO: "v1.11.1"
   DOCKER_SERVICE_DOMAIN: "cluster.local"

test/e2e/k8s_conformance_test.go

@@ -21,10 +21,13 @@ package e2e
 
 import (
 	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 	"k8s.io/utils/ptr"
+
+	"sigs.k8s.io/cluster-api/test/framework/kubernetesversions"
 )
 
-var _ = Describe("When testing K8S conformance [Conformance]", func() {
+var _ = Describe("When testing K8S conformance [Conformance] [K8s-Install]", func() {
 	K8SConformanceSpec(ctx, func() K8SConformanceSpecInput {
 		return K8SConformanceSpecInput{
 			E2EConfig:              e2eConfig,
@@ -35,3 +38,23 @@ var _ = Describe("When testing K8S conformance [Conformance]", func() {
 			InfrastructureProvider: ptr.To("docker")}
 	})
 })
+
+var _ = Describe("When testing K8S conformance with K8S latest ci [Conformance] [K8s-Install-ci-latest]", func() {
+	K8SConformanceSpec(ctx, func() K8SConformanceSpecInput {
+		kubernetesVersion, err := kubernetesversions.ResolveVersion(ctx, e2eConfig.Variables["KUBERNETES_VERSION_LATEST_CI"])
+		Expect(err).NotTo(HaveOccurred())
+
+		// Kubernetes version has to be set as KUBERNETES_VERSION because the conformance test
+		// expects it there.
+		testSpecificE2EConfig := e2eConfig.DeepCopy()
+		e2eConfig.Variables["KUBERNETES_VERSION"] = kubernetesVersion
+
+		return K8SConformanceSpecInput{
+			E2EConfig:              testSpecificE2EConfig,
+			ClusterctlConfigPath:   clusterctlConfigPath,
+			BootstrapClusterProxy:  bootstrapClusterProxy,
+			ArtifactFolder:         artifactFolder,
+			SkipCleanup:            skipCleanup,
+			InfrastructureProvider: ptr.To("docker")}
+	})
+})