OADP-698, OADP-296 Get data mover image from manager env, migrate to RELATED_IMAGE_ (#786)

kaovilai · web-flow · commit 4ea48910d9f1 · 2022-08-10T19:08:16.000-04:00
* `make bundle`

* go changes

* UPPERCASE

* _
diff --git a/build/Dockerfile.bundle b/build/Dockerfile.bundle
@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=oadp-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=stable
 LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.14.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.21.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 
diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=oadp-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=stable
 LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.14.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.21.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 
diff --git a/bundle/manifests/oadp-operator.clusterserviceversion.yaml b/bundle/manifests/oadp-operator.clusterserviceversion.yaml
@@ -169,7 +169,7 @@ metadata:
     operatorframework.io/suggested-namespace: openshift-adp
     operators.openshift.io/infrastructure-features: '["Disconnected"]'
     operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]'
-    operators.operatorframework.io/builder: operator-sdk-v1.14.0
+    operators.operatorframework.io/builder: operator-sdk-v1.21.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/openshift/oadp-operator
     support: Red Hat
@@ -726,42 +726,24 @@ spec:
                         valueFrom:
                           fieldRef:
                             fieldPath: metadata.annotations['olm.targetNamespaces']
-                      - name: REGISTRY
-                        value: quay.io
-                      - name: PROJECT
-                        value: konveyor
-                      - name: VELERO_REPO
-                        value: velero
-                      - name: VELERO_OPENSHIFT_PLUGIN_REPO
-                        value: openshift-velero-plugin
-                      - name: VELERO_OPENSHIFT_PLUGIN_TAG
-                        value: latest
-                      - name: VELERO_RESTIC_RESTORE_HELPER_REPO
-                        value: velero-restic-restore-helper
-                      - name: VELERO_AWS_PLUGIN_REPO
-                        value: velero-plugin-for-aws
-                      - name: VELERO_GCP_PLUGIN_REPO
-                        value: velero-plugin-for-gcp
-                      - name: VELERO_AZURE_PLUGIN_REPO
-                        value: velero-plugin-for-microsoft-azure
-                      - name: VELERO_KUBEVIRT_PLUGIN_REPO
-                        value: kubevirt-velero-plugin
-                      - name: VELERO_CSI_PLUGIN_REPO
-                        value: velero-plugin-for-csi
-                      - name: VELERO_TAG
-                        value: konveyor-1.9
-                      - name: VELERO_RESTIC_RESTORE_HELPER_TAG
-                        value: konveyor-1.9
-                      - name: VELERO_AWS_PLUGIN_TAG
-                        value: konveyor-1.5
-                      - name: VELERO_GCP_PLUGIN_TAG
-                        value: konveyor-1.5
-                      - name: VELERO_AZURE_PLUGIN_TAG
-                        value: konveyor-1.5
-                      - name: VELERO_CSI_PLUGIN_TAG
-                        value: konveyor-0.3
-                      - name: VELERO_KUBEVIRT_PLUGIN_TAG
-                        value: v0.2.0
+                      - name: RELATED_IMAGE_VELERO
+                        value: quay.io/konveyor/velero:konveyor-1.9
+                      - name: RELATED_IMAGE_VELERO_RESTIC_RESTORE_HELPER
+                        value: quay.io/konveyor/velero-restic-restore-helper:konveyor-1.9
+                      - name: RELATED_IMAGE_OPENSHIFT_VELERO_PLUGIN
+                        value: quay.io/konveyor/openshift-velero-plugin:latest
+                      - name: RELATED_IMAGE_VELERO_PLUGIN_FOR_AWS
+                        value: quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5
+                      - name: RELATED_IMAGE_VELERO_PLUGIN_FOR_MICROSOFT_AZURE
+                        value: quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5
+                      - name: RELATED_IMAGE_VELERO_PLUGIN_FOR_GCP
+                        value: quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5
+                      - name: RELATED_IMAGE_VELERO_PLUGIN_FOR_CSI
+                        value: quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3
+                      - name: RELATED_IMAGE_VOLUME_SNAPSHOT_MOVER
+                        value: quay.io/konveyor/volume-snapshot-mover:latest
+                      - name: RELATED_IMAGE_KUBEVIRT_VELERO_PLUGIN
+                        value: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
                     image: quay.io/konveyor/oadp-operator:latest
                     imagePullPolicy: Always
                     livenessProbe:
