Use default jc image as a flag default value

Author: sashayakovtseva

cmd/operator/main.go

@@ -39,6 +39,8 @@ var (
 	metricsPort int32 = 8383
 )
 
+const defaultJobCompanionImage = "cloud.sylabs.io/library/slurm/job-companion:latest"
+
 func printVersion() {
 	glog.Infof("Go Version: %s", runtime.Version())
 	glog.Infof("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH)
@@ -50,7 +52,7 @@ func main() {
 	_ = flag.Set("logtostderr", "true")
 	jcUID := flag.Int64("jc-uid", 1000, "uid to be used for running job-companion containers")
 	jcGID := flag.Int64("jc-gid", 1000, "gid to be used for running job-companion containers")
-	jcImage := flag.String("jc-image", "", "custom job companion image to use")
+	jcImage := flag.String("jc-image", defaultJobCompanionImage, "custom job companion image to use")
 	flag.Parse()
 	defer glog.Flush()
 
@@ -91,11 +93,7 @@ func main() {
 		glog.Fatalf("Failed to add manager to apis scheme: %v", err)
 	}
 
-	var opts []slurmjob.Opt
-	if *jcImage != "" {
-		opts = append(opts, slurmjob.WithCustomJobCompanionImage(*jcImage))
-	}
-	sj := slurmjob.NewReconciler(mgr, *jcUID, *jcGID, opts...)
+	sj := slurmjob.NewReconciler(mgr, *jcImage, *jcUID, *jcGID)
 	if err := sj.AddToManager(mgr); err != nil {
 		glog.Fatalf("Failed to add controller to manager: %v", err)
 	}

pkg/operator/controller/slurmjob/slurmjob_controller.go

@@ -35,10 +35,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/source"
 )
 
-const (
-	defaultJobCompanionImage = "cloud.sylabs.io/library/slurm/job-companion:latest"
-)
-
 // Reconciler reconciles a SlurmJob object
 type Reconciler struct {
 	// This client, initialized using mgr.Client() above, is a split client
@@ -51,30 +47,18 @@ type Reconciler struct {
 	jcGID int64
 }
 
-type Opt func(*Reconciler)
-
 // NewReconciler returns a new SlurmJob controller.
-func NewReconciler(mgr manager.Manager, jcUID, jcGID int64, opts ...Opt) *Reconciler {
+func NewReconciler(mgr manager.Manager, jcImage string, jcUID, jcGID int64) *Reconciler {
 	r := &Reconciler{
 		client:  mgr.GetClient(),
 		scheme:  mgr.GetScheme(),
 		jcUID:   jcUID,
 		jcGID:   jcGID,
-		jcImage: defaultJobCompanionImage,
-	}
-	for _, o := range opts {
-		o(r)
+		jcImage: jcImage,
 	}
 	return r
 }
 
-// WithCustomJobCompanionImage sets job-companion image that should be used.
-func WithCustomJobCompanionImage(image string) Opt {
-	return func(r *Reconciler) {
-		r.jcImage = image
-	}
-}
-
 // AddToManager adds SlurmJob Reconciler to the given Manager.
 // The Manager will set fields on the Reconciler and Start it when the Manager is Started.
 func (r *Reconciler) AddToManager(mgr manager.Manager) error {