Revert "revert all changes made to update kernels and keep 1 kernel o…

…n redhat machines (#2817)" (#2854)

This reverts commit 309a66c.

projects/kubernetes-sigs/image-builder/patches/0005-RHEL-support-and-improvements.patch

@@ -1,4 +1,4 @@
-From e8a1f1235a6f85887f2bee8110017450d2929744 Mon Sep 17 00:00:00 2001
+From 5bd56bd23692f84b4fcfb99ed331831edde522f4 Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <[email protected]>
 Date: Tue, 6 Dec 2022 15:42:02 -0600
 Subject: [PATCH 05/11] RHEL support and improvements
@@ -13,18 +13,70 @@ Subject: [PATCH 05/11] RHEL support and improvements
 - Add proxy, register with satellite, and pull packages from satellite support to redhat subscription manager
 
 Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
-
-- revert rhel kernel updates inclusion
-
-Signed-off-by: Cavaughn Browne <[email protected]>
 ---
+ images/capi/ansible/roles/node/tasks/main.yml |  3 +
+ .../capi/ansible/roles/node/tasks/redhat.yml  | 32 +++++++
  .../cloud-init.service.d/boot-order.conf      |  2 +
  .../ansible/roles/providers/tasks/main.yml    | 15 ++++
  .../capi/ansible/roles/setup/tasks/redhat.yml | 84 +++++++++++++++++++
  images/capi/packer/config/ansible-args.json   |  2 +-
- 4 files changed, 102 insertions(+), 1 deletion(-)
+ 6 files changed, 148 insertions(+), 3 deletions(-)
+ create mode 100644 images/capi/ansible/roles/node/tasks/redhat.yml
  create mode 100644 images/capi/ansible/roles/providers/files/etc/systemd/system/cloud-init.service.d/boot-order.conf
 
+diff --git a/images/capi/ansible/roles/node/tasks/main.yml b/images/capi/ansible/roles/node/tasks/main.yml
+index e0513f565..f2094927f 100644
+--- a/images/capi/ansible/roles/node/tasks/main.yml
++++ b/images/capi/ansible/roles/node/tasks/main.yml
+@@ -18,6 +18,9 @@
+ - import_tasks: amazonLinux2.yml
+   when: ansible_distribution == "Amazon"
+
++- import_tasks: redhat.yml
++  when: ansible_distribution == "RedHat"
++
+ # This is required until https://github.com/ansible/ansible/issues/77537 is fixed and used.
+ - name: Override Flatcar's OS family
+   set_fact:
+diff --git a/images/capi/ansible/roles/node/tasks/redhat.yml b/images/capi/ansible/roles/node/tasks/redhat.yml
+new file mode 100644
+index 000000000..b2133b6f1
+--- /dev/null
++++ b/images/capi/ansible/roles/node/tasks/redhat.yml
+@@ -0,0 +1,32 @@
++# Copyright 2020 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.
++
++---
++- name: Get the list of installed kernels
++  ansible.builtin.shell: "rpm -q kernel --qf '%{version}-%{release}\n' | sort -V"
++  register: installed_kernels
++
++- name: Get the current running kernel
++  ansible.builtin.command: "uname -r"
++  register: current_kernel
++
++- name: Filter out the current kernels
++  set_fact:
++    old_kernels: "{{ installed_kernels.stdout_lines | difference([current_kernel.stdout]) |list }}"
++
++- name: Remove old kernels
++  ansible.builtin.yum:
++    name: "kernel-{{ item }}"
++    state: absent
++  loop: "{{ old_kernels }}"
+\ No newline at end of file
 diff --git a/images/capi/ansible/roles/providers/files/etc/systemd/system/cloud-init.service.d/boot-order.conf b/images/capi/ansible/roles/providers/files/etc/systemd/system/cloud-init.service.d/boot-order.conf
 new file mode 100644
 index 000000000..e1059e3eb
@@ -61,7 +113,7 @@ index b55b78099..a58f0e7c0 100644
  # Enable all cloud-init services on boot.
  - name: Make sure all cloud init services are enabled
 diff --git a/images/capi/ansible/roles/setup/tasks/redhat.yml b/images/capi/ansible/roles/setup/tasks/redhat.yml
-index 74329afd4..5f00aea83 100644
+index 74329afd4..4ebe7d732 100644
 --- a/images/capi/ansible/roles/setup/tasks/redhat.yml
 +++ b/images/capi/ansible/roles/setup/tasks/redhat.yml
 @@ -22,6 +22,74 @@
@@ -143,7 +195,7 @@ index 74329afd4..5f00aea83 100644
    yum:
      name: "*"
      state: latest
-+    exclude: kernel*,cloud-init*
++    exclude: cloud-init*
      lock_timeout: 60
 
  - name: Install baseline dependencies
@@ -177,6 +229,6 @@ index d7e50f852..22225c7d3 100644
 +  "ansible_common_vars": "containerd_url={{user `containerd_url`}} containerd_sha256={{user `containerd_sha256`}} pause_image={{user `pause_image`}} containerd_additional_settings={{user `containerd_additional_settings`}} containerd_cri_socket={{user `containerd_cri_socket`}} containerd_version={{user `containerd_version`}} containerd_wasm_shims_url={{user `containerd_wasm_shims_url`}} containerd_wasm_shims_version={{user `containerd_wasm_shims_version`}} containerd_wasm_shims_sha256={{user `containerd_wasm_shims_sha256`}} containerd_wasm_shims_runtimes=\"{{user `containerd_wasm_shims_runtimes`}}\" containerd_wasm_shims_runtime_versions=\"{{user `containerd_wasm_shims_runtime_versions`}}\" crictl_url={{user `crictl_url`}} crictl_sha256={{user `crictl_sha256`}} crictl_source_type={{user `crictl_source_type`}} custom_role_names=\"{{user `custom_role_names`}}\" firstboot_custom_roles_pre=\"{{user `firstboot_custom_roles_pre`}}\" firstboot_custom_roles_post=\"{{user `firstboot_custom_roles_post`}}\" node_custom_roles_pre=\"{{user `node_custom_roles_pre`}}\" node_custom_roles_post=\"{{user `node_custom_roles_post`}}\" disable_public_repos={{user `disable_public_repos`}} extra_debs=\"{{user `extra_debs`}}\" extra_repos=\"{{user `extra_repos`}}\" extra_rpms=\"{{user `extra_rpms`}}\" http_proxy={{user `http_proxy`}} https_proxy={{user `https_proxy`}} kubeadm_template={{user `kubeadm_template`}} kubernetes_apiserver_port={{user `kubernetes_apiserver_port`}} kubernetes_cni_http_source={{user `kubernetes_cni_http_source`}} kubernetes_cni_http_checksum={{user `kubernetes_cni_http_checksum`}} kubernetes_goarch={{user `kubernetes_goarch`}} kubernetes_http_source={{user `kubernetes_http_source`}} kubernetes_container_registry={{user `kubernetes_container_registry`}} kubernetes_rpm_repo={{user `kubernetes_rpm_repo`}} kubernetes_rpm_gpg_key={{user `kubernetes_rpm_gpg_key`}} kubernetes_rpm_gpg_check={{user `kubernetes_rpm_gpg_check`}} kubernetes_deb_repo={{user `kubernetes_deb_repo`}} kubernetes_deb_gpg_key={{user `kubernetes_deb_gpg_key`}} kubernetes_cni_deb_version={{user `kubernetes_cni_deb_version`}} kubernetes_cni_rpm_version={{user `kubernetes_cni_rpm_version`}} kubernetes_cni_semver={{user `kubernetes_cni_semver`}} kubernetes_cni_source_type={{user `kubernetes_cni_source_type`}} kubernetes_semver={{user `kubernetes_semver`}} kubernetes_source_type={{user `kubernetes_source_type`}} kubernetes_load_additional_imgs={{user `kubernetes_load_additional_imgs`}} kubernetes_deb_version={{user `kubernetes_deb_version`}} kubernetes_rpm_version={{user `kubernetes_rpm_version`}} no_proxy={{user `no_proxy`}} pip_conf_file={{user `pip_conf_file`}} python_path={{user `python_path`}} redhat_epel_rpm={{user `redhat_epel_rpm`}} epel_rpm_gpg_key={{user `epel_rpm_gpg_key`}} reenable_public_repos={{user `reenable_public_repos`}} remove_extra_repos={{user `remove_extra_repos`}} systemd_prefix={{user `systemd_prefix`}} sysusr_prefix={{user `sysusr_prefix`}} sysusrlocal_prefix={{user `sysusrlocal_prefix`}} load_additional_components={{ user `load_additional_components`}} additional_registry_images={{ user `additional_registry_images`}} additional_registry_images_list={{ user `additional_registry_images_list`}} additional_url_images={{ user `additional_url_images`}} additional_url_images_list={{ user `additional_url_images_list`}} additional_executables={{ user `additional_executables`}} additional_executables_list={{ user `additional_executables_list`}} additional_executables_destination_path={{ user `additional_executables_destination_path`}} additional_s3={{ user `additional_s3`}} build_target={{ user `build_target`}} amazon_ssm_agent_rpm={{ user `amazon_ssm_agent_rpm` }} enable_containerd_audit={{ user `enable_containerd_audit` }} kubernetes_enable_automatic_resource_sizing={{ user `kubernetes_enable_automatic_resource_sizing` }} etcd_http_source={{user `etcd_http_source`}} etcd_version={{user `etcd_version`}} etcdadm_http_source={{user `etcdadm_http_source`}} etcd_sha256={{user `etcd_sha256`}} etcdadm_version={{user `etcdadm_version`}} rhsm_server_hostname={{ user `rhsm_server_hostname` }} rhsm_server_release_version={{ user `rhsm_server_release_version` }} rhsm_server_proxy_hostname={{ user `rhsm_server_proxy_hostname` }} rhsm_server_proxy_port={{ user `rhsm_server_proxy_port` }}",
    "ansible_scp_extra_args": "{{env `ANSIBLE_SCP_EXTRA_ARGS`}}"
  }
--- 
-2.39.3 (Apple Git-145)
+--
+2.34.1