Merge pull request #2399 from Nordix/lentzi90/release-templates

🌱 Release: Include ClusterClasses and Images templates

Author: k8s-ci-robot

Makefile

@@ -486,6 +486,8 @@ templates/cluster-template-%.yaml: kustomize/v1beta1/% $(KUSTOMIZE) FORCE
 .PHONY: release-templates
 release-templates: $(RELEASE_DIR) templates ## Generate release templates
 	cp templates/cluster-template*.yaml $(RELEASE_DIR)/
+	cp templates/clusterclass*.yaml $(RELEASE_DIR)/
+	cp templates/image-template*.yaml $(RELEASE_DIR)/
 
 IMAGE_PATCH_DIR := $(ARTIFACTS)/image-patch
 

docs/book/src/development/development.md

@@ -38,7 +38,7 @@ This document explains how to develop Cluster API Provider OpenStack (CAPO).
 Note that CAPO depends on ORC. No matter how you choose to work, you will need to deploy ORC in order to make CAPO functional:
 
 ```bash
-kubectl apply -f https://github.com/k-orc/openstack-resource-controller/releases/download/v1.0.0/install.yaml
+kubectl apply -f https://github.com/k-orc/openstack-resource-controller/releases/latest/download/install.yaml
 ```
 
 TL;DR: Here is a short version for how to develop with Tilt:
@@ -58,11 +58,12 @@ export RESOURCE_TYPE=...
 make tilt-up
 # Back in CAPO repo
 # Install ORC
-kubectl apply -f https://github.com/k-orc/openstack-resource-controller/releases/download/v1.0.0/install.yaml
+kubectl apply -f https://github.com/k-orc/openstack-resource-controller/releases/latest/download/install.yaml
 # Create secret with clouds.yaml (the file is created by create_devstack.sh)
 kubectl create secret generic dev-test-cloud-config --from-file=clouds.yaml
 # Add images to use in the tests
-clusterctl generate yaml --from templates/images-template.yaml | kubectl apply -f -
+clusterctl generate yaml --from templates/image-template-node.yaml | kubectl apply -f -
+clusterctl generate yaml --from templates/image-template-bastion.yaml | kubectl apply -f -
 ```
 
 At this point, you should be able to apply the `dev-test` ClusterClass and start creating/deleting `development` clusters through the Tilt UI.
@@ -95,10 +96,11 @@ After generating `infrastructure-components.yaml`, replace the `us.gcr.io/k8s-ar
 ## Automatically Adding Images to OpenStack
 
 Before you can create a Cluster, you will need a suitable image in OpenStack.
-There is a convenient template available in `templates/images-template.yaml` for this purpose.
+There are convenient templates available in `templates/image-template-*.yaml` for this purpose.
+For example:
 
 ```bash
-clusterctl generate yaml --from templates/images-template.yaml | kubectl apply -f -
+clusterctl generate yaml --from templates/image-template-node.yaml | kubectl apply -f -
 ```
 
 ## Testing Cluster Creation using the 'dev-test' ClusterClass with Tilt

templates/image-template-bastion.yaml

@@ -0,0 +1,16 @@
+---
+apiVersion: openstack.k-orc.cloud/v1alpha1
+kind: Image
+metadata:
+  name: bastion-image
+spec:
+  managementPolicy: managed
+  resource:
+    name: ubuntu-24.04
+    content:
+      diskFormat: qcow2
+      download:
+        url: ${BASTION_IMAGE_URL:="https://cloud-images.ubuntu.com/releases/noble/release/ubuntu-24.04-server-cloudimg-amd64.img"}
+  cloudCredentialsRef:
+    secretName: ${CLOUD_CONFIG_SECRET:=dev-test-cloud-config}
+    cloudName: ${OPENSTACK_CLOUD:=capo-e2e}

templates/image-template-node.yaml

@@ -0,0 +1,16 @@
+---
+apiVersion: openstack.k-orc.cloud/v1alpha1
+kind: Image
+metadata:
+  name: node-image
+spec:
+  managementPolicy: managed
+  resource:
+    name: flatcar_production
+    content:
+      diskFormat: qcow2
+      download:
+        url: ${NODE_IMAGE_URL:="https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_openstack_image.img"}
+  cloudCredentialsRef:
+    secretName: ${CLOUD_CONFIG_SECRET:=dev-test-cloud-config}
+    cloudName: ${OPENSTACK_CLOUD:=capo-e2e}