rancher/osbuilder
1
0
Fork 0
mirror of https://github.com/kairos-io/osbuilder.git synced 2025-06-25 22:53:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make GRUBConfig and CloudConfig optional fields

Browse Source
This commit is contained in:
Ettore Di Giacinto 2022-10-24 08:21:12 +00:00
parent 2309c0f175
commit ca8065f94b
1 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
controllers/deployment.go
View File

@ -116,6 +116,45 @@ func (r *OSArtifactReconciler) genDeployment(artifact buildv1alpha1.OSArtifact)
privileged := false privileged := false
serviceAccount := false serviceAccount := false
cmd := fmt.Sprintf(
"/entrypoint.sh --debug --name %s build-iso --date=false --output /public dir:/rootfs",
artifact.Name,
)
volumeMounts := []v1.VolumeMount{
{
Name: "public",
MountPath: "/public",
},
{
Name: "rootfs",
MountPath: "/rootfs",
},
}
if artifact.GRUBConfig != "" {
volumeMounts = append(volumeMounts, VolumeMount{
Name: "config",
MountPath: "/iso/iso-overlay/boot/grub2/grub.cfg",
SubPath: "grub.cfg",
})
}
if artifact.CloudConfig != "" {
volumeMounts = append(volumeMounts, VolumeMount{
Name: "config",
MountPath: "/iso/iso-overlay/cloud_config.yaml",
SubPath: "config",
})
}
if artifacts.CloudConfig != "" || artifacts.GRUBConfig != "" {
cmd = fmt.Sprintf(
"/entrypoint.sh --debug --name %s build-iso --date=false --overlay-iso /iso/iso-overlay --output /public dir:/rootfs",
artifact.Name,
)
}
buildIsoContainer := v1.Container{ buildIsoContainer := v1.Container{
ImagePullPolicy: v1.PullAlways, ImagePullPolicy: v1.PullAlways,
SecurityContext: &v1.SecurityContext{Privileged: &privileged}, SecurityContext: &v1.SecurityContext{Privileged: &privileged},
@ -123,31 +162,9 @@ func (r *OSArtifactReconciler) genDeployment(artifact buildv1alpha1.OSArtifact)
Image: r.ToolImage, Image: r.ToolImage,
Command: []string{"/bin/bash", "-cxe"}, Command: []string{"/bin/bash", "-cxe"},
Args: []string{ Args: []string{
fmt.Sprintf( cmd,
"/entrypoint.sh --debug --name %s build-iso --date=false --overlay-iso /iso/iso-overlay --output /public dir:/rootfs",
artifact.Name,
),
},
VolumeMounts: []v1.VolumeMount{
{
Name: "public",
MountPath: "/public",
},
{
Name: "config",
MountPath: "/iso/iso-overlay/cloud_config.yaml",
SubPath: "config",
},
{
Name: "config",
MountPath: "/iso/iso-overlay/boot/grub2/grub.cfg",
SubPath: "grub.cfg",
},
{
Name: "rootfs",
MountPath: "/rootfs",
},
}, },
VolumeMounts: volumeMounts,
} }
servingContainer := v1.Container{ servingContainer := v1.Container{