feat: removes cloud-init pins

ansible/roles/providers/files/cloud-init-features.patch

@@ -0,0 +1 @@
+ERROR_ON_USER_DATA_FAILURE = False

ansible/roles/providers/tasks/aws.yml

@@ -54,19 +54,6 @@
     disablerepo: "{{ '*' if offline_mode_enabled else '' }}"
   when:
   - ansible_os_family == "RedHat"
-  - ansible_distribution_version is version('8.10', '!=')
-
- #this pins the version of cloud-init to avoid the issue here https://github.com/kubernetes-sigs/cluster-api-provider-aws/issues/4745
-- name: install cloud-init 23.1.1 for RHEL 8.10
-  yum:
-    name: cloud-init-23.1.1-10.el8
-    allow_downgrade: true
-    state: present
-    enablerepo: "{{ 'offline' if offline_mode_enabled else '' }}"
-    disablerepo: "{{ '*' if offline_mode_enabled else '' }}"
-  when:
-  - ansible_os_family == "RedHat"
-  - ansible_distribution_version is version('8.10', '==')
 
 - name: install aws clients
   pip:

ansible/roles/providers/tasks/misc.yml

@@ -71,21 +71,35 @@
     owner: root
     group: root
     mode: 0644
-  when: ansible_os_family == "Debian" and system_cloud_init_version is version('20.0.0', '>')
+  when: ansible_os_family == "Debian" and system_cloud_init_version is version('20.0.0', '>') and system_cloud_init_version is version('23.3.0', '<')
+
+- name: patch cloud-init feature flags for Debian-based OS
+  ansible.builtin.blockinfile:
+    path: /usr/lib/python3/dist-packages/cloudinit/features.py
+    marker: "# {mark} ANSIBLE MANAGED BLOCK (by image-builder)"
+    block: "{{ lookup('file', 'cloud-init-features.patch') }}"
+  when: ansible_os_family == "Debian" and system_cloud_init_version is version('23.3.0', '>=')
 
 - name: get python3 location for non-debian
   register: python3_version
   shell: python3 -c "import sysconfig; print(sysconfig.get_path('purelib'))"
   when: ansible_os_family not in ["Debian", "Flatcar"]
 
+- name: patch cloud-init feature flags for RedHat
+  ansible.builtin.blockinfile:
+    path: "{{ python3_version.stdout }}/cloudinit/features.py"
+    marker: "# {mark} ANSIBLE MANAGED BLOCK (by image-builder)"
+    block: "{{ lookup('file', 'cloud-init-features.patch') }}"
+  when: ansible_os_family == "RedHat" and system_cloud_init_version is version('23.3.0', '>=')
+
 - name: set cloudinit feature flags for non debian systems
   copy:
     src: usr/lib/python3/dist-packages/cloudinit/feature_overrides.py
     dest: "{{ python3_version.stdout }}/cloudinit/feature_overrides.py"
     owner: root
     group: root
     mode: 0644
-  when: ansible_os_family not in ["Debian", "Flatcar"] and system_cloud_init_version is version('20.0.0', '>')
+  when: ansible_os_family not in ["Debian", "Flatcar"] and system_cloud_init_version is version('20.0.0', '>') and system_cloud_init_version is version('23.3.0', '<')
 
 - name: Ensure chrony is running
   systemd:

bundles/redhat8.10/packages.txt.gotmpl

@@ -11,7 +11,7 @@ sysstat
 yum-utils
 yum-plugin-versionlock
 NetworkManager
-cloud-init-23.1.1-10.el8
+cloud-init
 cloud-utils-growpart
 container-selinux
 {{ if .FetchKubernetesRPMs -}}

bundles/ubuntu20.04/bundle.sh.gotmpl

@@ -21,8 +21,6 @@ sed -i 's/kubelet/kubelet='"{{ .KubernetesVersion }}-${KUBERNETES_DEB_BUILD_VERS
 sed -i 's/kubectl/kubectl='"{{ .KubernetesVersion }}-${KUBERNETES_DEB_BUILD_VERSION}"'/' /tmp/packages
 sed -i 's/kubeadm/kubeadm='"{{ .KubernetesVersion }}-${KUBERNETES_DEB_BUILD_VERSION}"'/' /tmp/packages
 sed -i 's/cri-tools/cri-tools='"{{ .CRIToolsVersion }}-${CRI_TOOLS_DEB_BUILD_VERSION}"'/' /tmp/packages
-# https://github.com/kubernetes-sigs/cluster-api-provider-aws/issues/4745 pins version for CAPA
-sed -i 's/cloud-init/cloud-init='"23.1.2-0ubuntu0~20.04.2"'/' /tmp/packages
 
 TMP_DIR="$(mktemp -d repodata-XXXX)"
 chmod 777 -R "${TMP_DIR}"

images/ami/ubuntu-2004.yaml

@@ -2,11 +2,6 @@
 build_name: "ubuntu-20"
 packer_builder_type: "amazon"
 python_path: ""
-# The latest cloud-init version '23.3.1-0ubuntu1~20.04.1 is unable to run #boothook created by CAPA
-# https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/0bf78b04b305a77aec37a68c107102231faa7a16/pkg/cloud/services/secretsmanager/secret_fetch_script.go#L20
-# This is a workaround to downgrade to older cloud-init version.
-# TODO: remove it when base ubuntu AMI has fixed version of cloud-init available. https://d2iq.atlassian.net/browse/D2IQ-99637
-pinned_debs: ["cloud-init=23.1.2-0ubuntu0~20.04.2"]
 packer:
   ami_filter_name: "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server*"
   ami_filter_owners: "099720109477"

images/ami/ubuntu-2204.yaml

@@ -2,10 +2,6 @@
 build_name: "ubuntu-22"
 packer_builder_type: "amazon"
 python_path: ""
-# The latest cloud-init version is unable to run #boothook created by CAPA https://github.com/kubernetes-sigs/cluster-api-provider-aws/issues/5115
-# This is a workaround to downgrade to older cloud-init version.
-# https://github.com/kubernetes-sigs/image-builder/pull/1590/files
-pinned_debs: ["cloud-init=23.1.2-0ubuntu0~22.04.1"]
 packer:
   ami_filter_name: "ubuntu/images/*ubuntu-jammy-22.04-amd64-server-*"
   ami_filter_owners: "099720109477"