From 7e4846785dc37168af5eeb4ce8102cbe9e003918 Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Tue, 13 Sep 2022 21:55:53 +0000 Subject: [PATCH] Use one image with tools --- controllers/deployment.go | 2 +- controllers/osartifact_controller.go | 6 +++--- main.go | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/controllers/deployment.go b/controllers/deployment.go index a8e5d0c..6b0a632 100644 --- a/controllers/deployment.go +++ b/controllers/deployment.go @@ -120,7 +120,7 @@ func (r *OSArtifactReconciler) genDeployment(artifact buildv1alpha1.OSArtifact) ImagePullPolicy: v1.PullAlways, SecurityContext: &v1.SecurityContext{Privileged: &privileged}, Name: "build-iso", - Image: r.BuildImage, + Image: r.ToolImage, Command: []string{"/bin/bash", "-cxe"}, Args: []string{ fmt.Sprintf( diff --git a/controllers/osartifact_controller.go b/controllers/osartifact_controller.go index 8478b75..acce07b 100644 --- a/controllers/osartifact_controller.go +++ b/controllers/osartifact_controller.go @@ -38,9 +38,9 @@ import ( // OSArtifactReconciler reconciles a OSArtifact object type OSArtifactReconciler struct { client.Client - Scheme *runtime.Scheme - clientSet *kubernetes.Clientset - ServingImage, BuildImage, ToolImage string + Scheme *runtime.Scheme + clientSet *kubernetes.Clientset + ServingImage, ToolImage string } func genOwner(artifact buildv1alpha1.OSArtifact) []metav1.OwnerReference { diff --git a/main.go b/main.go index a422351..65aa094 100644 --- a/main.go +++ b/main.go @@ -52,9 +52,8 @@ func main() { var metricsAddr string var enableLeaderElection bool 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(&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/osbuilder-tools:latest", "Tool image.") @@ -99,7 +98,6 @@ func main() { Client: mgr.GetClient(), ServingImage: serveImage, ToolImage: toolImage, - BuildImage: buildImage, Scheme: mgr.GetScheme(), }).SetupWithManager(mgr); err != nil { setupLog.Error(err, "unable to create controller", "controller", "OSArtifact")