From 287ed276eb578eebe95541691ccec818b7fb63cb Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Tue, 13 Sep 2022 20:49:18 +0000 Subject: [PATCH] Use tools image in the controller --- controllers/deployment.go | 2 +- controllers/osartifact_controller.go | 1 + main.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/deployment.go b/controllers/deployment.go index 409fb1a..a8e5d0c 100644 --- a/controllers/deployment.go +++ b/controllers/deployment.go @@ -124,7 +124,7 @@ func (r *OSArtifactReconciler) genDeployment(artifact buildv1alpha1.OSArtifact) Command: []string{"/bin/bash", "-cxe"}, Args: []string{ fmt.Sprintf( - "elemental --debug --name %s build-iso --date=false --overlay-iso /iso/iso-overlay --output /public dir:/rootfs", + "/entrypoint.sh --debug --name %s build-iso --date=false --overlay-iso /iso/iso-overlay --output /public dir:/rootfs", artifact.Name, ), }, diff --git a/controllers/osartifact_controller.go b/controllers/osartifact_controller.go index 09f4449..8478b75 100644 --- a/controllers/osartifact_controller.go +++ b/controllers/osartifact_controller.go @@ -110,6 +110,7 @@ func (r *OSArtifactReconciler) Reconcile(ctx context.Context, req ctrl.Request) logger.Error(err, "Failed while creating svc") return ctrl.Result{}, err } + return ctrl.Result{Requeue: true}, err } if err != nil { diff --git a/main.go b/main.go index 0a1736c..a422351 100644 --- a/main.go +++ b/main.go @@ -57,7 +57,7 @@ func main() { flag.StringVar(&buildImage, "build-image", "quay.io/costoolkit/elemental-cli:v0.0.15-ae4f000", "Build image.") flag.StringVar(&serveImage, "serve-image", "nginx", "Serve image.") // It needs luet inside - flag.StringVar(&toolImage, "tool-image", "quay.io/c3os/core-alpine:v0.57.0", "Tool image.") + flag.StringVar(&toolImage, "tool-image", "quay.io/c3os/osbuilder-tools:latest", "Tool image.") flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.") flag.BoolVar(&enableLeaderElection, "leader-elect", false,