Skip to content

Commit 6adf198

Browse files
authored
Move capi_cluster_kubernetes_version to config (#995)
* move capi_cluster kubernetes version to config * update comment and make consistent with community_images templating * fixed templating
1 parent 1f673f3 commit 6adf198

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

roles/capi_cluster/defaults/main.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,19 @@ capi_cluster_openstack_ca_cert: >-
3535
3636
# The Kubernetes version of the cluster and the id of the matching image
3737
# Default, wire these up with an image from community images when available
38-
capi_cluster_kubernetes_version: >-
39-
{{-
40-
community_images.kube_1_32.kubernetes_version
41-
if community_images is defined and 'kube_1_32' in community_images
42-
else undef(hint = 'capi_cluster_kubernetes_version is required')
43-
}}
38+
# capi_cluster_kubernetes_version must have a matching key in community_images
39+
# e.g `community_images.kube_1_32` is required for `capi_cluster_kubernetes_version: v1.32`
40+
capi_cluster_kubernetes_version: "{{ undef(hint='capi_cluster_kubernetes_version is required') }}"
41+
# Extract minor and major version and filter into format of community images key
42+
_capi_cluster_community_images_key: "kube_{{ (capi_cluster_kubernetes_version
43+
| regex_replace('^v', '') | split('.'))[:-1] | join('_')
44+
}}"
4445
capi_cluster_machine_image_id: >-
4546
{{-
46-
community_images_image_ids.kube_1_32
47+
community_images_image_ids[_capi_cluster_community_images_key]
4748
if (
4849
community_images_image_ids is defined and
49-
'kube_1_32' in community_images_image_ids
50+
_capi_cluster_community_images_key in community_images_image_ids
5051
)
5152
else undef(hint = 'capi_cluster_machine_image_id is required')
5253
}}

0 commit comments

Comments
 (0)