@@ -871,19 +853,19 @@ spec:
     - image: quay.io/konveyor/velero:konveyor-1.9
       name: velero
     - image: quay.io/konveyor/velero-restic-restore-helper:konveyor-1.9
-      name: velero_restic_restore_helper
+      name: velero-restic-restore-helper
     - image: quay.io/konveyor/openshift-velero-plugin:latest
-      name: openshift_plugin
+      name: openshift-velero-plugin
     - image: quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5
-      name: aws_plugin
+      name: velero-plugin-for-aws
     - image: quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5
-      name: azure_plugin
+      name: velero-plugin-for-microsoft-azure
     - image: quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5
-      name: gcp_plugin
+      name: velero-plugin-for-gcp
     - image: quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3
-      name: csi_plugin
-    - image: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
-      name: kubevirt_plugin
+      name: velero-plugin-for-csi
     - image: quay.io/konveyor/volume-snapshot-mover:latest
-      name: volume_snapshot_mover
+      name: volume-snapshot-mover
+    - image: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
+      name: kubevirt-velero-plugin
   version: 99.0.0
diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -6,7 +6,7 @@ annotations:
   operators.operatorframework.io.bundle.package.v1: oadp-operator
   operators.operatorframework.io.bundle.channels.v1: stable
   operators.operatorframework.io.bundle.channel.default.v1: stable
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.14.0
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.21.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
 
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -37,42 +37,24 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
-          - name: REGISTRY
-            value: quay.io
-          - name: PROJECT
-            value: konveyor
-          - name: VELERO_REPO
-            value: velero
-          - name: VELERO_OPENSHIFT_PLUGIN_REPO
-            value: openshift-velero-plugin
-          - name: VELERO_OPENSHIFT_PLUGIN_TAG
-            value: latest
-          - name: VELERO_RESTIC_RESTORE_HELPER_REPO
-            value: velero-restic-restore-helper
-          - name: VELERO_AWS_PLUGIN_REPO
-            value: velero-plugin-for-aws
-          - name: VELERO_GCP_PLUGIN_REPO
-            value: velero-plugin-for-gcp
-          - name: VELERO_AZURE_PLUGIN_REPO
-            value: velero-plugin-for-microsoft-azure
-          - name: VELERO_KUBEVIRT_PLUGIN_REPO
-            value: kubevirt-velero-plugin
-          - name: VELERO_CSI_PLUGIN_REPO
-            value: velero-plugin-for-csi
-          - name: VELERO_TAG
-            value: konveyor-1.9
-          - name: VELERO_RESTIC_RESTORE_HELPER_TAG
-            value: konveyor-1.9
-          - name: VELERO_AWS_PLUGIN_TAG
-            value: konveyor-1.5
-          - name: VELERO_GCP_PLUGIN_TAG
-            value: konveyor-1.5
-          - name: VELERO_AZURE_PLUGIN_TAG
-            value: konveyor-1.5
-          - name: VELERO_CSI_PLUGIN_TAG
-            value: konveyor-0.3
-          - name: VELERO_KUBEVIRT_PLUGIN_TAG
-            value: v0.2.0
+          - name: RELATED_IMAGE_VELERO
+            value: quay.io/konveyor/velero:konveyor-1.9
+          - name: RELATED_IMAGE_VELERO_RESTIC_RESTORE_HELPER
+            value: quay.io/konveyor/velero-restic-restore-helper:konveyor-1.9
+          - name: RELATED_IMAGE_OPENSHIFT_VELERO_PLUGIN
+            value: quay.io/konveyor/openshift-velero-plugin:latest
+          - name: RELATED_IMAGE_VELERO_PLUGIN_FOR_AWS
+            value: quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5
+          - name: RELATED_IMAGE_VELERO_PLUGIN_FOR_MICROSOFT_AZURE
+            value: quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5
+          - name: RELATED_IMAGE_VELERO_PLUGIN_FOR_GCP
+            value: quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5
+          - name: RELATED_IMAGE_VELERO_PLUGIN_FOR_CSI
+            value: quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3
+          - name: RELATED_IMAGE_VOLUME_SNAPSHOT_MOVER
+            value: quay.io/konveyor/volume-snapshot-mover:latest
+          - name: RELATED_IMAGE_KUBEVIRT_VELERO_PLUGIN
+            value: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
         args:
         - --leader-elect
         image: controller:latest
