Skip to content

oadp-1.4: feat: add support for Hypershift plugin in OADP 1.4 #1915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
Aug 22, 2025
Merged

oadp-1.4: feat: add support for Hypershift plugin in OADP 1.4 #1915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfad651
feat: add support for Hypershift plugin in OADP 1.4
kaovilai Aug 19, 2025
7778497
Be happy CI. I ran `make bundle` after first running `git submodule u…
kaovilai Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion api/v1alpha1/oadp_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const ReconcileCompleteMessage = "Reconcile complete"
const OadpOperatorLabel = "openshift.io/oadp"
const RegistryDeploymentLabel = "openshift.io/oadp-registry"

// +kubebuilder:validation:Enum=aws;legacy-aws;gcp;azure;csi;vsm;openshift;kubevirt
// +kubebuilder:validation:Enum=aws;legacy-aws;gcp;azure;csi;vsm;openshift;kubevirt;hypershift
type DefaultPlugin string

const DefaultPluginAWS DefaultPlugin = "aws"
Expand All @@ -46,6 +46,7 @@ const DefaultPluginCSI DefaultPlugin = "csi"
const DefaultPluginVSM DefaultPlugin = "vsm"
const DefaultPluginOpenShift DefaultPlugin = "openshift"
const DefaultPluginKubeVirt DefaultPlugin = "kubevirt"
const DefaultPluginHypershift DefaultPlugin = "hypershift"

type CustomPlugin struct {
Name string `json:"name"`
Expand All @@ -63,6 +64,7 @@ const AzurePluginImageKey UnsupportedImageKey = "azurePluginImageFqin"
const GCPPluginImageKey UnsupportedImageKey = "gcpPluginImageFqin"
const ResticRestoreImageKey UnsupportedImageKey = "resticRestoreImageFqin"
const KubeVirtPluginImageKey UnsupportedImageKey = "kubevirtPluginImageFqin"
const HypershiftPluginImageKey UnsupportedImageKey = "hypershiftPluginImageFqin"
const OperatorTypeKey UnsupportedImageKey = "operator-type"

const OperatorTypeMTC = "mtc"
Expand Down Expand Up @@ -353,6 +355,7 @@ type DataProtectionApplicationSpec struct {
// - gcpPluginImageFqin
// - resticRestoreImageFqin
// - kubevirtPluginImageFqin
// - hypershiftPluginImageFqin
// - operator-type
// +optional
UnsupportedOverrides map[UnsupportedImageKey]string `json:"unsupportedOverrides,omitempty"`
Expand Down
4 changes: 4 additions & 0 deletions bundle/manifests/oadp-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,8 @@ spec:
value: quay.io/konveyor/velero-plugin-for-gcp:oadp-1.4
- 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-4
- name: RELATED_IMAGE_MUSTGATHER
value: registry.redhat.io/oadp/oadp-mustgather-rhel8:v1.2
image: quay.io/konveyor/oadp-operator:oadp-1.4
Expand Down Expand Up @@ -1017,6 +1019,8 @@ 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-4
name: hypershift-velero-plugin
- image: registry.redhat.io/oadp/oadp-mustgather-rhel8:v1.2
name: mustgather
version: 1.4.0
2 changes: 2 additions & 0 deletions bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ spec:
- vsm
- openshift
- kubevirt
- hypershift
type: string
type: array
defaultSnapshotMoveData:
Expand Down Expand Up @@ -1317,6 +1318,7 @@ spec:
- gcpPluginImageFqin
- resticRestoreImageFqin
- kubevirtPluginImageFqin
- hypershiftPluginImageFqin
- operator-type
type: object
required:
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ spec:
- vsm
- openshift
- kubevirt
- hypershift
type: string
type: array
defaultSnapshotMoveData:
Expand Down Expand Up @@ -1317,6 +1318,7 @@ spec:
- gcpPluginImageFqin
- resticRestoreImageFqin
- kubevirtPluginImageFqin
- hypershiftPluginImageFqin
- operator-type
type: object
required:
Expand Down
2 changes: 2 additions & 0 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ spec:
value: quay.io/konveyor/velero-plugin-for-gcp:oadp-1.4
- 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-4
- name: RELATED_IMAGE_MUSTGATHER
value: registry.redhat.io/oadp/oadp-mustgather-rhel8:v1.2
args:
Expand Down
18 changes: 10 additions & 8 deletions pkg/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,15 @@ var DefaultRestoreResourcePriorities = restore.Priorities{

// Images
const (
VeleroImage = "quay.io/konveyor/velero:latest"
OpenshiftPluginImage = "quay.io/konveyor/openshift-velero-plugin:latest"
AWSPluginImage = "quay.io/konveyor/velero-plugin-for-aws:latest"
LegacyAWSPluginImage = "quay.io/konveyor/velero-plugin-for-legacy-aws:latest"
AzurePluginImage = "quay.io/konveyor/velero-plugin-for-microsoft-azure:latest"
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"
VeleroImage = "quay.io/konveyor/velero:latest"
OpenshiftPluginImage = "quay.io/konveyor/openshift-velero-plugin:latest"
AWSPluginImage = "quay.io/konveyor/velero-plugin-for-aws:latest"
LegacyAWSPluginImage = "quay.io/konveyor/velero-plugin-for-legacy-aws:latest"
AzurePluginImage = "quay.io/konveyor/velero-plugin-for-microsoft-azure:latest"
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-4"
)

// Plugin names
Expand All @@ -79,6 +80,7 @@ const (
VeleroPluginForGCP = "velero-plugin-for-gcp"
VeleroPluginForOpenshift = "openshift-velero-plugin"
KubeVirtPlugin = "kubevirt-velero-plugin"
HypershiftPlugin = "hypershift-oadp-plugin"
)

// Environment Vars keys
Expand Down
17 changes: 17 additions & 0 deletions pkg/credentials/credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ var (
IsCloudProvider: false,
PluginName: common.KubeVirtPlugin,
},
oadpv1alpha1.DefaultPluginHypershift: {
IsCloudProvider: false,
PluginName: common.HypershiftPlugin,
},
}
)

Expand Down Expand Up @@ -159,6 +163,16 @@ func getKubeVirtPluginImage(dpa *oadpv1alpha1.DataProtectionApplication) string
return os.Getenv("RELATED_IMAGE_KUBEVIRT_VELERO_PLUGIN")
}

func getHypershiftPluginImage(dpa *oadpv1alpha1.DataProtectionApplication) string {
if dpa.Spec.UnsupportedOverrides[oadpv1alpha1.HypershiftPluginImageKey] != "" {
return dpa.Spec.UnsupportedOverrides[oadpv1alpha1.HypershiftPluginImageKey]
}
if os.Getenv("RELATED_IMAGE_HYPERSHIFT_VELERO_PLUGIN") == "" {
return common.HypershiftPluginImage
}
return os.Getenv("RELATED_IMAGE_HYPERSHIFT_VELERO_PLUGIN")
}

func GetPluginImage(defaultPlugin oadpv1alpha1.DefaultPlugin, dpa *oadpv1alpha1.DataProtectionApplication) string {
switch defaultPlugin {

Expand All @@ -179,6 +193,9 @@ func GetPluginImage(defaultPlugin oadpv1alpha1.DefaultPlugin, dpa *oadpv1alpha1.

case oadpv1alpha1.DefaultPluginKubeVirt:
return getKubeVirtPluginImage(dpa)

case oadpv1alpha1.DefaultPluginHypershift:
return getHypershiftPluginImage(dpa)
}
return ""
}
Expand Down