bumps upstream image-builder to 0.1.19

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; \

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; \

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:

projects/kubernetes-sigs/image-builder/GIT_TAG

@@ -1 +1 @@
-v0.1.16
+v0.1.19

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?=

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"
 }

projects/kubernetes-sigs/image-builder/patches/0001-Add-goss-validations-for-EKS-D-artifacts.patch

@@ -1,18 +1,18 @@
-From 1c8a0f202a9cec579266a8fed17a86165539b8c8 Mon Sep 17 00:00:00 2001
+From d63488c1d3e6b4d8754066eda15dadb4c4ab2351 Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <[email protected]>
 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 <[email protected]>
 ---
  images/capi/packer/goss/goss-command.yaml | 4 ++--
  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
 

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 <[email protected]>
 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 <[email protected]>
@@ -10,10 +10,10 @@ Signed-off-by: Vignesh Goutham Ganesh <[email protected]>
  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
 

projects/kubernetes-sigs/image-builder/patches/0003-Create-etc-pki-tls-certs-dir-as-part-of-image-builds.patch

@@ -1,18 +1,18 @@
-From bd4a51d1cb15048cf8daa8c38b166065c91ec22c Mon Sep 17 00:00:00 2001
+From beb55b7c85e2dc93b5f5c0a9c8d68290d48cc9e2 Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <[email protected]>
 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 <[email protected]>
 ---
  images/capi/ansible/roles/sysprep/tasks/main.yml | 9 +++++++++
  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