Merge pull request #18 from Ognian/master

add --efi-dir option to build-arm-iamge.sh
cp dir content not dir
2025-12-25 04:42:52 +00:00 · 2022-11-18 11:12:01 +01:00 · 2022-11-16 17:24:57 +01:00 · 2022-11-16 12:23:56 +01:00 · 2022-11-14 18:32:50 +01:00 · 2022-11-14 18:21:34 +01:00
9 changed files with 107 additions and 10 deletions
--- a/api/v1alpha1/osartifact_types.go
+++ b/api/v1alpha1/osartifact_types.go
@@ -31,10 +31,16 @@ type OSArtifactSpec struct {
 	// Foo is an example field of OSArtifact. Edit osartifact_types.go to remove/update
 	ImageName string `json:"imageName,omitempty"`
 	// This needs to be revisited
-	ISO        bool `json:"iso,omitempty"`
-	CloudImage bool `json:"cloudImage,omitempty"`
-	AzureImage bool `json:"azureImage,omitempty"`
-	GCEImage   bool `json:"gceImage,omitempty"`
+	ISO bool `json:"iso,omitempty"`
+
+	//Disk-only stuff
+	DiskSize   string `json:"diskSize,omitempty"`
+	CloudImage bool   `json:"cloudImage,omitempty"`
+	AzureImage bool   `json:"azureImage,omitempty"`
+	GCEImage   bool   `json:"gceImage,omitempty"`
+
+	Netboot    bool   `json:"netboot,omitempty"`
+	NetbootURL string `json:"netbootURL,omitempty"`

 	// TODO: treat cloudconfig as a secret, and take a secretRef where to store it (optionally)
 	CloudConfig string `json:"cloudConfig,omitempty"`
--- a/config/crd/bases/build.kairos.io_osartifacts.yaml
+++ b/config/crd/bases/build.kairos.io_osartifacts.yaml
@@ -35,6 +35,8 @@ spec:
          spec:
            description: OSArtifactSpec defines the desired state of OSArtifact
            properties:
+              azureImage:
+                type: boolean
              bundles:
                items:
                  type: string
@@ -43,6 +45,13 @@ spec:
                description: 'TODO: treat cloudconfig as a secret, and take a secretRef
                  where to store it (optionally)'
                type: string
+              cloudImage:
+                type: boolean
+              diskSize:
+                description: Disk-only stuff
+                type: string
+              gceImage:
+                type: boolean
              grubConfig:
                type: string
              imageName:
@@ -50,7 +59,12 @@ spec:
                  to remove/update
                type: string
              iso:
+                description: This needs to be revisited
                type: boolean
+              netboot:
+                type: boolean
+              netbootURL:
+                type: string
              osRelease:
                type: string
              pull:
--- a/controllers/deployment.go
+++ b/controllers/deployment.go
@@ -104,7 +104,8 @@ func osReleaseContainer(containerImage string) v1.Container {
 	}
 }

