diff --git a/bundle/image-references b/bundle/image-references index 06e600ef103..f9ea172a564 100644 --- a/bundle/image-references +++ b/bundle/image-references @@ -46,4 +46,4 @@ spec: - name: oadp-hypershift-velero-plugin-rhel9 from: kind: DockerImage - name: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-oadp-1-5:oadp-1.5 + name: quay.io/konveyor/hypershift-oadp-plugin:oadp-1.5 diff --git a/bundle/manifests/oadp-operator.clusterserviceversion.yaml b/bundle/manifests/oadp-operator.clusterserviceversion.yaml index 53d8f59350c..cc19f2a2bcf 100644 --- a/bundle/manifests/oadp-operator.clusterserviceversion.yaml +++ b/bundle/manifests/oadp-operator.clusterserviceversion.yaml @@ -1125,7 +1125,7 @@ spec: - name: RELATED_IMAGE_KUBEVIRT_VELERO_PLUGIN value: quay.io/konveyor/kubevirt-velero-plugin:v0.7.0 - name: RELATED_IMAGE_HYPERSHIFT_VELERO_PLUGIN - value: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-oadp-1-5:oadp-1.5 + value: quay.io/konveyor/hypershift-oadp-plugin:oadp-1.5 - name: RELATED_IMAGE_MUSTGATHER value: quay.io/konveyor/oadp-must-gather:oadp-1.5 - name: RELATED_IMAGE_NON_ADMIN_CONTROLLER @@ -1286,7 +1286,7 @@ spec: name: velero-plugin-for-gcp - image: quay.io/konveyor/kubevirt-velero-plugin:v0.7.0 name: kubevirt-velero-plugin - - image: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-oadp-1-5:oadp-1.5 + - image: quay.io/konveyor/hypershift-oadp-plugin:oadp-1.5 name: hypershift-velero-plugin - image: quay.io/konveyor/oadp-must-gather:oadp-1.5 name: mustgather diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 2d20badaf37..a41e01238f2 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -77,7 +77,7 @@ spec: - name: RELATED_IMAGE_KUBEVIRT_VELERO_PLUGIN value: quay.io/konveyor/kubevirt-velero-plugin:v0.7.0 - name: RELATED_IMAGE_HYPERSHIFT_VELERO_PLUGIN - value: quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-oadp-1-5:oadp-1.5 + value: quay.io/konveyor/hypershift-oadp-plugin:oadp-1.5 - name: RELATED_IMAGE_MUSTGATHER value: quay.io/konveyor/oadp-must-gather:oadp-1.5 - name: RELATED_IMAGE_NON_ADMIN_CONTROLLER diff --git a/pkg/common/common.go b/pkg/common/common.go index 60f92c19075..82172af21af 100644 --- a/pkg/common/common.go +++ b/pkg/common/common.go @@ -74,7 +74,7 @@ const ( GCPPluginImage = "quay.io/konveyor/velero-plugin-for-gcp:latest" RegistryImage = "quay.io/konveyor/registry:latest" KubeVirtPluginImage = "quay.io/konveyor/kubevirt-velero-plugin:v0.7.0" - HypershiftPluginImage = "quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-oadp-1-5:oadp-1.5" + HypershiftPluginImage = "quay.io/konveyor/hypershift-oadp-plugin:oadp-1.5" ) // Plugin names diff --git a/pkg/credentials/credentials_test.go b/pkg/credentials/credentials_test.go index 6ce9b5f51be..bbfedc5ad17 100644 --- a/pkg/credentials/credentials_test.go +++ b/pkg/credentials/credentials_test.go @@ -464,9 +464,9 @@ func TestCredentials_getPluginImage(t *testing.T) { }, }, pluginName: oadpv1alpha1.DefaultPluginHypershift, - wantImage: "quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-oadp-1-5:oadp-1.5", + wantImage: "quay.io/konveyor/hypershift-oadp-plugin:oadp-1.5", setEnvVars: map[string]string{ - "RELATED_IMAGE_HYPERSHIFT_VELERO_PLUGIN": "quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-oadp-1-5:oadp-1.5", + "RELATED_IMAGE_HYPERSHIFT_VELERO_PLUGIN": "quay.io/konveyor/hypershift-oadp-plugin:oadp-1.5", }, }, } diff --git a/tests/e2e/lib/hcp/dpa.go b/tests/e2e/lib/hcp/dpa.go index 668747e1991..3898ab5d309 100644 --- a/tests/e2e/lib/hcp/dpa.go +++ b/tests/e2e/lib/hcp/dpa.go @@ -41,7 +41,7 @@ func (h *HCHandler) AddHCPPluginToDPA(namespace, name string, overrides bool) er if overrides { dpa.Spec.UnsupportedOverrides = map[oadpv1alpha1.UnsupportedImageKey]string{ - oadpv1alpha1.HypershiftPluginImageKey: "quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-oadp-1-5:oadp-1.5", + oadpv1alpha1.HypershiftPluginImageKey: "quay.io/konveyor/hypershift-oadp-plugin:oadp-1.5", } } diff --git a/tests/e2e/lib/hcp/dpa_test.go b/tests/e2e/lib/hcp/dpa_test.go index a7c3fcd3071..08cc8a601ee 100644 --- a/tests/e2e/lib/hcp/dpa_test.go +++ b/tests/e2e/lib/hcp/dpa_test.go @@ -146,7 +146,7 @@ func TestRemoveHCPPluginFromDPA(t *testing.T) { }, }, UnsupportedOverrides: map[oadpv1alpha1.UnsupportedImageKey]string{ - oadpv1alpha1.HypershiftPluginImageKey: "quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-oadp-1-5:oadp-1.5", + oadpv1alpha1.HypershiftPluginImageKey: "quay.io/konveyor/hypershift-oadp-plugin:oadp-1.5", }, }, },