diff --git a/config/manifests/bases/oadp-operator.clusterserviceversion.yaml b/config/manifests/bases/oadp-operator.clusterserviceversion.yaml
@@ -340,21 +340,4 @@ spec:
   maturity: stable
   provider:
     name: Red Hat
-  relatedImages:
-  - image: quay.io/konveyor/velero:konveyor-1.9
-    name: velero
-  - image: quay.io/konveyor/velero-restic-restore-helper:konveyor-1.9
-    name: velero_restic_restore_helper
-  - image: quay.io/konveyor/openshift-velero-plugin:latest
-    name: openshift_plugin
-  - image: quay.io/konveyor/velero-plugin-for-aws:konveyor-1.5
-    name: aws_plugin
-  - image: quay.io/konveyor/velero-plugin-for-microsoft-azure:konveyor-1.5
-    name: azure_plugin
-  - image: quay.io/konveyor/velero-plugin-for-gcp:konveyor-1.5
-    name: gcp_plugin
-  - image: quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3
-    name: csi_plugin
-  - image: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
-    name: kubevirt_plugin
   version: 99.0.0
diff --git a/controllers/datamover.go b/controllers/datamover.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/go-logr/logr"
@@ -196,7 +197,10 @@ func (r *DPAReconciler) getDataMoverImage(dpa *oadpv1alpha1.DataProtectionApplic
 	if dpa.Spec.UnsupportedOverrides[oadpv1alpha1.DataMoverImageKey] != "" {
 		return dpa.Spec.UnsupportedOverrides[oadpv1alpha1.DataMoverImageKey]
 	}
-	return common.DataMoverImage
+	if os.Getenv("RELATED_IMAGE_VOLUME_SNAPSHOT_MOVER") == "" {
+		return common.DataMoverImage
+	}
+	return os.Getenv("RELATED_IMAGE_VOLUME_SNAPSHOT_MOVER")
 }
 
 func (r *DPAReconciler) getDataMoverLabels() map[string]string {
diff --git a/controllers/restic.go b/controllers/restic.go
@@ -334,7 +334,7 @@ func (r *DPAReconciler) updateResticRestoreHelperCM(resticRestoreHelperCM *corev
 	}
 
 	resticRestoreHelperCM.Data = map[string]string{
-		"image": fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_RESTIC_RESTORE_HELPER_REPO"), os.Getenv("VELERO_RESTIC_RESTORE_HELPER_TAG")),
+		"image": os.Getenv("RELATED_IMAGE_VELERO_RESTIC_RESTORE_HELPER"),
 	}
 
 	return nil
diff --git a/controllers/restic_test.go b/controllers/restic_test.go
@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"reflect"
 	"testing"
@@ -2154,7 +2153,7 @@ func TestDPAReconciler_updateResticRestoreHelperCM(t *testing.T) {
 					},
 				},
 				Data: map[string]string{
-					"image": fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_RESTIC_RESTORE_HELPER_REPO"), os.Getenv("VELERO_RESTIC_RESTORE_HELPER_TAG")),
+					"image": os.Getenv("RELATED_IMAGE_VELERO_RESTIC_RESTORE_HELPER"),
 				},
 			},
 		},
