diff --git a/Common.mk b/Common.mk index 27da5cf7a9..a1786c4531 100644 --- a/Common.mk +++ b/Common.mk @@ -986,7 +986,7 @@ ensure-locale: @if [ "Linux" = "$$(uname -s)" ]; then \ LOCALE=$$(locale | grep LANG | cut -d= -f2 | tr -d '"' | tr '[:upper:]' '[:lower:]'); \ if [[ "c.utf-8 posix" != *"$${LOCALE:-posix}"* ]]; then \ - echo WARNING: Environment locale set to $(LANG). On Linux systems this may create \ + echo WARNING: Environment locale set to $$LOCALE. On Linux systems this may create \ non-deterministic behavior when running generation recipes. If the CI fails validation try \ exporting LANG=C.UTF-8 to generate files instead.; \ fi; \ diff --git a/Makefile b/Makefile index 6e00063ad1..a94757bad5 100644 --- a/Makefile +++ b/Makefile @@ -134,7 +134,7 @@ ensure-locale: @if [ "Linux" = "$$(uname -s)" ]; then \ LOCALE=$$(locale | grep LANG | cut -d= -f2 | tr -d '"' | tr '[:upper:]' '[:lower:]'); \ if [[ "c.utf-8 posix" != *"$${LOCALE:-posix}"* ]]; then \ - echo WARNING: Environment locale set to $(LANG). On Linux systems this may create \ + echo WARNING: Environment locale set to $$LOCALE. On Linux systems this may create \ non-deterministic behavior when running generation recipes. If the CI fails validation try \ exporting LANG=C.UTF-8 to generate files instead.; \ fi; \ diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index 30ba7fba94..87e9d83c00 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -201,7 +201,7 @@ projects: go_version: "1.19" - name: image-builder versions: - - tag: v0.1.16 + - tag: v0.1.19 go_version: N/A - name: kind versions: diff --git a/projects/kubernetes-sigs/image-builder/GIT_TAG b/projects/kubernetes-sigs/image-builder/GIT_TAG index a33ca21ca9..a3c20cb84f 100644 --- a/projects/kubernetes-sigs/image-builder/GIT_TAG +++ b/projects/kubernetes-sigs/image-builder/GIT_TAG @@ -1 +1 @@ -v0.1.16 \ No newline at end of file +v0.1.19 \ No newline at end of file diff --git a/projects/kubernetes-sigs/image-builder/Makefile b/projects/kubernetes-sigs/image-builder/Makefile index 8bdc331143..afa6f506fe 100644 --- a/projects/kubernetes-sigs/image-builder/Makefile +++ b/projects/kubernetes-sigs/image-builder/Makefile @@ -39,7 +39,9 @@ PACKER_OVA_VAR_FILES+=$(PACKER_OVA_CONF_FILE) PACKER_RAW_VAR_FILES?= PACKER_CLOUDSTACK_VAR_FILES?= -PACKER_NUTANIX_VAR_FILES?= + +PACKER_NUTANIX_CONF_FILES=$(MAKE_ROOT)/packer/nutanix/nutanix.json +PACKER_NUTANIX_VAR_FILES+=$(PACKER_NUTANIX_CONF_FILES) PACKER_TYPE_VAR_FILES?=$(PACKER_$(call TO_UPPER,$(IMAGE_FORMAT))_VAR_FILES) PACKER_ADDITIONAL_FILES_VAR_FILES?= diff --git a/projects/kubernetes-sigs/image-builder/packer/nutanix/nutanix.json b/projects/kubernetes-sigs/image-builder/packer/nutanix/nutanix.json index 41ba8f78c3..16a1334a51 100644 --- a/projects/kubernetes-sigs/image-builder/packer/nutanix/nutanix.json +++ b/projects/kubernetes-sigs/image-builder/packer/nutanix/nutanix.json @@ -1,5 +1,7 @@ { "nutanix_endpoint": "nutanix_endpoint", - "cluster_name": "cluster_name", - "nutanix_password": "nutanix_password" + "nutanix_cluster_name": "cluster_name", + "nutanix_password": "nutanix_password", + "nutanix_username": "nutanix_username", + "nutanix_subnet_name": "nutanix_subnet_name" } \ No newline at end of file diff --git a/projects/kubernetes-sigs/image-builder/patches/0001-Add-goss-validations-for-EKS-D-artifacts.patch b/projects/kubernetes-sigs/image-builder/patches/0001-Add-goss-validations-for-EKS-D-artifacts.patch index c32e15233e..45e3c59020 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0001-Add-goss-validations-for-EKS-D-artifacts.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0001-Add-goss-validations-for-EKS-D-artifacts.patch @@ -1,7 +1,7 @@ -From 1c8a0f202a9cec579266a8fed17a86165539b8c8 Mon Sep 17 00:00:00 2001 +From d63488c1d3e6b4d8754066eda15dadb4c4ab2351 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Tue, 11 Jan 2022 18:36:56 -0800 -Subject: [PATCH 01/19] Add goss validations for EKS-D artifacts +Subject: [PATCH 01/22] Add goss validations for EKS-D artifacts Signed-off-by: Vignesh Goutham Ganesh --- @@ -9,10 +9,10 @@ Signed-off-by: Vignesh Goutham Ganesh 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/capi/packer/goss/goss-command.yaml b/images/capi/packer/goss/goss-command.yaml -index 189b5a4cc..1ab83545e 100644 +index 0fec04c4e..7bb9293fb 100644 --- a/images/capi/packer/goss/goss-command.yaml +++ b/images/capi/packer/goss/goss-command.yaml -@@ -38,7 +38,7 @@ command: +@@ -43,7 +43,7 @@ command: {{end}} {{if and (eq .Vars.kubernetes_source_type "http") (eq .Vars.kubernetes_cni_source_type "http") (not .Vars.kubernetes_load_additional_imgs)}} # The second last pipe of awk is to take out arch from kube-apiserver-amd64 (i.e. amd64 or any other arch) @@ -21,7 +21,7 @@ index 189b5a4cc..1ab83545e 100644 exit-status: 0 stderr: [] timeout: 0 -@@ -46,7 +46,7 @@ command: +@@ -51,7 +51,7 @@ command: {{end}} {{if and (eq .Vars.kubernetes_source_type "http") (eq .Vars.kubernetes_cni_source_type "http") (.Vars.kubernetes_load_additional_imgs)}} # The second last pipe of awk is to take out arch from kube-apiserver-amd64 (i.e. amd64 or any other arch) @@ -31,5 +31,5 @@ index 189b5a4cc..1ab83545e 100644 stderr: [] timeout: 0 -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0002-Output-vsphere-builds-to-content-library-instead-of-.patch b/projects/kubernetes-sigs/image-builder/patches/0002-Output-vsphere-builds-to-content-library-instead-of-.patch index 91d16723be..cdb4b49e23 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0002-Output-vsphere-builds-to-content-library-instead-of-.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0002-Output-vsphere-builds-to-content-library-instead-of-.patch @@ -1,7 +1,7 @@ -From 7825eeb1333575bbc6ffad6e922ec82a5d17d461 Mon Sep 17 00:00:00 2001 +From 36050872c2a7b24d46919788f2c8c50a4bd67c56 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Tue, 11 Jan 2022 21:00:12 -0800 -Subject: [PATCH 02/19] Output vsphere builds to content library instead of +Subject: [PATCH 02/22] Output vsphere builds to content library instead of exports Signed-off-by: Vignesh Goutham Ganesh @@ -10,10 +10,10 @@ Signed-off-by: Vignesh Goutham Ganesh 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/images/capi/packer/ova/packer-node.json b/images/capi/packer/ova/packer-node.json -index d6fc80fdd..0b3e48792 100644 +index 64eb272cb..dc308e490 100644 --- a/images/capi/packer/ova/packer-node.json +++ b/images/capi/packer/ova/packer-node.json -@@ -173,6 +173,12 @@ +@@ -184,6 +184,12 @@ } ], "type": "vsphere-iso", @@ -26,9 +26,9 @@ index d6fc80fdd..0b3e48792 100644 "username": "{{user `username`}}", "vcenter_server": "{{user `vcenter_server`}}", "vm_name": "{{user `base_build_version`}}", -@@ -194,11 +200,6 @@ - "datacenter": "{{user `datacenter`}}", +@@ -207,11 +213,6 @@ "datastore": "{{user `datastore`}}", + "destroy": "{{user `destroy`}}", "disk_controller_type": "{{user `disk_controller_type`}}", - "export": { - "force": true, @@ -38,7 +38,7 @@ index d6fc80fdd..0b3e48792 100644 "firmware": "{{user `firmware`}}", "floppy_dirs": "{{ user `floppy_dirs`}}", "folder": "{{user `folder`}}", -@@ -229,6 +230,12 @@ +@@ -246,6 +247,12 @@ } ], "type": "vsphere-iso", @@ -51,7 +51,7 @@ index d6fc80fdd..0b3e48792 100644 "username": "{{user `username`}}", "vcenter_server": "{{user `vcenter_server`}}", "vm_name": "{{user `build_version`}}", -@@ -244,11 +251,6 @@ +@@ -261,11 +268,6 @@ "create_snapshot": "{{user `create_snapshot`}}", "datacenter": "{{user `datacenter`}}", "datastore": "{{user `datastore`}}", @@ -63,7 +63,7 @@ index d6fc80fdd..0b3e48792 100644 "folder": "{{user `folder`}}", "host": "{{user `host`}}", "insecure_connection": "{{user `insecure_connection`}}", -@@ -268,6 +270,13 @@ +@@ -288,6 +290,13 @@ } ], "post-processors": [ @@ -77,7 +77,7 @@ index d6fc80fdd..0b3e48792 100644 { "custom_data": { "build_date": "{{isotime}}", -@@ -303,7 +312,9 @@ +@@ -323,7 +332,9 @@ ], "inline": [ "cd {{user `output_dir`}}", @@ -88,8 +88,8 @@ index d6fc80fdd..0b3e48792 100644 ], "name": "vsphere", "type": "shell-local" -@@ -480,6 +491,7 @@ - "output_dir": "./output/{{user `build_version`}}", +@@ -508,6 +519,7 @@ + "resource_pool": "", "username": "", "vcenter_server": "", - "vsphere_guest_os_type": null @@ -98,5 +98,5 @@ index d6fc80fdd..0b3e48792 100644 } } -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0003-Create-etc-pki-tls-certs-dir-as-part-of-image-builds.patch b/projects/kubernetes-sigs/image-builder/patches/0003-Create-etc-pki-tls-certs-dir-as-part-of-image-builds.patch index 82d22547a0..6d997d3b97 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0003-Create-etc-pki-tls-certs-dir-as-part-of-image-builds.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0003-Create-etc-pki-tls-certs-dir-as-part-of-image-builds.patch @@ -1,7 +1,7 @@ -From bd4a51d1cb15048cf8daa8c38b166065c91ec22c Mon Sep 17 00:00:00 2001 +From beb55b7c85e2dc93b5f5c0a9c8d68290d48cc9e2 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Tue, 11 Jan 2022 21:05:13 -0800 -Subject: [PATCH 03/19] Create /etc/pki/tls/certs dir as part of image-builds +Subject: [PATCH 03/22] Create /etc/pki/tls/certs dir as part of image-builds Signed-off-by: Vignesh Goutham Ganesh --- @@ -9,10 +9,10 @@ Signed-off-by: Vignesh Goutham Ganesh 1 file changed, 9 insertions(+) diff --git a/images/capi/ansible/roles/sysprep/tasks/main.yml b/images/capi/ansible/roles/sysprep/tasks/main.yml -index 04a07ad7f..0114e934d 100644 +index 975506921..0aab7f565 100644 --- a/images/capi/ansible/roles/sysprep/tasks/main.yml +++ b/images/capi/ansible/roles/sysprep/tasks/main.yml -@@ -24,6 +24,15 @@ +@@ -27,6 +27,15 @@ - import_tasks: photon.yml when: ansible_os_family == "VMware Photon OS" @@ -29,5 +29,5 @@ index 04a07ad7f..0114e934d 100644 file: path: /etc/systemd/system/containerd.service.d/http-proxy.conf -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0004-Add-etcdadm-and-etcd.tar.gz-to-image-for-unstacked-e.patch b/projects/kubernetes-sigs/image-builder/patches/0004-Add-etcdadm-and-etcd.tar.gz-to-image-for-unstacked-e.patch index b7165d8bff..58bfa2561b 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0004-Add-etcdadm-and-etcd.tar.gz-to-image-for-unstacked-e.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0004-Add-etcdadm-and-etcd.tar.gz-to-image-for-unstacked-e.patch @@ -1,7 +1,7 @@ -From e2e3348655b316f9cc336331d674b6be42741960 Mon Sep 17 00:00:00 2001 +From 9f02ccac113f4682bae8d8090c0607014f463b91 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Tue, 11 Jan 2022 21:12:53 -0800 -Subject: [PATCH 04/19] Add etcdadm and etcd.tar.gz to image for unstacked etcd +Subject: [PATCH 04/22] Add etcdadm and etcd.tar.gz to image for unstacked etcd support Signed-off-by: Vignesh Goutham Ganesh @@ -58,30 +58,30 @@ index 83de5a486..48a4a2177 100644 file: state: directory diff --git a/images/capi/packer/config/ansible-args.json b/images/capi/packer/config/ansible-args.json -index 9ee89aee8..7d61321df 100644 +index f28889c44..7ece5e4bc 100644 --- a/images/capi/packer/config/ansible-args.json +++ b/images/capi/packer/config/ansible-args.json @@ -1,5 +1,5 @@ { - "ansible_common_ssh_args": "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa", -- "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`}}\" 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_cni_http_source={{user `kubernetes_cni_http_source`}} kubernetes_cni_http_checksum={{user `kubernetes_cni_http_checksum`}} 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` }}", -+ "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`}}\" 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_cni_http_source={{user `kubernetes_cni_http_source`}} kubernetes_cni_http_checksum={{user `kubernetes_cni_http_checksum`}} 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` }} etcd_http_source={{user `etcd_http_source`}} etcd_version={{user `etcd_version`}} etcdadm_http_source={{user `etcdadm_http_source`}}", + "ansible_common_ssh_args": "-o IdentitiesOnly=yes", +- "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`}}\" 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` }}", ++ "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`}}\" 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` }} etcd_http_source={{user `etcd_http_source`}} etcd_version={{user `etcd_version`}} etcdadm_http_source={{user `etcdadm_http_source`}}", "ansible_scp_extra_args": "{{env `ANSIBLE_SCP_EXTRA_ARGS`}}" } diff --git a/images/capi/packer/config/kubernetes.json b/images/capi/packer/config/kubernetes.json -index 4d3a5f5a8..80f93c5c3 100644 +index 9cce0a96a..ab5300ccc 100644 --- a/images/capi/packer/config/kubernetes.json +++ b/images/capi/packer/config/kubernetes.json -@@ -16,6 +16,9 @@ - "kubernetes_rpm_repo": "https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{user `kubernetes_rpm_repo_arch`}}", - "kubernetes_rpm_repo_arch": "x86_64", - "kubernetes_rpm_version": "1.25.10-0", +@@ -4,6 +4,9 @@ + "crictl_source_type": "pkg", + "crictl_url": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v{{user `crictl_version`}}/crictl-v{{user `crictl_version`}}-linux-{{user `crictl_arch`}}.tar.gz", + "crictl_version": "1.26.0", + "etcd_http_source":"", + "etcd_version":"", + "etcdadm_http_source":"", - "kubernetes_semver": "v1.25.10", - "kubernetes_series": "v1.25", - "kubernetes_source_type": "pkg", + "kubeadm_template": "etc/kubeadm.yml", + "kubernetes_apiserver_port": "6443", + "kubernetes_container_registry": "registry.k8s.io", -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0005-Additional-EKS-A-specific-goss-validations.patch b/projects/kubernetes-sigs/image-builder/patches/0005-Additional-EKS-A-specific-goss-validations.patch index 8dc5cf3744..a1d83138e8 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0005-Additional-EKS-A-specific-goss-validations.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0005-Additional-EKS-A-specific-goss-validations.patch @@ -1,7 +1,7 @@ -From d2b23cda807ba4782c6d6a6af7d5a9e929bb70c7 Mon Sep 17 00:00:00 2001 +From ae159da404950818d798d0f4c19c4ea155fe5c1a Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Tue, 11 Jan 2022 21:26:09 -0800 -Subject: [PATCH 05/19] Additional EKS-A specific goss validations +Subject: [PATCH 05/22] Additional EKS-A specific goss validations Signed-off-by: Vignesh Goutham Ganesh --- @@ -14,33 +14,33 @@ Signed-off-by: Vignesh Goutham Ganesh 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/images/capi/packer/config/ansible-args.json b/images/capi/packer/config/ansible-args.json -index 7d61321df..62990ab41 100644 +index 7ece5e4bc..4176c8ff9 100644 --- a/images/capi/packer/config/ansible-args.json +++ b/images/capi/packer/config/ansible-args.json @@ -1,5 +1,5 @@ { - "ansible_common_ssh_args": "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa", -- "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`}}\" 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_cni_http_source={{user `kubernetes_cni_http_source`}} kubernetes_cni_http_checksum={{user `kubernetes_cni_http_checksum`}} 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` }} etcd_http_source={{user `etcd_http_source`}} etcd_version={{user `etcd_version`}} etcdadm_http_source={{user `etcdadm_http_source`}}", -+ "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`}}\" 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_cni_http_source={{user `kubernetes_cni_http_source`}} kubernetes_cni_http_checksum={{user `kubernetes_cni_http_checksum`}} 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` }} 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`}}", + "ansible_common_ssh_args": "-o IdentitiesOnly=yes", +- "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`}}\" 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` }} etcd_http_source={{user `etcd_http_source`}} etcd_version={{user `etcd_version`}} etcdadm_http_source={{user `etcdadm_http_source`}}", ++ "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`}}\" 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` }} 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`}}", "ansible_scp_extra_args": "{{env `ANSIBLE_SCP_EXTRA_ARGS`}}" } diff --git a/images/capi/packer/config/kubernetes.json b/images/capi/packer/config/kubernetes.json -index 80f93c5c3..32b0543f4 100644 +index ab5300ccc..37fd9e4eb 100644 --- a/images/capi/packer/config/kubernetes.json +++ b/images/capi/packer/config/kubernetes.json -@@ -20,6 +20,7 @@ - "etcd_version":"", - "etcdadm_http_source":"", - "kubernetes_semver": "v1.25.10", -+ "kubernetes_full_version": "v1.25.10", - "kubernetes_series": "v1.25", +@@ -21,6 +21,7 @@ + "kubernetes_rpm_repo": "https://pkgs.k8s.io/core:/stable:/{{ user `kubernetes_series` }}/rpm/", + "kubernetes_rpm_repo_arch": "x86_64", + "kubernetes_rpm_version": "1.26.7", ++ "kubernetes_full_version": "v1.26.7", + "kubernetes_semver": "v1.26.7", + "kubernetes_series": "v1.26", "kubernetes_source_type": "pkg", - "systemd_prefix": "/usr/lib/systemd", diff --git a/images/capi/packer/goss/goss-command.yaml b/images/capi/packer/goss/goss-command.yaml -index 1ab83545e..f5cf16cf5 100644 +index 7bb9293fb..2afdd2ff2 100644 --- a/images/capi/packer/goss/goss-command.yaml +++ b/images/capi/packer/goss/goss-command.yaml -@@ -27,6 +27,11 @@ command: +@@ -32,6 +32,11 @@ command: stderr: [ ] timeout: 0 {{end}} @@ -52,7 +52,7 @@ index 1ab83545e..f5cf16cf5 100644 {{if eq .Vars.kubernetes_source_type "pkg"}} {{if eq .Vars.kubernetes_cni_source_type "pkg"}} crictl images | grep -v 'IMAGE ID' | awk -F'[ /]' '{print $2}' | sed 's/-{{ .Vars.arch }}//g' | sort: -@@ -43,6 +48,12 @@ command: +@@ -48,6 +53,12 @@ command: stderr: [] timeout: 0 stdout: ["kube-apiserver", "kube-controller-manager", "kube-proxy", "kube-scheduler"] @@ -65,7 +65,7 @@ index 1ab83545e..f5cf16cf5 100644 {{end}} {{if and (eq .Vars.kubernetes_source_type "http") (eq .Vars.kubernetes_cni_source_type "http") (.Vars.kubernetes_load_additional_imgs)}} # The second last pipe of awk is to take out arch from kube-apiserver-amd64 (i.e. amd64 or any other arch) -@@ -83,6 +94,11 @@ command: +@@ -88,6 +99,11 @@ command: stderr: [] timeout: 0 {{end}} @@ -93,10 +93,10 @@ index 278f403fa..eb92570cc 100644 {{ $name }}: exists: {{ $vers.exists }} diff --git a/images/capi/packer/goss/goss-vars.yaml b/images/capi/packer/goss/goss-vars.yaml -index 41e3ed024..504e48482 100644 +index a7878bfa2..8dd593110 100644 --- a/images/capi/packer/goss/goss-vars.yaml +++ b/images/capi/packer/goss/goss-vars.yaml -@@ -88,6 +88,12 @@ kubernetes_cni_rpm_version: "" +@@ -105,6 +105,12 @@ kubernetes_cni_rpm_version: "" # When k8s and k8s cni source is http kubernetes_load_additional_imgs: false @@ -110,10 +110,10 @@ index 41e3ed024..504e48482 100644 kubernetes_install_path: "" windows_service_manager: "" diff --git a/images/capi/packer/ova/packer-node.json b/images/capi/packer/ova/packer-node.json -index 0b3e48792..ff6430db3 100644 +index dc308e490..0567fcd56 100644 --- a/images/capi/packer/ova/packer-node.json +++ b/images/capi/packer/ova/packer-node.json -@@ -440,7 +440,12 @@ +@@ -461,7 +461,12 @@ "kubernetes_deb_version": "{{ user `kubernetes_deb_version` }}", "kubernetes_rpm_version": "{{ split (user `kubernetes_rpm_version`) \"-\" 0 }}", "kubernetes_source_type": "{{user `kubernetes_source_type`}}", @@ -128,5 +128,5 @@ index 0b3e48792..ff6430db3 100644 "version": "{{user `goss_version`}}" } -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0006-Tweak-Product-info-in-OVF.patch b/projects/kubernetes-sigs/image-builder/patches/0006-Tweak-Product-info-in-OVF.patch index 141b5723ae..fa40975e32 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0006-Tweak-Product-info-in-OVF.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0006-Tweak-Product-info-in-OVF.patch @@ -1,7 +1,7 @@ -From e7622d7c38951b1d19b98638e5a027439327eb7a Mon Sep 17 00:00:00 2001 +From 70613c7b58f1f8760077cd6b61e7a3749c928db2 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Tue, 11 Jan 2022 21:29:16 -0800 -Subject: [PATCH 06/19] Tweak Product info in OVF +Subject: [PATCH 06/22] Tweak Product info in OVF Signed-off-by: Vignesh Goutham Ganesh --- @@ -35,5 +35,5 @@ index 316427ec3..ca23db5f9 100644 -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0007-Support-crictl-validation-from-input-checksum.patch b/projects/kubernetes-sigs/image-builder/patches/0007-Support-crictl-validation-from-input-checksum.patch index 6a3d7ca4c1..1a2bb93225 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0007-Support-crictl-validation-from-input-checksum.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0007-Support-crictl-validation-from-input-checksum.patch @@ -1,7 +1,7 @@ -From 466adc2ce78964efe944d698ff27f9bffc73db61 Mon Sep 17 00:00:00 2001 +From 839cf56ca4919b662a19bcd1f1ceb251e99a515a Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Fri, 2 Sep 2022 14:32:21 -0700 -Subject: [PATCH 07/19] Support crictl validation from input checksum +Subject: [PATCH 07/22] Support crictl validation from input checksum Signed-off-by: Vignesh Goutham Ganesh --- @@ -38,5 +38,5 @@ index 9ae4f81b1..1ef16318a 100644 mode: 0600 -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0008-Exclude-kernel-and-cloud-init-from-yum-updates.patch b/projects/kubernetes-sigs/image-builder/patches/0008-Exclude-kernel-and-cloud-init-from-yum-updates.patch index 1fd3414fbf..e6af5c9e07 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0008-Exclude-kernel-and-cloud-init-from-yum-updates.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0008-Exclude-kernel-and-cloud-init-from-yum-updates.patch @@ -1,7 +1,7 @@ -From 014e064f435e54a7651ff73593f9dad01efd8ba8 Mon Sep 17 00:00:00 2001 +From fdee87538968240c3384e23f50b495912564928e Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Tue, 6 Dec 2022 15:42:02 -0600 -Subject: [PATCH 08/19] Exclude kernel and cloud-init from yum updates +Subject: [PATCH 08/22] Exclude kernel and cloud-init from yum updates Signed-off-by: Vignesh Goutham Ganesh --- @@ -21,5 +21,5 @@ index 66d9c8cac..0961f37d4 100644 - name: install baseline dependencies -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0009-Patch-cloud-init-systemd-unit-to-wait-for-network-ma.patch b/projects/kubernetes-sigs/image-builder/patches/0009-Patch-cloud-init-systemd-unit-to-wait-for-network-ma.patch index bdeb026f07..fadfcb47a3 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0009-Patch-cloud-init-systemd-unit-to-wait-for-network-ma.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0009-Patch-cloud-init-systemd-unit-to-wait-for-network-ma.patch @@ -1,7 +1,7 @@ -From 1d2f0a81b1560756ce9362be03a4a106a92790d5 Mon Sep 17 00:00:00 2001 +From 2c48ebfc86fa43c4adb8784b0306ef986cecff93 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Mon, 9 Jan 2023 14:11:18 -0600 -Subject: [PATCH 09/19] Patch cloud-init systemd unit to wait for network +Subject: [PATCH 09/22] Patch cloud-init systemd unit to wait for network manager online Signed-off-by: Vignesh Goutham Ganesh @@ -21,10 +21,10 @@ index 000000000..e1059e3eb +After=NetworkManager-wait-online.service \ No newline at end of file diff --git a/images/capi/ansible/roles/providers/tasks/main.yml b/images/capi/ansible/roles/providers/tasks/main.yml -index 28c609177..e5f2ed16c 100644 +index 7b1cb93ce..fd93ef4b2 100644 --- a/images/capi/ansible/roles/providers/tasks/main.yml +++ b/images/capi/ansible/roles/providers/tasks/main.yml -@@ -83,6 +83,21 @@ +@@ -86,6 +86,21 @@ mode: "0644" when: ansible_os_family != "Flatcar" @@ -47,5 +47,5 @@ index 28c609177..e5f2ed16c 100644 # Enable all cloud-init services on boot. - name: Make sure all cloud init services are enabled -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0010-Add-instance-metadata-options-to-Packer-config.patch b/projects/kubernetes-sigs/image-builder/patches/0010-Add-instance-metadata-options-to-Packer-config.patch index c56fa53d4b..c67fd49f5c 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0010-Add-instance-metadata-options-to-Packer-config.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0010-Add-instance-metadata-options-to-Packer-config.patch @@ -1,7 +1,7 @@ -From 80b701ee528b6cb5de1d642eee75eeee2b107680 Mon Sep 17 00:00:00 2001 +From 7d1bd7af0d8df722156ecabc3829e74985f2baf5 Mon Sep 17 00:00:00 2001 From: Abhay Krishna Arunachalam Date: Thu, 2 Feb 2023 01:39:15 -0800 -Subject: [PATCH 10/19] Add instance metadata options to Packer config +Subject: [PATCH 10/22] Add instance metadata options to Packer config Signed-off-by: Abhay Krishna Arunachalam --- @@ -9,7 +9,7 @@ Signed-off-by: Abhay Krishna Arunachalam 1 file changed, 8 insertions(+) diff --git a/images/capi/packer/ami/packer.json b/images/capi/packer/ami/packer.json -index 7b957a8d6..d2c742649 100644 +index 3117354cd..175ca11d6 100644 --- a/images/capi/packer/ami/packer.json +++ b/images/capi/packer/ami/packer.json @@ -22,6 +22,11 @@ @@ -24,7 +24,7 @@ index 7b957a8d6..d2c742649 100644 "name": "{{user `build_name`}}", "profile": "{{ user `aws_profile`}}", "region": "{{ user `aws_region` }}", -@@ -170,6 +175,9 @@ +@@ -163,6 +168,9 @@ "crictl_version": null, "encrypted": "false", "existing_ansible_ssh_args": "{{env `ANSIBLE_SSH_ARGS`}}", @@ -35,5 +35,5 @@ index 7b957a8d6..d2c742649 100644 "ib_version": "{{env `IB_VERSION`}}", "iops": "3000", -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0011-Rename-Snow-node-image-to-reflect-appropriate-CAPI-p.patch b/projects/kubernetes-sigs/image-builder/patches/0011-Rename-Snow-node-image-to-reflect-appropriate-CAPI-p.patch index d0c8063951..97472999e3 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0011-Rename-Snow-node-image-to-reflect-appropriate-CAPI-p.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0011-Rename-Snow-node-image-to-reflect-appropriate-CAPI-p.patch @@ -1,7 +1,7 @@ -From f1d37d26168f74ab9c100547a0aba19e3a59298a Mon Sep 17 00:00:00 2001 +From 03a34c9a1742e681a117a23c271bfeee40a1ce59 Mon Sep 17 00:00:00 2001 From: Abhay Krishna Arunachalam Date: Fri, 10 Feb 2023 16:08:18 -0800 -Subject: [PATCH 11/19] Rename Snow node image to reflect appropriate CAPI +Subject: [PATCH 11/22] Rename Snow node image to reflect appropriate CAPI provider Signed-off-by: Abhay Krishna Arunachalam @@ -10,7 +10,7 @@ Signed-off-by: Abhay Krishna Arunachalam 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/capi/packer/ami/packer.json b/images/capi/packer/ami/packer.json -index d2c742649..d64b22278 100644 +index 175ca11d6..cb6fbb470 100644 --- a/images/capi/packer/ami/packer.json +++ b/images/capi/packer/ami/packer.json @@ -4,7 +4,7 @@ @@ -23,5 +23,5 @@ index d2c742649..d64b22278 100644 "ami_regions": "{{user `ami_regions`}}", "ami_users": "{{user `ami_users`}}", -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0012-Add-EKS-A-specific-inline-Goss-vars-to-all-supported.patch b/projects/kubernetes-sigs/image-builder/patches/0012-Add-EKS-A-specific-inline-Goss-vars-to-all-supported.patch index a46e01cc2a..4554360b8d 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0012-Add-EKS-A-specific-inline-Goss-vars-to-all-supported.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0012-Add-EKS-A-specific-inline-Goss-vars-to-all-supported.patch @@ -1,7 +1,7 @@ -From 74fad131b42949bbbdd033c4f51129408d2a564c Mon Sep 17 00:00:00 2001 +From 1c18f29813aea77c65d5891941d2b23055048a9c Mon Sep 17 00:00:00 2001 From: Abhay Krishna Arunachalam Date: Thu, 2 Mar 2023 19:27:50 -0800 -Subject: [PATCH 12/19] Add EKS-A specific inline Goss vars to all supported +Subject: [PATCH 12/22] Add EKS-A specific inline Goss vars to all supported providers Signed-off-by: Abhay Krishna Arunachalam @@ -13,10 +13,10 @@ Signed-off-by: Abhay Krishna Arunachalam 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/images/capi/packer/ami/packer.json b/images/capi/packer/ami/packer.json -index d64b22278..738d50f55 100644 +index cb6fbb470..cab705721 100644 --- a/images/capi/packer/ami/packer.json +++ b/images/capi/packer/ami/packer.json -@@ -145,7 +145,12 @@ +@@ -138,7 +138,12 @@ "kubernetes_deb_version": "{{ user `kubernetes_deb_version` }}", "kubernetes_rpm_version": "{{ split (user `kubernetes_rpm_version`) \"-\" 0 }}", "kubernetes_source_type": "{{user `kubernetes_source_type`}}", @@ -31,10 +31,10 @@ index d64b22278..738d50f55 100644 "version": "{{user `goss_version`}}" } diff --git a/images/capi/packer/nutanix/packer.json b/images/capi/packer/nutanix/packer.json -index 80e296c69..d22fbea27 100644 +index b27eb7d86..a4b752397 100644 --- a/images/capi/packer/nutanix/packer.json +++ b/images/capi/packer/nutanix/packer.json -@@ -97,7 +97,12 @@ +@@ -103,7 +103,12 @@ "kubernetes_deb_version": "{{ user `kubernetes_deb_version` }}", "kubernetes_rpm_version": "{{ split (user `kubernetes_rpm_version`) \"-\" 0 }}", "kubernetes_source_type": "{{user `kubernetes_source_type`}}", @@ -49,10 +49,10 @@ index 80e296c69..d22fbea27 100644 "version": "{{user `goss_version`}}" } diff --git a/images/capi/packer/qemu/packer.json b/images/capi/packer/qemu/packer.json -index 5fdd85550..78b9f1fac 100644 +index 728879af6..dd93fc8da 100644 --- a/images/capi/packer/qemu/packer.json +++ b/images/capi/packer/qemu/packer.json -@@ -138,7 +138,12 @@ +@@ -141,7 +141,12 @@ "kubernetes_deb_version": "{{ user `kubernetes_deb_version` }}", "kubernetes_rpm_version": "{{ split (user `kubernetes_rpm_version`) \"-\" 0 }}", "kubernetes_source_type": "{{user `kubernetes_source_type`}}", @@ -67,10 +67,10 @@ index 5fdd85550..78b9f1fac 100644 "version": "{{user `goss_version`}}" } diff --git a/images/capi/packer/raw/packer.json b/images/capi/packer/raw/packer.json -index e790e67d5..dc494a1e8 100644 +index 152041455..a04be4e8f 100644 --- a/images/capi/packer/raw/packer.json +++ b/images/capi/packer/raw/packer.json -@@ -123,7 +123,12 @@ +@@ -126,7 +126,12 @@ "kubernetes_deb_version": "{{ user `kubernetes_deb_version` }}", "kubernetes_rpm_version": "{{ split (user `kubernetes_rpm_version`) \"-\" 0 }}", "kubernetes_source_type": "{{user `kubernetes_source_type`}}", @@ -85,5 +85,5 @@ index e790e67d5..dc494a1e8 100644 "version": "{{user `goss_version`}}" } -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0013-Use-tar.gz-extension-for-CNI-plugins-tarball.patch b/projects/kubernetes-sigs/image-builder/patches/0013-Use-tar.gz-extension-for-CNI-plugins-tarball.patch index 9fabfe987a..97d50c3e8b 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0013-Use-tar.gz-extension-for-CNI-plugins-tarball.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0013-Use-tar.gz-extension-for-CNI-plugins-tarball.patch @@ -1,7 +1,7 @@ -From 2a291e5f7626d87f04b6a60c45a09f203d77dcb7 Mon Sep 17 00:00:00 2001 +From efa4c0fb7f8e676f38f35bd6b497274fb0d17eae Mon Sep 17 00:00:00 2001 From: Abhay Krishna Arunachalam Date: Thu, 9 Mar 2023 16:05:22 -0800 -Subject: [PATCH 13/19] Use tar.gz extension for CNI plugins tarball +Subject: [PATCH 13/22] Use tar.gz extension for CNI plugins tarball Signed-off-by: Abhay Krishna Arunachalam --- @@ -22,5 +22,5 @@ index 48a4a2177..99bf2f843 100644 dest: /tmp/cni.tar.gz mode: 0755 -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0014-uses-latest-ubuntu-22.04-iso.patch b/projects/kubernetes-sigs/image-builder/patches/0014-uses-latest-ubuntu-22.04-iso.patch index 6e437c8d4f..2d2b5f0cd9 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0014-uses-latest-ubuntu-22.04-iso.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0014-uses-latest-ubuntu-22.04-iso.patch @@ -1,7 +1,7 @@ -From 06b287df708bbb86f101cf26ea60aadb0abfe27e Mon Sep 17 00:00:00 2001 +From 9f737d8f55108302eac322f93068f3c998b509f6 Mon Sep 17 00:00:00 2001 From: Jackson West Date: Fri, 23 Jun 2023 10:50:08 -0500 -Subject: [PATCH 14/19] uses latest ubuntu 22.04 iso +Subject: [PATCH 14/22] uses latest ubuntu 22.04 iso --- images/capi/packer/ova/ubuntu-2204-efi.json | 4 ++-- @@ -9,7 +9,7 @@ Subject: [PATCH 14/19] uses latest ubuntu 22.04 iso 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/capi/packer/ova/ubuntu-2204-efi.json b/images/capi/packer/ova/ubuntu-2204-efi.json -index 0bc473353..c70d46841 100644 +index 0bc473353..5d199b8b0 100644 --- a/images/capi/packer/ova/ubuntu-2204-efi.json +++ b/images/capi/packer/ova/ubuntu-2204-efi.json @@ -9,9 +9,9 @@ @@ -25,7 +25,7 @@ index 0bc473353..c70d46841 100644 "shutdown_command": "shutdown -P now", "vsphere_guest_os_type": "ubuntu64Guest" diff --git a/images/capi/packer/ova/ubuntu-2204.json b/images/capi/packer/ova/ubuntu-2204.json -index badbf1045..dffc6967f 100644 +index badbf1045..38efb01c8 100644 --- a/images/capi/packer/ova/ubuntu-2204.json +++ b/images/capi/packer/ova/ubuntu-2204.json @@ -8,9 +8,9 @@ @@ -41,5 +41,5 @@ index badbf1045..dffc6967f 100644 "shutdown_command": "shutdown -P now", "vsphere_guest_os_type": "ubuntu64Guest" -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0015-Shrink-qemu-ubuntu-image-size.patch b/projects/kubernetes-sigs/image-builder/patches/0015-Shrink-qemu-ubuntu-image-size.patch deleted file mode 100644 index 81acf89967..0000000000 --- a/projects/kubernetes-sigs/image-builder/patches/0015-Shrink-qemu-ubuntu-image-size.patch +++ /dev/null @@ -1,116 +0,0 @@ -From de8d2056f14d6c6bb9a782eb9d11b0d39ae1084c Mon Sep 17 00:00:00 2001 -From: Roman Hros -Date: Mon, 5 Jun 2023 16:29:45 +0200 -Subject: [PATCH 15/19] Shrink qemu ubuntu image size - -Use fstrim command at the end of sysprep role - -It frees all unused storage, so 'qemu-img convert' command at the end of packer execution can shrink the image size - -Also remove snapd and repair autoinstall late-commands - -Signed-off-by: Roman Hros ---- - .../capi/ansible/roles/sysprep/tasks/main.yml | 7 +++++++ - .../ova/linux/ubuntu/http/22.04.efi/user-data | 19 ++++++++++++------- - .../ova/linux/ubuntu/http/22.04/user-data | 19 ++++++++++++------- - 3 files changed, 31 insertions(+), 14 deletions(-) - -diff --git a/images/capi/ansible/roles/sysprep/tasks/main.yml b/images/capi/ansible/roles/sysprep/tasks/main.yml -index 0114e934d..cf070d92a 100644 ---- a/images/capi/ansible/roles/sysprep/tasks/main.yml -+++ b/images/capi/ansible/roles/sysprep/tasks/main.yml -@@ -199,6 +199,7 @@ - state: "{{ item.state }}" - path: "{{ item.path }}" - loop: -+ - { path: /swap.img, state: absent } - - { path: /swapfile, state: absent } - - { path: /mnt/resource/swapfile, state: absent } - when: ansible_memory_mb.swap.total != 0 -@@ -236,6 +237,12 @@ - path: /usr/share/oem/config.ign - when: ansible_os_family == "Flatcar" - -+- name: fstrim -+ systemd: -+ name: fstrim.service -+ state: started -+ when: ansible_os_family == "Debian" -+ - - name: start ssh - systemd: - name: ssh -diff --git a/images/capi/packer/ova/linux/ubuntu/http/22.04.efi/user-data b/images/capi/packer/ova/linux/ubuntu/http/22.04.efi/user-data -index 5230c4679..095d9cef3 100644 ---- a/images/capi/packer/ova/linux/ubuntu/http/22.04.efi/user-data -+++ b/images/capi/packer/ova/linux/ubuntu/http/22.04.efi/user-data -@@ -27,6 +27,8 @@ autoinstall: - # For more information on how partitioning is configured, - # please refer to https://curtin.readthedocs.io/en/latest/topics/storage.html. - storage: -+ swap: -+ size: 0 - grub: - reorder_uefi: false - replace_linux_default: false -@@ -99,11 +101,14 @@ autoinstall: - # 1. Disables swapfiles - # 2. Removes the existing swapfile - # 3. Removes the swapfile entry from /etc/fstab -- # 4. Cleans up any packages that are no longer required -- # 5. Removes the cached list of packages -+ # 4. Removes snapd, https://bugs.launchpad.net/subiquity/+bug/1946609 -+ # 5. Cleans up any packages that are no longer required -+ # 6. Removes the cached list of packages - late-commands: -- - swapoff -a -- - rm -f /swapfile -- - sed -ri '/\sswap\s/s/^#?/#/' /etc/fstab -- - apt-get purge --auto-remove -y -- - rm -rf /var/lib/apt/lists/* -+ - curtin in-target --target=/target -- swapoff -a -+ - curtin in-target --target=/target -- rm -f /swap.img -+ - curtin in-target --target=/target -- sed -ri '/\sswap\s/s/^#?/#/' /etc/fstab -+ - chroot /target apt-get purge -y snapd -+ - curtin in-target --target=/target -- apt-get purge --auto-remove -y -+ - curtin in-target --target=/target -- apt-get clean -+ - curtin in-target --target=/target -- rm -rf /var/lib/apt/lists/* -diff --git a/images/capi/packer/ova/linux/ubuntu/http/22.04/user-data b/images/capi/packer/ova/linux/ubuntu/http/22.04/user-data -index 24bdce560..fdcb56c26 100644 ---- a/images/capi/packer/ova/linux/ubuntu/http/22.04/user-data -+++ b/images/capi/packer/ova/linux/ubuntu/http/22.04/user-data -@@ -30,6 +30,8 @@ autoinstall: - # For more information on how partitioning is configured, - # please refer to https://curtin.readthedocs.io/en/latest/topics/storage.html. - storage: -+ swap: -+ size: 0 - grub: - replace_linux_default: false - config: -@@ -79,11 +81,14 @@ autoinstall: - # 1. Disables swapfiles - # 2. Removes the existing swapfile - # 3. Removes the swapfile entry from /etc/fstab -- # 4. Cleans up any packages that are no longer required -- # 5. Removes the cached list of packages -+ # 4. Removes snapd, https://bugs.launchpad.net/subiquity/+bug/1946609 -+ # 5. Cleans up any packages that are no longer required -+ # 6. Removes the cached list of packages - late-commands: -- - swapoff -a -- - rm -f /swapfile -- - sed -ri '/\sswap\s/s/^#?/#/' /etc/fstab -- - apt-get purge --auto-remove -y -- - rm -rf /var/lib/apt/lists/* -+ - curtin in-target --target=/target -- swapoff -a -+ - curtin in-target --target=/target -- rm -f /swap.img -+ - curtin in-target --target=/target -- sed -ri '/\sswap\s/s/^#?/#/' /etc/fstab -+ - chroot /target apt-get purge -y snapd -+ - curtin in-target --target=/target -- apt-get purge --auto-remove -y -+ - curtin in-target --target=/target -- apt-get clean -+ - curtin in-target --target=/target -- rm -rf /var/lib/apt/lists/* --- -2.39.2 - diff --git a/projects/kubernetes-sigs/image-builder/patches/0016-adds-support-for-raw-ubuntu-22.04-builds.patch b/projects/kubernetes-sigs/image-builder/patches/0015-adds-support-for-raw-ubuntu-22.04-builds.patch similarity index 91% rename from projects/kubernetes-sigs/image-builder/patches/0016-adds-support-for-raw-ubuntu-22.04-builds.patch rename to projects/kubernetes-sigs/image-builder/patches/0015-adds-support-for-raw-ubuntu-22.04-builds.patch index c3d64fd6c3..a03858f36b 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0016-adds-support-for-raw-ubuntu-22.04-builds.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0015-adds-support-for-raw-ubuntu-22.04-builds.patch @@ -1,7 +1,7 @@ -From 2787a5bd657cb37f2fb1d9be90b1ce34238526ce Mon Sep 17 00:00:00 2001 +From 4bde5df4762a2afb6c74f7df3c7b05489e65b995 Mon Sep 17 00:00:00 2001 From: Jackson West Date: Fri, 16 Jun 2023 15:27:15 -0500 -Subject: [PATCH 16/19] adds support for raw ubuntu 22.04 builds +Subject: [PATCH 15/22] adds support for raw ubuntu 22.04 builds --- images/capi/Makefile | 6 +- @@ -20,20 +20,20 @@ Subject: [PATCH 16/19] adds support for raw ubuntu 22.04 builds create mode 100644 images/capi/packer/raw/raw-ubuntu-2204.json diff --git a/images/capi/Makefile b/images/capi/Makefile -index 0226a7e53..4f90365aa 100644 +index 2b190b755..f841eac48 100644 --- a/images/capi/Makefile +++ b/images/capi/Makefile -@@ -353,7 +353,7 @@ OSC_BUILD_NAMES ?= osc-ubuntu-2004 - QEMU_BUILD_NAMES ?= qemu-ubuntu-1804 qemu-ubuntu-2004 qemu-ubuntu-2204 qemu-centos-7 qemu-ubuntu-2004-efi qemu-rhel-8 qemu-rockylinux-8 qemu-flatcar +@@ -359,7 +359,7 @@ QEMU_BUILD_NAMES ?= qemu-ubuntu-2004 qemu-ubuntu-2204 qemu-ubuntu-2204-efi qem + QEMU_KUBEVIRT_BUILD_NAMES := $(addprefix kubevirt-,$(QEMU_BUILD_NAMES)) --RAW_BUILD_NAMES ?= raw-ubuntu-1804 raw-ubuntu-2004 raw-ubuntu-2004-efi raw-flatcar raw-rhel-8 -+RAW_BUILD_NAMES ?= raw-ubuntu-1804 raw-ubuntu-2004 raw-ubuntu-2004-efi raw-ubuntu-2204 raw-ubuntu-2204-efi raw-flatcar raw-rhel-8 +-RAW_BUILD_NAMES ?= raw-ubuntu-2004 raw-ubuntu-2004-efi raw-flatcar raw-rhel-8 ++RAW_BUILD_NAMES ?= raw-ubuntu-2004 raw-ubuntu-2004-efi raw-ubuntu-2204 raw-ubuntu-2204-efi raw-flatcar raw-rhel-8 VBOX_BUILD_NAMES ?= vbox-windows-2019 POWERVS_BUILD_NAMES ?= powervs-centos-8 -@@ -743,6 +743,8 @@ build-raw-flatcar: ## Builds Flatcar RAW image - build-raw-ubuntu-1804: ## Builds Ubuntu 18.04 RAW image +@@ -746,6 +746,8 @@ build-qemu-all: $(QEMU_BUILD_TARGETS) ## Builds all Qemu images + build-raw-flatcar: ## Builds Flatcar RAW image build-raw-ubuntu-2004: ## Builds Ubuntu 20.04 RAW image build-raw-ubuntu-2004-efi: ## Builds Ubuntu 20.04 RAW image that EFI boots +build-raw-ubuntu-2204: ## Builds Ubuntu 22.04 RAW image @@ -41,8 +41,8 @@ index 0226a7e53..4f90365aa 100644 build-raw-rhel-8: ## Builds RHEL 8 RAW image build-raw-all: $(RAW_BUILD_TARGETS) ## Builds all RAW images -@@ -876,6 +878,8 @@ validate-raw-flatcar: ## Validates Flatcar RAW image packer config - validate-raw-ubuntu-1804: ## Validates Ubuntu 18.04 RAW image packer config +@@ -880,6 +882,8 @@ validate-qemu-all: $(QEMU_VALIDATE_TARGETS) ## Validates all Qemu Packer config + validate-raw-flatcar: ## Validates Flatcar RAW image packer config validate-raw-ubuntu-2004: ## Validates Ubuntu 20.04 RAW image packer config validate-raw-ubuntu-2004-efi: ## Validates Ubuntu 20.04 RAW EFI image packer config +validate-raw-ubuntu-2204: ## Validates Ubuntu 22.04 RAW image packer config @@ -275,7 +275,7 @@ index 000000000..e2838e3c4 + - curtin in-target --target=/target -- rm -rf /var/lib/apt/lists/* diff --git a/images/capi/packer/raw/raw-ubuntu-2204-efi.json b/images/capi/packer/raw/raw-ubuntu-2204-efi.json new file mode 100644 -index 000000000..7d2f921c5 +index 000000000..3de116312 --- /dev/null +++ b/images/capi/packer/raw/raw-ubuntu-2204-efi.json @@ -0,0 +1,13 @@ @@ -294,7 +294,7 @@ index 000000000..7d2f921c5 + } diff --git a/images/capi/packer/raw/raw-ubuntu-2204.json b/images/capi/packer/raw/raw-ubuntu-2204.json new file mode 100644 -index 000000000..38e827ef1 +index 000000000..e03f336cd --- /dev/null +++ b/images/capi/packer/raw/raw-ubuntu-2204.json @@ -0,0 +1,12 @@ @@ -302,7 +302,7 @@ index 000000000..38e827ef1 + "boot_command_prefix": "clinux /casper/vmlinuz --- autoinstall ds='nocloud-net;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/22.04/'initrd /casper/initrdboot", + "build_name": "ubuntu-2204", + "build_target": "raw", -+ "distro_name": "ubuntu", ++ "distro_name": "ubuntu", + "guest_os_type": "ubuntu-64", + "iso_checksum": "5e38b55d57d94ff029719342357325ed3bda38fa80054f9330dc789cd2d43931", + "iso_checksum_type": "sha256", @@ -311,5 +311,5 @@ index 000000000..38e827ef1 + "shutdown_command": "shutdown -P now" + } -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0017-sets-OS_VERSION-for-goss-validation-on-raw-image-bui.patch b/projects/kubernetes-sigs/image-builder/patches/0016-sets-OS_VERSION-for-goss-validation-on-raw-image-bui.patch similarity index 70% rename from projects/kubernetes-sigs/image-builder/patches/0017-sets-OS_VERSION-for-goss-validation-on-raw-image-bui.patch rename to projects/kubernetes-sigs/image-builder/patches/0016-sets-OS_VERSION-for-goss-validation-on-raw-image-bui.patch index edaca02432..8a30914cce 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0017-sets-OS_VERSION-for-goss-validation-on-raw-image-bui.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0016-sets-OS_VERSION-for-goss-validation-on-raw-image-bui.patch @@ -1,22 +1,21 @@ -From 2dfca2a7cdad5941c05f9f070b126d4b80398ce3 Mon Sep 17 00:00:00 2001 +From 17f597b2b0eb3160ff212b407685ee33bcf41d55 Mon Sep 17 00:00:00 2001 From: Jackson West Date: Wed, 28 Jun 2023 12:42:22 -0500 -Subject: [PATCH 17/19] sets OS_VERSION for goss validation on raw image builds +Subject: [PATCH 16/22] sets OS_VERSION for goss validation on raw image builds --- images/capi/packer/raw/packer.json | 1 + - images/capi/packer/raw/raw-ubuntu-1804.json | 1 + images/capi/packer/raw/raw-ubuntu-2004-efi.json | 1 + images/capi/packer/raw/raw-ubuntu-2004.json | 1 + images/capi/packer/raw/raw-ubuntu-2204-efi.json | 1 + - images/capi/packer/raw/raw-ubuntu-2204.json | 3 ++- - 6 files changed, 7 insertions(+), 1 deletion(-) + images/capi/packer/raw/raw-ubuntu-2204.json | 1 + + 5 files changed, 5 insertions(+) diff --git a/images/capi/packer/raw/packer.json b/images/capi/packer/raw/packer.json -index dc494a1e8..7529f655a 100644 +index a04be4e8f..83aa6b4fb 100644 --- a/images/capi/packer/raw/packer.json +++ b/images/capi/packer/raw/packer.json -@@ -114,6 +114,7 @@ +@@ -117,6 +117,7 @@ "vars_inline": { "ARCH": "amd64", "OS": "{{user `distro_name` | lower}}", @@ -24,18 +23,6 @@ index dc494a1e8..7529f655a 100644 "PROVIDER": "raw", "containerd_version": "{{user `containerd_version`}}", "kubernetes_cni_deb_version": "{{ user `kubernetes_cni_deb_version` }}", -diff --git a/images/capi/packer/raw/raw-ubuntu-1804.json b/images/capi/packer/raw/raw-ubuntu-1804.json -index 46ef18d9e..f87538b05 100644 ---- a/images/capi/packer/raw/raw-ubuntu-1804.json -+++ b/images/capi/packer/raw/raw-ubuntu-1804.json -@@ -4,6 +4,7 @@ - "build_name": "ubuntu-1804", - "build_target": "raw", - "distro_name": "ubuntu", -+ "distro_version": "18.04", - "guest_os_type": "ubuntu-64", - "iso_checksum": "f5cbb8104348f0097a8e513b10173a07dbc6684595e331cb06f93f385d0aecf6", - "iso_checksum_type": "sha256", diff --git a/images/capi/packer/raw/raw-ubuntu-2004-efi.json b/images/capi/packer/raw/raw-ubuntu-2004-efi.json index 7ed3ac8a3..421fe6976 100644 --- a/images/capi/packer/raw/raw-ubuntu-2004-efi.json @@ -61,7 +48,7 @@ index 9e78e6384..cbcfbc6f3 100644 "iso_checksum": "f11bda2f2caed8f420802b59f382c25160b114ccc665dbac9c5046e7fceaced2", "iso_checksum_type": "sha256", diff --git a/images/capi/packer/raw/raw-ubuntu-2204-efi.json b/images/capi/packer/raw/raw-ubuntu-2204-efi.json -index 7d2f921c5..279c5bcc3 100644 +index 3de116312..6839cc2d0 100644 --- a/images/capi/packer/raw/raw-ubuntu-2204-efi.json +++ b/images/capi/packer/raw/raw-ubuntu-2204-efi.json @@ -3,6 +3,7 @@ @@ -73,19 +60,17 @@ index 7d2f921c5..279c5bcc3 100644 "guest_os_type": "ubuntu-64", "iso_checksum": "5e38b55d57d94ff029719342357325ed3bda38fa80054f9330dc789cd2d43931", diff --git a/images/capi/packer/raw/raw-ubuntu-2204.json b/images/capi/packer/raw/raw-ubuntu-2204.json -index 38e827ef1..7a7b3109f 100644 +index e03f336cd..c9cfe7381 100644 --- a/images/capi/packer/raw/raw-ubuntu-2204.json +++ b/images/capi/packer/raw/raw-ubuntu-2204.json -@@ -2,7 +2,8 @@ - "boot_command_prefix": "clinux /casper/vmlinuz --- autoinstall ds='nocloud-net;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/22.04/'initrd /casper/initrdboot", +@@ -3,6 +3,7 @@ "build_name": "ubuntu-2204", "build_target": "raw", -- "distro_name": "ubuntu", -+ "distro_name": "ubuntu", + "distro_name": "ubuntu", + "distro_version": "22.04", "guest_os_type": "ubuntu-64", "iso_checksum": "5e38b55d57d94ff029719342357325ed3bda38fa80054f9330dc789cd2d43931", "iso_checksum_type": "sha256", -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0018-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch b/projects/kubernetes-sigs/image-builder/patches/0017-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch similarity index 96% rename from projects/kubernetes-sigs/image-builder/patches/0018-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch rename to projects/kubernetes-sigs/image-builder/patches/0017-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch index 6731e1ccc3..e1b80468bd 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0018-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0017-Disable-UDP-offload-service-for-Redhat-and-Ubuntu.patch @@ -1,7 +1,7 @@ -From 6657f087315015a608a0f088de41ea47da4a6232 Mon Sep 17 00:00:00 2001 +From 912c3a6d2da26b78ab1ca01c2cf5890ee808ada8 Mon Sep 17 00:00:00 2001 From: Taylor Neyland Date: Wed, 19 Jul 2023 12:51:30 -0500 -Subject: [PATCH 18/19] Disable UDP offload service for Redhat and Ubuntu +Subject: [PATCH 17/22] Disable UDP offload service for Redhat and Ubuntu --- .../system/disable-udp-offload-redhat.service | 15 +++++++++++++++ @@ -108,5 +108,5 @@ index 8a63b50ce..392a6fc4e 100644 + state: stopped + when: ansible_distribution_version is version('22.04', '>=') -- -2.39.2 +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0020-Add-dracut-cmd-to-generate-initramfs-with-all-driver.patch b/projects/kubernetes-sigs/image-builder/patches/0018-Add-dracut-cmd-to-generate-initramfs-with-all-driver.patch similarity index 89% rename from projects/kubernetes-sigs/image-builder/patches/0020-Add-dracut-cmd-to-generate-initramfs-with-all-driver.patch rename to projects/kubernetes-sigs/image-builder/patches/0018-Add-dracut-cmd-to-generate-initramfs-with-all-driver.patch index 8d61d42ee6..897696b23e 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0020-Add-dracut-cmd-to-generate-initramfs-with-all-driver.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0018-Add-dracut-cmd-to-generate-initramfs-with-all-driver.patch @@ -1,8 +1,8 @@ -From 67abe004ac8cec4e9434f29356e327d5b4d86803 Mon Sep 17 00:00:00 2001 +From e0731461811d452da17f85710948b5f4b494ff7e Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Wed, 6 Sep 2023 11:09:02 -0500 -Subject: [PATCH] Add dracut cmd to generate initramfs with all drivers for - rhel raw +Subject: [PATCH 18/22] Add dracut cmd to generate initramfs with all drivers + for rhel raw Signed-off-by: Vignesh Goutham Ganesh --- @@ -38,5 +38,5 @@ index 54a7c0d80..e1f1735c7 100644 "distro_version": "8", "epel_rpm_gpg_key": "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8", -- -2.39.2 (Apple Git-143) +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0021-Add-proxy-register-with-satellite-and-pull-packages-.patch b/projects/kubernetes-sigs/image-builder/patches/0019-Add-proxy-register-with-satellite-and-pull-packages-.patch similarity index 51% rename from projects/kubernetes-sigs/image-builder/patches/0021-Add-proxy-register-with-satellite-and-pull-packages-.patch rename to projects/kubernetes-sigs/image-builder/patches/0019-Add-proxy-register-with-satellite-and-pull-packages-.patch index c3c59c085a..9497c25826 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0021-Add-proxy-register-with-satellite-and-pull-packages-.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0019-Add-proxy-register-with-satellite-and-pull-packages-.patch @@ -1,8 +1,8 @@ -From 91143f2373965792a7ae883d6ee49ae8508892c0 Mon Sep 17 00:00:00 2001 +From 23ffb2ba7d50eacf6e59cd59b2f6c12d59ac84d1 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Fri, 11 Aug 2023 11:59:20 -0500 -Subject: [PATCH] Add proxy, register with satellite, and pull packages from - satellite support to redhat subscription manager +Subject: [PATCH 19/22] Add proxy, register with satellite, and pull packages + from satellite support to redhat subscription manager When pulling from satellite the os version must be set using `rhsm_server_release_version` @@ -92,16 +92,16 @@ index 0961f37d4..345aeaa33 100644 - name: import epel gpg key rpm_key: diff --git a/images/capi/packer/config/ansible-args.json b/images/capi/packer/config/ansible-args.json -index 62990ab41..d8139e3d7 100644 +index 4176c8ff9..a9b90e83c 100644 --- a/images/capi/packer/config/ansible-args.json +++ b/images/capi/packer/config/ansible-args.json @@ -1,5 +1,5 @@ { - "ansible_common_ssh_args": "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa", -- "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`}}\" 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_cni_http_source={{user `kubernetes_cni_http_source`}} kubernetes_cni_http_checksum={{user `kubernetes_cni_http_checksum`}} 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` }} 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`}}", -+ "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`}}\" 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_cni_http_source={{user `kubernetes_cni_http_source`}} kubernetes_cni_http_checksum={{user `kubernetes_cni_http_checksum`}} 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` }} 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_common_ssh_args": "-o IdentitiesOnly=yes", +- "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`}}\" 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` }} 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`}}", ++ "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`}}\" 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` }} 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.2 (Apple Git-143) +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0019-Pin-packer-plugin-nutanix-to-v0.7.1.patch b/projects/kubernetes-sigs/image-builder/patches/0019-Pin-packer-plugin-nutanix-to-v0.7.1.patch deleted file mode 100644 index dcadec20c2..0000000000 --- a/projects/kubernetes-sigs/image-builder/patches/0019-Pin-packer-plugin-nutanix-to-v0.7.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5b54acdcaec5e5a1476d190b8658145a4aa04a35 Mon Sep 17 00:00:00 2001 -From: Prow Bot -Date: Thu, 10 Aug 2023 14:47:53 -0700 -Subject: [PATCH 19/19] Pin packer-plugin-nutanix to v0.7.1 - ---- - images/capi/packer/nutanix/config.pkr.hcl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/images/capi/packer/nutanix/config.pkr.hcl b/images/capi/packer/nutanix/config.pkr.hcl -index 3f0d26dd7..3714bc23b 100644 ---- a/images/capi/packer/nutanix/config.pkr.hcl -+++ b/images/capi/packer/nutanix/config.pkr.hcl -@@ -1,7 +1,7 @@ - packer { - required_plugins { - nutanix = { -- version = ">= 0.7.0" -+ version = "0.7.1" - source = "github.com/nutanix-cloud-native/nutanix" - } - } --- -2.39.2 - diff --git a/projects/kubernetes-sigs/image-builder/patches/0022-Ubuntu-switch-to-offline-install-when-mirrors-are-un.patch b/projects/kubernetes-sigs/image-builder/patches/0020-Ubuntu-switch-to-offline-install-when-mirrors-are-un.patch similarity index 88% rename from projects/kubernetes-sigs/image-builder/patches/0022-Ubuntu-switch-to-offline-install-when-mirrors-are-un.patch rename to projects/kubernetes-sigs/image-builder/patches/0020-Ubuntu-switch-to-offline-install-when-mirrors-are-un.patch index 785738fb65..14fe1ea258 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0022-Ubuntu-switch-to-offline-install-when-mirrors-are-un.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0020-Ubuntu-switch-to-offline-install-when-mirrors-are-un.patch @@ -1,7 +1,8 @@ -From e49e4c268f4f9c4e71b68492bbb4665b5a49c729 Mon Sep 17 00:00:00 2001 +From 27ed7edc98b71beaeb0970d348fa1553591a9a46 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Mon, 18 Sep 2023 10:38:42 -0500 -Subject: [PATCH] Ubuntu switch to offline-install when mirrors are unavailable +Subject: [PATCH 20/22] Ubuntu switch to offline-install when mirrors are + unavailable Signed-off-by: Vignesh Goutham Ganesh --- @@ -36,5 +37,5 @@ index e2838e3c4..a5ed32346 100644 ssh: install-server: true -- -2.39.2 (Apple Git-143) +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0023-Default-Flatcar-version-to-avoid-pulling-from-intern.patch b/projects/kubernetes-sigs/image-builder/patches/0021-Default-Flatcar-version-to-avoid-pulling-from-intern.patch similarity index 68% rename from projects/kubernetes-sigs/image-builder/patches/0023-Default-Flatcar-version-to-avoid-pulling-from-intern.patch rename to projects/kubernetes-sigs/image-builder/patches/0021-Default-Flatcar-version-to-avoid-pulling-from-intern.patch index 0e1484decb..cbdecba697 100644 --- a/projects/kubernetes-sigs/image-builder/patches/0023-Default-Flatcar-version-to-avoid-pulling-from-intern.patch +++ b/projects/kubernetes-sigs/image-builder/patches/0021-Default-Flatcar-version-to-avoid-pulling-from-intern.patch @@ -1,8 +1,8 @@ -From d4c2ccc4ffd732f5f702f8eec58d6222c7336cfb Mon Sep 17 00:00:00 2001 +From 9bf8214d2cd7274db5a1b8a2568aa7f4a2b5e850 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Wed, 20 Sep 2023 10:33:44 -0500 -Subject: [PATCH] Default Flatcar version to avoid pulling from internet on - every make +Subject: [PATCH 21/22] Default Flatcar version to avoid pulling from internet + on every make Signed-off-by: Vignesh Goutham Ganesh --- @@ -10,10 +10,10 @@ Signed-off-by: Vignesh Goutham Ganesh 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/capi/Makefile b/images/capi/Makefile -index 4f90365aa..16b020fe2 100644 +index f841eac48..905407368 100644 --- a/images/capi/Makefile +++ b/images/capi/Makefile -@@ -307,7 +307,7 @@ WINDOWS_VERSIONS := windows-2019 windows-2004 windows-2022 +@@ -312,7 +312,7 @@ WINDOWS_VERSIONS := windows-2019 windows-2022 # Set Flatcar Container Linux channel and version if not supplied FLATCAR_CHANNEL ?= stable @@ -23,5 +23,5 @@ index 4f90365aa..16b020fe2 100644 override FLATCAR_VERSION := $(shell hack/image-grok-latest-flatcar-version.sh $(FLATCAR_CHANNEL)) endif -- -2.39.2 (Apple Git-143) +2.40.1 diff --git a/projects/kubernetes-sigs/image-builder/patches/0022-TEMP-skip-python-3.9-check-if-ansible-already-instal.patch b/projects/kubernetes-sigs/image-builder/patches/0022-TEMP-skip-python-3.9-check-if-ansible-already-instal.patch new file mode 100644 index 0000000000..e313f3fe97 --- /dev/null +++ b/projects/kubernetes-sigs/image-builder/patches/0022-TEMP-skip-python-3.9-check-if-ansible-already-instal.patch @@ -0,0 +1,32 @@ +From dc93519735126fd6bf1b7ef13992dcab865d811b Mon Sep 17 00:00:00 2001 +From: Prow Bot +Date: Fri, 13 Oct 2023 13:11:34 -0500 +Subject: [PATCH 21/22] TEMP: skip python 3.9 check if ansible already installed + +--- + images/capi/hack/ensure-python.sh | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/images/capi/hack/ensure-python.sh b/images/capi/hack/ensure-python.sh +index f8833d54e..b3c3e670b 100755 +--- a/images/capi/hack/ensure-python.sh ++++ b/images/capi/hack/ensure-python.sh +@@ -45,7 +45,12 @@ EOF + fi + } + +-echo "Checking if python is available" +-verify_python_version +- ++# Temporary eks-a change until our CI images are updated to include python 3.9 ++# if ansible is already installed, which it will be in our CI, the python check is skipped ++# for users installing ansible for the first time via the ensure_ansible script ++# this check will still apply requiring python 3.9 ++if ! command -v ansible >/dev/null 2>&1; then ++ echo "Checking if python is available" ++ verify_python_version ++fi + python3 --version +-- +2.40.1 +