rancher/osbuilder
1
0
Fork 0
mirror of https://github.com/kairos-io/osbuilder.git synced 2025-09-11 12:16:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use one image with tools

Browse Source
This commit is contained in:
Ettore Di Giacinto
2022-09-13 21:55:53 +00:00
parent cb21b7742b
commit 7e4846785d
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/deployment.go
View File

@@ -120,7 +120,7 @@ func (r *OSArtifactReconciler) genDeployment(artifact buildv1alpha1.OSArtifact)
ImagePullPolicy: v1.PullAlways, ImagePullPolicy: v1.PullAlways,
SecurityContext: &v1.SecurityContext{Privileged: &privileged}, SecurityContext: &v1.SecurityContext{Privileged: &privileged},
Name: "build-iso", Name: "build-iso",
Image: r.BuildImage, Image: r.ToolImage,
Command: []string{"/bin/bash", "-cxe"}, Command: []string{"/bin/bash", "-cxe"},
Args: []string{ Args: []string{
fmt.Sprintf( fmt.Sprintf(

6
controllers/osartifact_controller.go
View File

@@ -38,9 +38,9 @@ import (
// OSArtifactReconciler reconciles a OSArtifact object // OSArtifactReconciler reconciles a OSArtifact object
type OSArtifactReconciler struct { type OSArtifactReconciler struct {
client.Client client.Client
Scheme *runtime.Scheme Scheme *runtime.Scheme
clientSet *kubernetes.Clientset clientSet *kubernetes.Clientset
ServingImage, BuildImage, ToolImage string ServingImage, ToolImage string
} }
func genOwner(artifact buildv1alpha1.OSArtifact) []metav1.OwnerReference { func genOwner(artifact buildv1alpha1.OSArtifact) []metav1.OwnerReference {

4
main.go
View File

@@ -52,9 +52,8 @@ func main() {
var metricsAddr string var metricsAddr string
var enableLeaderElection bool var enableLeaderElection bool
var probeAddr string var probeAddr string
var buildImage, serveImage, toolImage string var serveImage, toolImage string
flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.") flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
flag.StringVar(&buildImage, "build-image", "quay.io/costoolkit/elemental-cli:v0.0.15-ae4f000", "Build image.")
flag.StringVar(&serveImage, "serve-image", "nginx", "Serve image.") flag.StringVar(&serveImage, "serve-image", "nginx", "Serve image.")
// It needs luet inside // It needs luet inside
flag.StringVar(&toolImage, "tool-image", "quay.io/c3os/osbuilder-tools:latest", "Tool image.") flag.StringVar(&toolImage, "tool-image", "quay.io/c3os/osbuilder-tools:latest", "Tool image.")
@@ -99,7 +98,6 @@ func main() {
Client: mgr.GetClient(), Client: mgr.GetClient(),
ServingImage: serveImage, ServingImage: serveImage,
ToolImage: toolImage, ToolImage: toolImage,
BuildImage: buildImage,
Scheme: mgr.GetScheme(), Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr); err != nil { }).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "OSArtifact") setupLog.Error(err, "unable to create controller", "controller", "OSArtifact")