-func (r *OSArtifactReconciler) genDeployment(artifact buildv1alpha1.OSArtifact) *appsv1.Deployment {
+func (r *OSArtifactReconciler) genDeployment(artifact buildv1alpha1.OSArtifact, svc *v1.Service) *appsv1.Deployment {
+	// TODO: svc is unused, but could be used in the future to generate the Netboot URL
 	objMeta := metav1.ObjectMeta{
 		Name:            artifact.Name,
 		Namespace:       artifact.Namespace,
@@ -179,13 +180,41 @@ func (r *OSArtifactReconciler) genDeployment(artifact buildv1alpha1.OSArtifact)
 		SecurityContext: &v1.SecurityContext{Privileged: &privileged},
 		Name:            "build-cloud-image",
 		Image:           r.ToolImage,
-		Command:         []string{"/bin/bash", "-cxe"},
+
+		Command: []string{"/bin/bash", "-cxe"},
 		Args: []string{
 			cloudImgCmd,
 		},
 		VolumeMounts: volumeMounts,
 	}

+	if artifact.Spec.DiskSize != "" {
+		buildCloudImageContainer.Env = []v1.EnvVar{{
+			Name:  "EXTEND",
+			Value: artifact.Spec.DiskSize,
+		}}
+	}
+
+	extractNetboot := v1.Container{
+		ImagePullPolicy: v1.PullAlways,
+		SecurityContext: &v1.SecurityContext{Privileged: &privileged},
+		Name:            "build-netboot",
+		Image:           r.ToolImage,
+		Command:         []string{"/bin/bash", "-cxe"},
+		Env: []v1.EnvVar{{
+			Name:  "URL",
+			Value: artifact.Spec.NetbootURL,
+		}},
+		Args: []string{
+			fmt.Sprintf(
+				"/netboot.sh /public/%s.iso /public/%s",
+				artifact.Name,
+				artifact.Name,
+			),
+		},
+		VolumeMounts: volumeMounts,
+	}
+
 	buildAzureCloudImageContainer := v1.Container{
 		ImagePullPolicy: v1.PullAlways,
 		SecurityContext: &v1.SecurityContext{Privileged: &privileged},
@@ -263,10 +292,14 @@ func (r *OSArtifactReconciler) genDeployment(artifact buildv1alpha1.OSArtifact)

 	}

-	if artifact.Spec.ISO {
+	if artifact.Spec.ISO || artifact.Spec.Netboot {
 		pod.InitContainers = append(pod.InitContainers, buildIsoContainer)
 	}

+	if artifact.Spec.Netboot {
+		pod.InitContainers = append(pod.InitContainers, extractNetboot)
+	}
+
 	if artifact.Spec.CloudImage || artifact.Spec.AzureImage || artifact.Spec.GCEImage {
 		pod.InitContainers = append(pod.InitContainers, buildCloudImageContainer)
 	}
--- a/controllers/osartifact_controller.go
+++ b/controllers/osartifact_controller.go
@@ -118,7 +118,7 @@ func (r *OSArtifactReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 	logger.Info(fmt.Sprintf("Checking deployment %v", osbuild))

-	desiredDeployment := r.genDeployment(osbuild)
+	desiredDeployment := r.genDeployment(osbuild, svc)
 	deployment, err := r.clientSet.AppsV1().Deployments(req.Namespace).Get(ctx, desiredDeployment.Name, v1.GetOptions{})
 	if deployment == nil || apierrors.IsNotFound(err) {
 		logger.Info(fmt.Sprintf("Creating Deployment %v", deployment))
--- a/go.sum
+++ b/go.sum
@@ -189,6 +189,7 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh
 github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
 github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/gobuffalo/flect v0.2.4 h1:BSYA8+T60cdyq+vynaSUjqSVI9mDEg9ZfQUXKmfjo4I=
 github.com/gobuffalo/flect v0.2.4/go.mod h1:1ZyCLIbg0YD7sDkzvFdPoOydPtD8y9JQnrOROolUcM8=
@@ -277,6 +278,7 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
@@ -826,6 +828,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 h1:hI3jKY4Hpf63ns040onEbB3dAkR/H/P83hw1TG8dD3Y=
 golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
--- a/tools-image/Dockerfile
+++ b/tools-image/Dockerfile
@@ -1,4 +1,4 @@
-ARG ELEMENTAL_CLI_VERSION=0.20221020.3
+ARG ELEMENTAL_CLI_VERSION=0.20221107.1
 ARG LEAP_VERSION=15.4
 ARG LUET_VERSION=0.33.0
 FROM quay.io/kairos/packages:elemental-cli-system-$ELEMENTAL_CLI_VERSION AS elemental
@@ -86,6 +86,7 @@ COPY ./arm /arm
 COPY ./gce.sh /gce.sh
 COPY ./raw-images.sh /raw-images.sh
 COPY ./azure.sh /azure.sh
+COPY ./netboot.sh /netboot.sh

 COPY defaults.yaml /defaults.yaml

--- a/tools-image/build-arm-image.sh
+++ b/tools-image/build-arm-image.sh
@@ -100,6 +100,7 @@ usage()
    echo " --local: (optional) Use local repository when building"
    echo " --directory: (optional) A directory which will be used for active/passive/recovery system"
    echo " --model: (optional) The board model"
+    echo " --efi-dir: (optional) A directory with files which will be added to the efi partition"
    exit 1
 }

@@ -174,6 +175,10 @@ while [ "$#" -gt 0 ]; do
            shift 1
            model=$1
            ;;
+        --efi-dir)
+            shift 1
+            efi_dir=$1
+            ;;
        --final-repo)
            shift 1
            final_repo=$1
@@ -267,7 +272,7 @@ ensure_dir_structure $TARGET
 # Download the container image
 if [ -z "$directory" ]; then
  echo ">>> Downloading container image"
-  elemental pull-image $container_image $TARGET
+  elemental pull-image $( (( $local_build == 'true')) && printf %s '--local' ) $container_image $TARGET
 else
  echo ">>> Copying files from $directory"
  rsync -axq --exclude='host' --exclude='mnt' --exclude='proc' --exclude='sys' --exclude='dev' --exclude='tmp' ${directory}/ $TARGET
@@ -313,6 +318,10 @@ if [ -z "$EFI" ]; then
 fi

 cp -rfv /arm/grub/efi/* $EFI
+if [ -n "$EFI" ] && [  -n "$efi_dir" ]; then
+  echo "Copy $efi_dir to EFI directory"
+  cp -rfv $efi_dir/* $EFI
+fi

 echo ">> Writing image and partition table"
 dd if=/dev/zero of="${output_image}" bs=1024000 count="${size}" || exit 1
--- a/tools-image/netboot.sh
+++ b/tools-image/netboot.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+# Extracts squashfs, kernel, initrd and generates a ipxe template script
+
+ISO=$1
+OUTPUT_NAME=$2
+ARTIFACT_NAME=$(basename $OUTPUT_NAME)
+
+isoinfo -x /rootfs.squashfs -R -i $ISO > $OUTPUT_NAME.squashfs
+isoinfo -x /boot/kernel -R -i $ISO > $OUTPUT_NAME-kernel
+isoinfo -x /boot/initrd -R -i $ISO > $OUTPUT_NAME-initrd
+
+URL=${URL:-https://github.com/kairos-io/kairos/releases/download}
+
+cat > $OUTPUT_NAME.ipxe << EOF
+#!ipxe
+set url ${URL}/
+set kernel $ARTIFACT_NAME-kernel
+set initrd $ARTIFACT_NAME-initrd
+set rootfs $ARTIFACT_NAME.squashfs
+# set config https://example.com/machine-config
+# set cmdline extra.values=1
+kernel \${url}/\${kernel} initrd=\${initrd} ip=dhcp rd.cos.disable root=live:\${url}/\${rootfs} netboot nodepair.enable config_url=\${config} console=tty1 console=ttyS0 \${cmdline}
+initrd \${url}/\${initrd}
+boot
+EOF
--- a/tools-image/raw-images.sh
+++ b/tools-image/raw-images.sh
@@ -9,6 +9,7 @@

 : "${OEM_LABEL:=COS_OEM}"
 : "${RECOVERY_LABEL:=COS_RECOVERY}"
+: "${EXTEND:=}"

 DIRECTORY=$1
 OUT=${2:-disk.raw}
@@ -66,6 +67,11 @@ truncate -s $((3*1024*1024)) $OUT
 # Add an extra MB at the end of the disk for the gpt headers, in fact 34 sectors would be enough, but adding some more does not hurt.
 truncate -s "+$((1024*1024))" $OUT

+if [ -n "$EXTEND" ]; then
+  echo "Extending image of $EXTEND MB"
+  truncate -s "+$(($EXTEND*1024*1024))" $OUT
+fi
+
 # Create the partition table in $OUT (assumes sectors of 512 bytes)
 sgdisk -n 1:2048:+2M -c 1:legacy -t 1:EF02 $OUT
 sgdisk -n 2:0:+20M -c 2:UEFI -t 2:EF00 $OUT
Author	SHA1	Message	Date
Ettore Di Giacinto	85adc00f5a	Merge pull request #18 from Ognian/master add --efi-dir option to build-arm-iamge.sh	2022-11-18 11:12:01 +01:00
Ognian	8a9b3e9f71	cp dir content not dir Signed-off-by: Ognian <Ognian@users.noreply.github.com>	2022-11-16 17:24:57 +01:00
Ognian	78ff22e647	add --efi-dir option to build-arm-iamge.sh This option allows modification of raspberry pi boot options. see https://www.raspberrypi.com/documentation/computers/config_txt.html#what-is-config-txt Signed-off-by: Ognian <Ognian@users.noreply.github.com>	2022-11-16 12:23:56 +01:00
Ettore Di Giacinto	4522e14e32	Merge pull request #17 from Ognian/master propagate --local to elemental pull-image in build-arm-image.sh	2022-11-14 18:32:50 +01:00
Ognian	097b4a30db	Merge pull request #1 from Ognian/Ognian-patch-1 propagate --local to elemental pull-image	2022-11-14 18:21:34 +01:00
Ognian	40560a4b02	propagate --local to elemental pull-image fixes https://github.com/kairos-io/kairos/issues/419	2022-11-14 18:19:21 +01:00
Ettore Di Giacinto	4997cf18ee	Fixup duplicated crd def	2022-11-07 22:25:58 +00:00
Ettore Di Giacinto	7ae1f7105a	Add option to build netboot files and disk image size	2022-11-07 22:02:32 +00:00
Ettore Di Giacinto	ebbd1c9a1a	Add netboot script	2022-11-07 21:23:20 +00:00
Ettore Di Giacinto	82847a139d	⬆️ Bump elemental-cli	2022-11-07 21:50:30 +01:00
Ettore Di Giacinto	f5611e684f	⬆️ Bump elemental	2022-11-07 19:27:08 +01:00