diff --git a/controllers/velero.go b/controllers/velero.go
@@ -636,10 +636,10 @@ func getVeleroImage(dpa *oadpv1alpha1.DataProtectionApplication) string {
 	if dpa.Spec.UnsupportedOverrides[oadpv1alpha1.VeleroImageKey] != "" {
 		return dpa.Spec.UnsupportedOverrides[oadpv1alpha1.VeleroImageKey]
 	}
-	if os.Getenv("VELERO_REPO") == "" {
+	if os.Getenv("RELATED_IMAGE_VELERO") == "" {
 		return common.VeleroImage
 	}
-	return fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_REPO"), os.Getenv("VELERO_TAG"))
+	return os.Getenv("RELATED_IMAGE_VELERO")
 }
 
 func (r *DPAReconciler) getDpaAppLabels(dpa *oadpv1alpha1.DataProtectionApplication) map[string]string {
diff --git a/pkg/credentials/credentials.go b/pkg/credentials/credentials.go
@@ -2,7 +2,6 @@ package credentials
 
 import (
 	"errors"
-	"fmt"
 	"os"
 	"strings"
 
@@ -94,60 +93,60 @@ func getAWSPluginImage(dpa *oadpv1alpha1.DataProtectionApplication) string {
 	if dpa.Spec.UnsupportedOverrides[oadpv1alpha1.AWSPluginImageKey] != "" {
 		return dpa.Spec.UnsupportedOverrides[oadpv1alpha1.AWSPluginImageKey]
 	}
-	if os.Getenv("VELERO_AWS_PLUGIN_REPO") == "" {
+	if os.Getenv("RELATED_IMAGE_VELERO_PLUGIN_FOR_AWS") == "" {
 		return common.AWSPluginImage
 	}
-	return fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_AWS_PLUGIN_REPO"), os.Getenv("VELERO_AWS_PLUGIN_TAG"))
+	return os.Getenv("RELATED_IMAGE_VELERO_PLUGIN_FOR_AWS")
 }
 
 func getCSIPluginImage(dpa *oadpv1alpha1.DataProtectionApplication) string {
 	if dpa.Spec.UnsupportedOverrides[oadpv1alpha1.CSIPluginImageKey] != "" {
 		return dpa.Spec.UnsupportedOverrides[oadpv1alpha1.CSIPluginImageKey]
 	}
-	if os.Getenv("VELERO_CSI_PLUGIN_REPO") == "" {
+	if os.Getenv("RELATED_IMAGE_VELERO_PLUGIN_FOR_CSI") == "" {
 		return common.CSIPluginImage
 	}
-	return fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_CSI_PLUGIN_REPO"), os.Getenv("VELERO_CSI_PLUGIN_TAG"))
+	return os.Getenv("RELATED_IMAGE_VELERO_PLUGIN_FOR_CSI")
 }
 
 func getGCPPluginImage(dpa *oadpv1alpha1.DataProtectionApplication) string {
 	if dpa.Spec.UnsupportedOverrides[oadpv1alpha1.GCPPluginImageKey] != "" {
 		return dpa.Spec.UnsupportedOverrides[oadpv1alpha1.GCPPluginImageKey]
 	}
-	if os.Getenv("VELERO_GCP_PLUGIN_REPO") == "" {
+	if os.Getenv("RELATED_IMAGE_VELERO_PLUGIN_FOR_GCP") == "" {
 		return common.GCPPluginImage
 	}
-	return fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_GCP_PLUGIN_REPO"), os.Getenv("VELERO_GCP_PLUGIN_TAG"))
+	return os.Getenv("RELATED_IMAGE_VELERO_PLUGIN_FOR_GCP")
 }
 
 func getOpenshiftPluginImage(dpa *oadpv1alpha1.DataProtectionApplication) string {
 	if dpa.Spec.UnsupportedOverrides[oadpv1alpha1.OpenShiftPluginImageKey] != "" {
 		return dpa.Spec.UnsupportedOverrides[oadpv1alpha1.OpenShiftPluginImageKey]
 	}
-	if os.Getenv("VELERO_OPENSHIFT_PLUGIN_REPO") == "" {
+	if os.Getenv("RELATED_IMAGE_OPENSHIFT_VELERO_PLUGIN") == "" {
 		return common.OpenshiftPluginImage
 	}
-	return fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_OPENSHIFT_PLUGIN_REPO"), os.Getenv("VELERO_OPENSHIFT_PLUGIN_TAG"))
+	return os.Getenv("RELATED_IMAGE_OPENSHIFT_VELERO_PLUGIN")
 }
 
 func getAzurePluginImage(dpa *oadpv1alpha1.DataProtectionApplication) string {
 	if dpa.Spec.UnsupportedOverrides[oadpv1alpha1.AzurePluginImageKey] != "" {
 		return dpa.Spec.UnsupportedOverrides[oadpv1alpha1.AzurePluginImageKey]
 	}
-	if os.Getenv("VELERO_AZURE_PLUGIN_REPO") == "" {
+	if os.Getenv("RELATED_IMAGE_VELERO_PLUGIN_FOR_MICROSOFT_AZURE") == "" {
 		return common.AzurePluginImage
 	}
-	return fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_AZURE_PLUGIN_REPO"), os.Getenv("VELERO_AZURE_PLUGIN_TAG"))
+	return os.Getenv("RELATED_IMAGE_VELERO_PLUGIN_FOR_MICROSOFT_AZURE")
 }
 
 func getKubeVirtPluginImage(dpa *oadpv1alpha1.DataProtectionApplication) string {
 	if dpa.Spec.UnsupportedOverrides[oadpv1alpha1.KubeVirtPluginImageKey] != "" {
 		return dpa.Spec.UnsupportedOverrides[oadpv1alpha1.KubeVirtPluginImageKey]
 	}
-	if os.Getenv("VELERO_KUBEVIRT_PLUGIN_REPO") == "" {
+	if os.Getenv("RELATED_IMAGE_KUBEVIRT_VELERO_PLUGIN") == "" {
 		return common.KubeVirtPluginImage
 	}
-	return fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_KUBEVIRT_PLUGIN_REPO"), os.Getenv("VELERO_KUBEVIRT_PLUGIN_TAG"))
+	return os.Getenv("RELATED_IMAGE_KUBEVIRT_VELERO_PLUGIN")
 }
 
 func getPluginImage(pluginName string, dpa *oadpv1alpha1.DataProtectionApplication) string {
diff --git a/pkg/credentials/credentials_test.go b/pkg/credentials/credentials_test.go
@@ -422,10 +422,7 @@ func TestCredentials_getPluginImage(t *testing.T) {
 			pluginName: common.KubeVirtPlugin,
 			wantImage:  "quay.io/kubevirt/kubevirt-velero-plugin:latest",
 			setEnvVars: map[string]string{
-				"REGISTRY":                    "quay.io",
-				"PROJECT":                     "kubevirt",
-				"VELERO_KUBEVIRT_PLUGIN_REPO": "kubevirt-velero-plugin",
-				"VELERO_KUBEVIRT_PLUGIN_TAG":  "latest",
+				"RELATED_IMAGE_KUBEVIRT_VELERO_PLUGIN": "quay.io/kubevirt/kubevirt-velero-plugin:latest",
 			},
 		},
 	}
diff --git a/tests/e2e/lib/velero_helpers.go b/tests/e2e/lib/velero_helpers.go
@@ -123,7 +123,6 @@ func BackupLogs(ocClient client.Client, backup velero.Backup) (backupLogs string
 	defer func() {
 		if r := recover(); r != nil {
 			backupLogs = recoverFromPanicLogs(backup.Namespace, r, "BackupLogs")
-			
 		}
 	}()
 	downloadrequest.Stream(context.Background(), ocClient, backup.Namespace, backup.Name, velero.DownloadTargetKindBackupLog, logs, time.Minute, insecureSkipTLSVerify, caCertFile)

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ func (r DPAReconciler) updateResticRestoreHelperCM(resticRestoreHelperCM corev`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`resticRestoreHelperCM.Data = map[string]string{`
`337`		`- "image": fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_RESTIC_RESTORE_HELPER_REPO"), os.Getenv("VELERO_RESTIC_RESTORE_HELPER_TAG")),`
	`337`	`+ "image": os.Getenv("RELATED_IMAGE_VELERO_RESTIC_RESTORE_HELPER"),`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -636,10 +636,10 @@ func getVeleroImage(dpa *oadpv1alpha1.DataProtectionApplication) string {`
`636`	`636`	`if dpa.Spec.UnsupportedOverrides[oadpv1alpha1.VeleroImageKey] != "" {`
`637`	`637`	`return dpa.Spec.UnsupportedOverrides[oadpv1alpha1.VeleroImageKey]`
`638`	`638`	`}`
`639`		`- if os.Getenv("VELERO_REPO") == "" {`
	`639`	`+ if os.Getenv("RELATED_IMAGE_VELERO") == "" {`
`640`	`640`	`return common.VeleroImage`
`641`	`641`	`}`
`642`		`- return fmt.Sprintf("%v/%v/%v:%v", os.Getenv("REGISTRY"), os.Getenv("PROJECT"), os.Getenv("VELERO_REPO"), os.Getenv("VELERO_TAG"))`
	`642`	`+ return os.Getenv("RELATED_IMAGE_VELERO")`
`643`	`643`	`}`
`644`	`644`
`645`	`645`	`func (r DPAReconciler) getDpaAppLabels(dpa oadpv1alpha1.DataProtectionApplication) map[string]string {`