Custom image name in the CSV generator

Let the user specify a custom image name for the operator running the CSV generator. Fixes: https://bugzilla.redhat.com/1757798 Signed-off-by: Simone Tiraboschi <[email protected]>
RamLavi · Oct 2, 2019 · e7e880d · e7e880d
1 parent 7b55bbe
commit e7e880d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/components/components.go b/pkg/components/components.go
@@ -63,8 +63,8 @@ func (ai *AddonsImages) FillDefaults() *AddonsImages {
 	return ai
 }
 
-func GetDeployment(version string, operatorVersion string, namespace string, repository string, tag string, imagePullPolicy string, addonsImages *AddonsImages) *appsv1.Deployment {
-	image := fmt.Sprintf("%s/%s:%s", repository, Name, tag)
+func GetDeployment(version string, operatorVersion string, namespace string, repository string, imageName string, tag string, imagePullPolicy string, addonsImages *AddonsImages) *appsv1.Deployment {
+	image := fmt.Sprintf("%s/%s:%s", repository, imageName, tag)
 	deployment := &appsv1.Deployment{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "apps/v1",

diff --git a/tools/manifest-templator/manifest-templator.go b/tools/manifest-templator/manifest-templator.go
@@ -55,6 +55,7 @@ type templateData struct {
 	OperatorVersion string
 	Namespace       string
 	ContainerPrefix string
+	ImageName	string
 	ContainerTag    string
 	ImagePullPolicy string
 	CNA             *operatorData
@@ -142,6 +143,7 @@ func getCNA(data *templateData) {
 		data.OperatorVersion,
 		data.Namespace,
 		data.ContainerPrefix,
+		data.ImageName,
 		data.ContainerTag,
 		data.ImagePullPolicy,
 		data.AddonsImages,
@@ -218,6 +220,7 @@ func main() {
 	operatorVersion := flag.String("operator-version", "", "The operator version")
 	namespace := flag.String("namespace", components.Namespace, "Namespace used by csv")
 	containerPrefix := flag.String("container-prefix", "quay.io/kubevirt", "The container repository used for the operator image")
+	imageName := flag.String("image-name", components.Name, "The operator image's name")
 	containerTag := flag.String("container-tag", "latest", "The operator image's container tag")
 	imagePullPolicy := flag.String("image-pull-policy", "Always", "The pull policy to use on the operator image")
 	multusImage := flag.String("multus-image", components.MultusImageDefault, "The multus image managed by CNA")
@@ -239,6 +242,7 @@ func main() {
 		OperatorVersion: *operatorVersion,
 		Namespace:       *namespace,
 		ContainerPrefix: *containerPrefix,
+		ImageName:	 *imageName,
 		ContainerTag:    *containerTag,
 		ImagePullPolicy: *imagePullPolicy,
 		AddonsImages: (&components.AddonsImages{