Merge pull request #1847 from nutanix-cloud-native/fix/nutanix-windows

fix: Windows support with Nutanix builder

Author: k8s-ci-robot

docs/book/src/capi/goss/goss.md

@@ -10,15 +10,15 @@ to test if the images have all requisite components to work with cluster API.
 ### Support Matrix 
 *For stock server-specs shipped with repo
 
-| OS                      | Builder              |
-|-------------------------|----------------------|
-| Amazon Linux            | aws                  |
-| Azure Linux             | azure                |
-| CentOS                  | aws, ova             |
-| Flatcar Container Linux | aws, azure, ova      |
-| PhotonOS                | ova                  |
-| Ubuntu                  | aws, azure, gcp, ova |
-| Windows                 | aws, azure, ova      |
+| OS                      | Builder                       |
+|-------------------------|-------------------------------|
+| Amazon Linux            | aws                           |
+| Azure Linux             | azure                         |
+| CentOS                  | aws, nutanix, ova             |
+| Flatcar Container Linux | aws, azure, nutanix, ova      |
+| PhotonOS                | ova                           |
+| Ubuntu                  | aws, azure, gcp, nutanix, ova |
+| Windows                 | aws, azure, nutanix, ova      |
 
 
 ### Prerequisites for Running Goss

images/capi/Makefile

@@ -620,10 +620,11 @@ $(POWERVS_VALIDATE_TARGETS): deps-powervs
 
 .PHONY: $(NUTANIX_BUILD_TARGETS)
 $(NUTANIX_BUILD_TARGETS): deps-nutanix set-ssh-password
-	$(eval NUTANIX_USERDATA:=$(shell cat $(abspath packer/nutanix/linux/cloud-init/$(subst -,/,$(if $(findstring ubuntu,$@),$(call GET_UBUNTU_DOTTED_SEMVER,$(subst build-nutanix-,,$@)),$(subst build-nutanix-,,$@)))/user-data) | base64 -w0))
-	$(eval NUTANIX_VAR_FILE:=$(abspath packer/nutanix/$(subst build-nutanix-,,$@).json))
-	jq '.user_data = "$(NUTANIX_USERDATA)"' $(NUTANIX_VAR_FILE) > $(NUTANIX_VAR_FILE).templated && mv $(NUTANIX_VAR_FILE).templated $(NUTANIX_VAR_FILE)
+	$(if $(findstring windows,$@),,$(eval NUTANIX_USERDATA:=$(shell cat $(abspath packer/nutanix/linux/cloud-init/$(subst -,/,$(if $(findstring ubuntu,$@),$(call GET_UBUNTU_DOTTED_SEMVER,$(subst build-nutanix-,,$@)),$(subst build-nutanix-,,$@)))/user-data) | base64 -w0)))
+	$(if $(findstring windows,$@),,$(eval NUTANIX_VAR_FILE:=$(abspath packer/nutanix/$(subst build-nutanix-,,$@).json)))
+	$(if $(findstring windows,$@),,jq '.user_data = "$(NUTANIX_USERDATA)"' $(NUTANIX_VAR_FILE) > $(NUTANIX_VAR_FILE).templated && mv $(NUTANIX_VAR_FILE).templated $(NUTANIX_VAR_FILE))
 	# This uses a packer file builder to input unattend variables into a JSON file to be consumed by the python script before running the nutanix provisioner
+	$(if $(findstring windows,$@),$(PACKER) build $(PACKER_WINDOWS_NODE_FLAGS) -var-file="packer/nutanix/nutanix.json" -var-file="$(abspath packer/nutanix/$(subst build-nutanix-,,$@).json)" -only=file $(ABSOLUTE_PACKER_VAR_FILES) packer/nutanix/packer$(if $(findstring windows,$@),-windows,).json,)
 	$(if $(findstring windows,$@),hack/windows-unattend.py --unattend-file='./packer/nutanix/windows/$(subst build-nutanix-,,$@)/autounattend.xml',)
 	$(PACKER) build $(if $(findstring windows,$@),$(PACKER_WINDOWS_NODE_FLAGS),$(PACKER_NODE_FLAGS)) -var-file="packer/nutanix/nutanix.json" -var-file="$(abspath packer/nutanix/$(subst build-nutanix-,,$@).json)" $(ABSOLUTE_PACKER_VAR_FILES) packer/nutanix/packer$(if $(findstring windows,$@),-windows,).json
 

images/capi/packer/nutanix/packer-windows.json

@@ -1,5 +1,10 @@
 {
   "builders": [
+    {
+      "content": "{\n \"unattend_timezone\" : \"{{user `unattend_timezone`}}\"\n, \"admin_password\" : \"{{user `windows_admin_password`}}\"\n}",
+      "target": "./packer_cache/unattend.json",
+      "type": "file"
+    },
     {
       "boot_type": "{{user `boot_type`}}",
       "cd_files": [
@@ -54,6 +59,7 @@
   ],
   "provisioners": [
     {
+      "except": "file",
       "extra_arguments": [
         "-e",
         "ansible_winrm_server_cert_validation=ignore",
@@ -70,12 +76,14 @@
       "user": "Administrator"
     },
     {
+      "except": "file",
       "restart_timeout": "10m",
       "type": "windows-restart"
     },
     {
       "arch": "{{user `goss_arch`}}",
       "download_path": "{{user `goss_download_path`}}",
+      "except": "file",
       "format": "{{user `goss_format`}}",
       "format_options": "{{user `goss_format_options`}}",
       "goss_file": "{{user `goss_entry_file`}}",
@@ -91,7 +99,8 @@
       "url": "{{user `goss_url`}}",
       "use_sudo": false,
       "vars_env": {
-        "GOSS_MAX_CONCURRENT": "1"
+        "GOSS_MAX_CONCURRENT": "1",
+        "GOSS_USE_ALPHA": "1"
       },
       "vars_file": "{{user `goss_vars_file`}}",
       "vars_inline": {
@@ -107,6 +116,7 @@
       "version": "{{user `goss_version`}}"
     },
     {
+      "except": "file",
       "inline": [
         "rm -Force -Recurse C:\\var\\log\\kubelet\\*"
       ],
@@ -155,6 +165,7 @@
     "nutanix_subnet_name": "{{env `NUTANIX_SUBNET_NAME`}}",
     "nutanix_username": "{{env `NUTANIX_USERNAME`}}",
     "scp_extra_vars": "",
-    "vm_force_delete": "false"
+    "vm_force_delete": "false",
+    "windows_admin_password": "{{env `WINDOWS_ADMIN_PASSWORD`}}"
   }
 }

images/capi/packer/nutanix/windows-2022.json

@@ -6,5 +6,5 @@
   "runtime": "containerd",
   "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"",
   "source_image_name": "en-us_windows_server_2022_x64_dvd_620d7eac",
-  "virtio_image_name": "Nutanix-VirtIO-1.2.1"
+  "virtio_image_name": "Nutanix-VirtIO-1.2.5"
 }