Support installing extra Debian packages and RPMs during image builds

aws · Jun 29, 2023 · bd8b672 · bd8b672
1 parent 45130dc
commit bd8b672
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/projects/aws/image-builder/ATTRIBUTION.txt b/projects/aws/image-builder/ATTRIBUTION.txt
@@ -1,5 +1,5 @@
 
-** github.com/aws/eks-anywhere-build-tooling/image-builder; version 0.1.2 --
+** github.com/aws/eks-anywhere-build-tooling/image-builder; version v0.1.3 --
 https://github.com/aws/eks-anywhere-build-tooling/image-builder
 
 ** github.com/aws/eks-anywhere/release/api/v1alpha1; version v0.0.0-20230510212526-797a56720581 --

diff --git a/projects/aws/image-builder/CHECKSUMS b/projects/aws/image-builder/CHECKSUMS
@@ -1,2 +1,2 @@
-3ec2092f2db2a9280c150362057404b04173b677d24f3d4626184de6013773e2  _output/bin/image-builder/linux-amd64/image-builder
-771ec2df52fe94eee856e811bf26b61e153755d0f92bdd4b36c714a9b9efb0db  _output/bin/image-builder/linux-arm64/image-builder
+13719056221883ffe6af053755cb0c5b779bffedee076718ada0aa3cbbdb19f2  _output/bin/image-builder/linux-amd64/image-builder
+29eefef76e850695aa680403cd33f9dddd47d74ebbbf931080914064c7d4e765  _output/bin/image-builder/linux-arm64/image-builder
diff --git a/projects/aws/image-builder/GIT_TAG b/projects/aws/image-builder/GIT_TAG
@@ -1 +1 @@
-0.1.2
+v0.1.3
diff --git a/projects/aws/image-builder/README.md b/projects/aws/image-builder/README.md
@@ -1,5 +1,5 @@
 ## **Image Builder Tool**
-![Version](https://img.shields.io/badge/version-0.1.2-blue)
+![Version](https://img.shields.io/badge/version-v0.1.3-blue)
 
 Image Builder Tool is a cli that builds EKS-A compatible Kubernetes node images. The tool is based on upstream
 [image-builder](https://github.com/kubernetes-sigs/image-builder) project and uses packer to build the node images.
@@ -9,9 +9,12 @@ Supported Providers
 * vsphere
 * baremetal
 * nutanix
+* snow
+* cloudstack
 
 Supported OSes
-* ubuntu
+* Ubuntu
+* Red Hat Enterprise Linux
 
 Supported Release Channels
 * 1-27

diff --git a/projects/aws/image-builder/builder/types.go b/projects/aws/image-builder/builder/types.go
@@ -49,18 +49,20 @@ type VsphereConfig struct {
 	Password           string `json:"password"`
 	IsoConfig
 	RhelConfig
+	ExtraPackagesConfig
 }
 
 type BaremetalConfig struct {
-	ExtraRpms string `json:"extra_rpms,omitempty"`
 	IsoConfig
 	RhelConfig
+	ExtraPackagesConfig
 }
 
 type CloudstackConfig struct {
 	AnsibleUserVars string `json:"ansible_user_vars"`
 	IsoConfig
 	RhelConfig
+	ExtraPackagesConfig
 }
 
 type IsoConfig struct {
@@ -84,6 +86,7 @@ type NutanixConfig struct {
 	NutanixUserName   string `json:"nutanix_username"`
 	NutanixPassword   string `json:"nutanix_password"`
 	NutanixSubnetName string `json:"nutanix_subnet_name"`
+	ExtraPackagesConfig
 }
 
 type AMIConfig struct {
@@ -101,4 +104,11 @@ type AMIConfig struct {
 	SubnetID            string   `json:"subnet_id"`
 	VolumeSize          string   `json:"volume_size"`
 	VolumeType          string   `json:"volume_type"`
+	ExtraPackagesConfig
 }
+
+type ExtraPackagesConfig struct {
+	ExtraDebs  string `json:"extra_debs,omitempty"`
+	ExtraRepos string `json:"extra_repos,omitempty"`
+	ExtraRpms  string `json:"extra_rpms,omitempty"`
+}