Skip to content

Commit

Permalink
Removing VirtualBox target
Browse files Browse the repository at this point in the history
  • Loading branch information
knabben committed Mar 24, 2024
1 parent ae885f5 commit 8e1f247
Show file tree
Hide file tree
Showing 11 changed files with 2 additions and 531 deletions.
1 change: 0 additions & 1 deletion docs/book/src/capi/capi.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ If any needed binaries are not present, they can be installed to `images/capi/.b
* [OpenStack](./providers/openstack.md)
* [OpenStack remote image building](./providers/openstack-remote.md)
* [Raw](./providers/raw.md)
* [VirtualBox](./providers/virtualbox.md)
* [vSphere](./providers/vsphere.md)
* [Proxmox](./providers/proxmox.md)

Expand Down
41 changes: 0 additions & 41 deletions docs/book/src/capi/providers/virtualbox.md

This file was deleted.

38 changes: 2 additions & 36 deletions images/capi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ version: ## Display version of image-builder

.PHONY: deps
deps: ## Installs/checks all dependencies
deps: deps-ami deps-azure deps-do deps-gce deps-ova deps-openstack deps-qemu deps-raw deps-oci deps-osc deps-vbox deps-powervs deps-nutanix deps-hcloud
deps: deps-ami deps-azure deps-do deps-gce deps-ova deps-openstack deps-qemu deps-raw deps-oci deps-osc deps-powervs deps-nutanix deps-hcloud

.PHONY: deps-common
deps-common: ## Installs/checks dependencies common to most builds
Expand Down Expand Up @@ -131,13 +131,6 @@ deps-oci: deps-common
$(PACKER) init packer/config.pkr.hcl
$(PACKER) plugins install github.com/hashicorp/oracle

.PHONY: deps-vbox
deps-vbox: ## Installs/checks dependencies for VirtualBox builds
deps-vbox: deps-common
hack/ensure-ansible-windows.sh
hack/ensure-goss.sh
$(PACKER) init packer/config.pkr.hcl

.PHONY: deps-powervs
deps-powervs: ## Installs/checks dependencies for PowerVS builds
deps-powervs: deps-common
Expand Down Expand Up @@ -373,7 +366,6 @@ 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-2004 raw-ubuntu-2004-efi raw-flatcar raw-rhel-8
VBOX_BUILD_NAMES ?= vbox-windows-2019

POWERVS_BUILD_NAMES ?= powervs-centos-8

Expand Down Expand Up @@ -419,8 +411,6 @@ OCI_BUILD_TARGETS := $(addprefix build-,$(OCI_BUILD_NAMES))
OCI_VALIDATE_TARGETS := $(addprefix validate-,$(OCI_BUILD_NAMES))
OSC_BUILD_TARGETS := $(addprefix build-,$(OSC_BUILD_NAMES))
OSC_VALIDATE_TARGETS := $(addprefix validate-,$(OSC_BUILD_NAMES))
VBOX_BUILD_TARGETS := $(addprefix build-,$(VBOX_BUILD_NAMES))
VBOX_VALIDATE_TARGETS := $(addprefix validate-,$(VBOX_BUILD_NAMES))
POWERVS_BUILD_TARGETS := $(addprefix build-,$(POWERVS_BUILD_NAMES))
POWERVS_VALIDATE_TARGETS := $(addprefix validate-,$(POWERVS_BUILD_NAMES))
NUTANIX_BUILD_TARGETS := $(addprefix build-,$(NUTANIX_BUILD_NAMES))
Expand Down Expand Up @@ -570,14 +560,6 @@ $(OSC_BUILD_TARGETS): deps-osc
$(OSC_VALIDATE_TARGETS): deps-osc
$(PACKER) validate $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/outscale/$(subst validate-osc-,,$@).json)" $(ABSOLUTE_PACKER_VAR_FILES) packer/outscale/packer.json

.PHONY: $(VBOX_BUILD_TARGETS)
$(VBOX_BUILD_TARGETS): deps-vbox
$(PACKER) build $(if $(findstring windows,$@),$(PACKER_WINDOWS_NODE_FLAGS),$(PACKER_NODE_FLAGS)) -var-file="packer/vbox/packer-common.json" -var-file="$(abspath packer/vbox/$(subst build-vbox-,,$@).json)" -only=virtualbox-iso $(ABSOLUTE_PACKER_VAR_FILES) packer/vbox/packer-$(if $(findstring windows,$@),windows).json

.PHONY: $(VBOX_VALIDATE_TARGETS)
$(VBOX_VALIDATE_TARGETS): deps-vbox
$(PACKER) validate $(if $(findstring windows,$@),$(PACKER_WINDOWS_NODE_FLAGS),$(PACKER_NODE_FLAGS)) -var-file="packer/vbox/packer-common.json" -var-file="$(abspath packer/vbox/$(subst validate-vbox-,,$@).json)" -only=virtualbox-iso $(ABSOLUTE_PACKER_VAR_FILES) packer/vbox/packer-$(if $(findstring windows,$@),windows).json

.PHONY: $(POWERVS_BUILD_TARGETS)
$(POWERVS_BUILD_TARGETS): deps-powervs
$(PACKER) build $(PACKER_POWERVS_NODE_FLAGS) -var-file="$(abspath packer/powervs/$(subst build-powervs-,,$@).json)" $(ABSOLUTE_PACKER_VAR_FILES) -except=flatcar packer/powervs/packer.json
Expand Down Expand Up @@ -628,11 +610,6 @@ RAW_CLEAN_TARGETS := $(subst build-,clean-,$(RAW_BUILD_TARGETS))
$(RAW_CLEAN_TARGETS):
rm -fr output/$(subst clean-raw-,,$@)-kube*

VBOX_CLEAN_TARGETS := $(subst build-,clean-,$(VBOX_BUILD_TARGETS))
.PHONY: $(VBOX_CLEAN_TARGETS)
$(VBOX_CLEAN_TARGETS):
rm -fr output/$(subst clean-vbox-,,$@)-kube*

## --------------------------------------
## Document dynamic build targets
## --------------------------------------
Expand Down Expand Up @@ -787,9 +764,6 @@ build-oci-all: $(OCI_BUILD_TARGETS) ## Builds all OCI image
build-osc-ubuntu-2004: ## Builds Ubuntu 20.04 Outscale Snapshot
build-osc-all: $(OSC_BUILD_TARGETS) ## Builds all Outscale Snapshot

build-vbox-windows-2019: ## Builds for Windows Server 2019 Node VirtualBox w local hypervisor
build-vbox-all: $(VBOX_BUILD_TARGETS) ## Builds all Qemu images

build-nutanix-ubuntu-2004: ## Builds the Nutanix ubuntu-2004 image
build-nutanix-ubuntu-2204: ## Builds the Nutanix ubuntu-2204 image
build-nutanix-rhel-8: ## Builds the Nutanix RedHat Enterprise Linux 8 image
Expand Down Expand Up @@ -923,9 +897,6 @@ validate-oci-all: $(OCI_VALIDATE_TARGETS) ## Validates all OCI image packer conf
validate-osc-ubuntu-2004: ## Validates Ubuntu 20.04 Outscale Snapshot Packer config
validate-osc-all: $(OSC_VALIDATE_TARGETS) ## Validates all Outscale Snapshot Packer config

validate-vbox-windows-2019: ## Validates Windows Server 2019 Node VirtualBox Packer config w local hypervisor
validate-vbox-all: $(VBOX_VALIDATE_TARGETS) ## Validates all RAW Packer config

validate-powervs-centos-8: ## Validates the PowerVS CentOS image packer config
validate-powervs-all: $(POWERVS_VALIDATE_TARGETS) ## Validates all PowerVS Packer config

Expand Down Expand Up @@ -958,7 +929,6 @@ validate-all: validate-ami-all \
validate-raw-all \
validate-oci-all \
validate-osc-all \
validate-vbox-all \
validate-powervs-all \
validate-nutanix-all \
validate-hcloud-all
Expand Down Expand Up @@ -986,7 +956,7 @@ lint-ignore: deps-lint
##@ Cleaning
.PHONY: clean
clean: ## Removes all image output directories and packer image cache
clean: $(NODE_OVA_LOCAL_CLEAN_TARGETS) $(QEMU_CLEAN_TARGETS) $(VBOX_CLEAN_TARGETS) clean-packer-cache
clean: $(NODE_OVA_LOCAL_CLEAN_TARGETS) $(QEMU_CLEAN_TARGETS) clean-packer-cache

.PHONY: clean-ova
clean-ova: ## Removes all ova image output directories (see NOTE at top of help)
Expand All @@ -1000,10 +970,6 @@ clean-qemu: $(QEMU_CLEAN_TARGETS)
clean-raw: ## Removes all raw image output directories (see NOTE at top of help)
clean-raw: $(RAW_CLEAN_TARGETS)

.PHONY: clean-vbox
clean-vbox: ## Removes all vbox image output directories (see NOTE at top of help)
clean-vbox: $(VBOX_CLEAN_TARGETS)

.PHONY: clean-packer-cache
clean-packer-cache: ## Removes the packer cache
clean-packer-cache:
Expand Down
5 changes: 0 additions & 5 deletions images/capi/packer/vbox/OWNERS

This file was deleted.

8 changes: 0 additions & 8 deletions images/capi/packer/vbox/packer-common.json

This file was deleted.

125 changes: 0 additions & 125 deletions images/capi/packer/vbox/packer-windows.json

This file was deleted.

24 changes: 0 additions & 24 deletions images/capi/packer/vbox/vagrantfile-windows_2019.template

This file was deleted.

10 changes: 0 additions & 10 deletions images/capi/packer/vbox/windows-2019.json

This file was deleted.

18 changes: 0 additions & 18 deletions images/capi/packer/vbox/windows/enable-winrm.ps1

This file was deleted.

13 changes: 0 additions & 13 deletions images/capi/packer/vbox/windows/sysprep.ps1

This file was deleted.

Loading

0 comments on commit 8e1f247

Please sign in to comment.