Merge pull request #36 from cynepco3hahue/get_image_repository_from_o…

…perator

Get image repository from the operator if it does not exist

pkg/operator/operator.go

@@ -154,7 +154,7 @@ func (r *ReconcileMachineRemediationOperator) createOrUpdateComponents(mro *mrv1
 	}
 
 	for _, component := range components.Components {
-		glog.Infof("Creating objets for component %q", component)
+		glog.Infof("Creating objects for component %q", component)
 		if err := r.createOrUpdateServiceAccount(component, consts.NamespaceOpenshiftMachineAPI); err != nil {
 			return err
 		}
@@ -175,6 +175,7 @@ func (r *ReconcileMachineRemediationOperator) createOrUpdateComponents(mro *mrv1
 			OperatorVersion: r.operatorVersion,
 			Verbosity:       "4",
 		}
+
 		if err := r.createOrUpdateDeployment(deployData); err != nil {
 			return err
 		}

pkg/operator/resources.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
+	"strings"
 
 	"github.com/ghodss/yaml"
 
@@ -33,6 +34,19 @@ func (r *ReconcileMachineRemediationOperator) getDeployment(name string, namespa
 }
 
 func (r *ReconcileMachineRemediationOperator) createOrUpdateDeployment(data *components.DeploymentData) error {
+	if data.ImageRepository == "" {
+		imageRepository, err := r.getOperatorImageRepository()
+		if err != nil {
+			return err
+		}
+
+		data.ImageRepository = imageRepository
+	}
+
+	if data.PullPolicy == "" {
+		data.PullPolicy = corev1.PullIfNotPresent
+	}
+
 	newDeploy := components.NewDeployment(data)
 	newDeploy.Spec.Replicas = pointer.Int32Ptr(2)
 
@@ -58,6 +72,34 @@ func (r *ReconcileMachineRemediationOperator) createOrUpdateDeployment(data *com
 	return r.client.Update(context.TODO(), newDeploy)
 }
 
+func (r *ReconcileMachineRemediationOperator) getOperatorImageRepository() (string, error) {
+	ns, err := getOperatorNamespace()
+	if err != nil {
+		return "", err
+	}
+
+	operator, err := r.getDeployment(components.ComponentMachineRemediationOperator, ns)
+	if err != nil {
+		return "", err
+	}
+
+	image := strings.Split(operator.Spec.Template.Spec.Containers[0].Image, "/")
+	return strings.Join(image[:len(image)-1], "/"), nil
+}
+
+func getOperatorNamespace() (string, error) {
+	data, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace")
+	if err != nil {
+		return "", fmt.Errorf("failed to get operator namespace: %v", err)
+	}
+
+	if ns := strings.TrimSpace(string(data)); len(ns) > 0 {
+		return ns, nil
+	}
+
+	return "", fmt.Errorf("failed to get operator namespace: %v", err)
+}
+
 func (r *ReconcileMachineRemediationOperator) deleteDeployment(name string, namespace string) error {
 	deploy, err := r.getDeployment(name, namespace)
 	if errors.IsNotFound(err) {