Merge pull request #1526 from aslafy-z/patch-2

Load packer goss plugin via config file
kubernetes-sigs · Jul 29, 2024 · c0b70ae · c0b70ae
2 parents 7e5e3f1 + 90a3840
commit c0b70ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 100 deletions.
diff --git a/images/capi/Makefile b/images/capi/Makefile
@@ -64,14 +64,12 @@ deps-common:
 deps-ami: ## Installs/checks dependencies for AMI builds
 deps-ami: deps-common
 	hack/ensure-ansible-windows.sh
-	hack/ensure-goss.sh
 	$(PACKER) init packer/config.pkr.hcl
 
 .PHONY: deps-azure
 deps-azure: ## Installs/checks dependencies for Azure builds
 deps-azure: deps-common
 	hack/ensure-ansible-windows.sh
-	hack/ensure-goss.sh
 	hack/ensure-jq.sh
 	hack/ensure-azure-cli.sh
 	$(PACKER) init packer/config.pkr.hcl
@@ -86,43 +84,37 @@ deps-do: deps-common
 .PHONY: deps-osc
 deps-osc: ## Installs/checks dependencies for Outscale builds
 deps-osc: deps-common
-	hack/ensure-goss.sh
 	$(PACKER) init packer/config.pkr.hcl
 	$(PACKER) init packer/outscale/config.pkr.hcl
 
 .PHONY: deps-gce
 deps-gce: ## Installs/checks dependencies for GCE builds
 deps-gce: deps-common
-	hack/ensure-goss.sh
 	$(PACKER) init packer/config.pkr.hcl
 
 .PHONY: deps-ova
 deps-ova: ## Installs/checks dependencies for OVA builds
 deps-ova: deps-common
 	hack/ensure-ansible-windows.sh
-	hack/ensure-goss.sh
 	hack/ensure-ovftool.sh
 	$(PACKER) init packer/config.pkr.hcl
 
 .PHONY: deps-openstack
 deps-openstack: ## Installs/checks dependencies for OpenStack builds
 deps-openstack: deps-common
-	hack/ensure-goss.sh
 	hack/ensure-s3.sh
 	$(PACKER) init packer/config.pkr.hcl
 	$(PACKER) init packer/openstack/config.pkr.hcl
 
 .PHONY: deps-qemu
 deps-qemu: ## Installs/checks dependencies for QEMU builds
 deps-qemu: deps-common
-	hack/ensure-goss.sh
 	$(PACKER) init packer/config.pkr.hcl
 	$(PACKER) init packer/qemu/config.pkr.hcl
 
 .PHONY: deps-raw
 deps-raw: ## Installs/checks dependencies for RAW builds
 deps-raw: deps-common
-	hack/ensure-goss.sh
 	$(PACKER) init packer/config.pkr.hcl
 
 .PHONY: deps-oci
@@ -135,7 +127,6 @@ deps-oci: deps-common
 .PHONY: deps-powervs
 deps-powervs: ## Installs/checks dependencies for PowerVS builds
 deps-powervs: deps-common
-	hack/ensure-goss.sh
 	hack/ensure-powervs.sh
 	$(PACKER) init packer/config.pkr.hcl
 
@@ -148,7 +139,6 @@ deps-ignition:
 .PHONY: deps-nutanix
 deps-nutanix: ## Installs/checks dependencies for Nutanix builds
 deps-nutanix: deps-common
-	hack/ensure-goss.sh
 	$(PACKER) init packer/config.pkr.hcl
 	$(PACKER) init packer/nutanix/config.pkr.hcl
 
@@ -162,14 +152,12 @@ deps-release: ## Installs/checks dependencies for project releases
 .PHONY: deps-hcloud
 deps-hcloud: ## Installs/checks dependencies for Hetznercloud builds
 deps-hcloud: deps-common
-	hack/ensure-goss.sh
 	$(PACKER) init packer/config.pkr.hcl
 	$(PACKER) init packer/hcloud/config.pkr.hcl
 
 .PHONY: deps-proxmox
 deps-proxmox: ## Installs/checks dependencies for Proxmox builds
 deps-proxmox: deps-common
-	hack/ensure-goss.sh
 	$(PACKER) init packer/config.pkr.hcl
 	$(PACKER) init packer/proxmox/config.pkr.hcl
 

diff --git a/images/capi/hack/ensure-goss.sh b/images/capi/hack/ensure-goss.sh
diff --git a/images/capi/packer/config.pkr.hcl b/images/capi/packer/config.pkr.hcl
@@ -4,5 +4,9 @@ packer {
       version = ">= 1.1.0"
       source  = "github.com/hashicorp/ansible"
     }
+    goss = {
+      version = "~> 3"
+      source  = "github.com/YaleUniversity/goss"
+    }
   }
 }