E2E: Add quick-start test using ClusterClass

Signed-off-by: Lennart Jern <[email protected]>

Author: lentzi90

Makefile

@@ -188,6 +188,7 @@ e2e-templates: $(addprefix $(E2E_NO_ARTIFACT_TEMPLATES_DIR)/, \
 		 cluster-template-multi-network.yaml \
 		 cluster-template-without-lb.yaml \
 		 cluster-template.yaml \
+		 cluster-template-topology.yaml \
 		 cluster-template-flatcar.yaml \
 		 cluster-template-k8s-upgrade.yaml \
 		 cluster-template-flatcar-sysext.yaml \
@@ -556,6 +557,7 @@ generate-release-notes: $(RELEASE_NOTES_DIR) $(RELEASE_NOTES)
 .PHONY: templates
 templates: ## Generate cluster templates
 templates: templates/cluster-template.yaml \
+	templates/cluster-template-topology.yaml \
 	templates/cluster-template-without-lb.yaml \
 	templates/cluster-template-flatcar.yaml \
 	templates/cluster-template-flatcar-sysext.yaml \

templates/cluster-template-development.yaml renamed to kustomize/v1beta1/topology/cluster-template.yaml

@@ -1,10 +1,11 @@
-apiVersion: cluster.x-k8s.io/v1beta1
+apiVersion: cluster.x-k8s.io/v1beta2
 kind: Cluster
 metadata:
   name: ${CLUSTER_NAME}
 spec:
   topology:
-    class: dev-test
+    classRef:
+      name: dev-test
     version: ${KUBERNETES_VERSION}
     controlPlane:
       replicas: ${CONTROL_PLANE_MACHINE_COUNT}

kustomize/v1beta1/topology/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- cluster-template.yaml

templates/cluster-template-topology.yaml

@@ -0,0 +1,38 @@
+apiVersion: cluster.x-k8s.io/v1beta2
+kind: Cluster
+metadata:
+  name: ${CLUSTER_NAME}
+spec:
+  topology:
+    classRef:
+      name: dev-test
+    controlPlane:
+      replicas: ${CONTROL_PLANE_MACHINE_COUNT}
+    variables:
+    - name: identityRef
+      value:
+        cloudName: ${OPENSTACK_CLOUD:=capo-e2e}
+        name: ${CLOUD_CONFIG_SECRET:=dev-test-cloud-config}
+    - name: imageName
+      value: ${IMAGE_NAME:=flatcar_production}
+    - name: addImageVersion
+      value: ${ADD_IMAGE_VERSION:=false}
+    - name: injectIgnitionSysext
+      value: ${INJECT_IGNITION_SYSEXT:=true}
+    - name: allowedCIDRs
+      value: ${OPENSTACK_API_SERVER_ALLOWED_CIDRS:=[]}
+    - name: bastion
+      value:
+        enabled: ${OPENSTACK_BASTION_ENABLED:=false}
+        spec:
+          flavor: ${OPENSTACK_BASTION_FLAVOR:=m1.small}
+          image:
+            filter:
+              name: ${OPENSTACK_BASTION_IMAGE_NAME:=ubuntu-24.04}
+          sshKeyName: ${OPENSTACK_SSH_KEY_NAME:=""}
+    version: ${KUBERNETES_VERSION}
+    workers:
+      machineDeployments:
+      - class: default-worker
+        name: md-0
+        replicas: ${WORKER_MACHINE_COUNT}

test/e2e/data/kustomize/topology/kustomization.yaml

@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- ../../../../../kustomize/v1beta1/topology
+
+components:
+- ../components/cluster-resource-sets

test/e2e/shared/defaults.go

@@ -52,6 +52,7 @@ const (
 	OpenStackNodeMachineFlavor = "OPENSTACK_NODE_MACHINE_FLAVOR"
 	SSHUserMachine             = "SSH_USER_MACHINE"
 	FlavorDefault              = ""
+	FlavorTopology             = "topology"
 	FlavorNoBastion            = "no-bastion"
 	FlavorWithoutLB            = "without-lb"
 	FlavorMultiNetwork         = "multi-network"

test/e2e/suites/e2e/quick_start_test.go

@@ -0,0 +1,43 @@
+//go:build e2e
+// +build e2e
+
+/*
+Copyright 2024 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package e2e
+
+import (
+	"context"
+
+	. "github.com/onsi/ginkgo/v2"
+	"k8s.io/utils/ptr"
+	capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
+
+	"sigs.k8s.io/cluster-api-provider-openstack/test/e2e/shared"
+)
+
+var _ = Describe("When following the Cluster API quick-start with ClusterClass [PR-Blocking] [ClusterClass]", func() {
+	capi_e2e.QuickStartSpec(context.TODO(), func() capi_e2e.QuickStartSpecInput {
+		return capi_e2e.QuickStartSpecInput{
+			E2EConfig:             e2eCtx.E2EConfig,
+			ClusterctlConfigPath:  e2eCtx.Environment.ClusterctlConfigPath,
+			BootstrapClusterProxy: e2eCtx.Environment.BootstrapClusterProxy,
+			ArtifactFolder:        e2eCtx.Settings.ArtifactFolder,
+			SkipCleanup:           false,
+			Flavor:                ptr.To(shared.FlavorTopology),
+		}
+	})
+})