remove hypershift from oadp-1.4

api/v1alpha1/oadp_types.go

@@ -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;hypershift
+// +kubebuilder:validation:Enum=aws;legacy-aws;gcp;azure;csi;vsm;openshift;kubevirt
 type DefaultPlugin string
 
 const DefaultPluginAWS DefaultPlugin = "aws"
@@ -46,7 +46,6 @@ 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"`
@@ -64,7 +63,6 @@ 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"
@@ -360,7 +358,6 @@ type DataProtectionApplicationSpec struct {
 	//   - gcpPluginImageFqin
 	//   - resticRestoreImageFqin
 	//   - kubevirtPluginImageFqin
-	//   - hypershiftPluginImageFqin
 	//   - operator-type
 	// +optional
 	UnsupportedOverrides map[UnsupportedImageKey]string `json:"unsupportedOverrides,omitempty"`

bundle/manifests/oadp-operator.clusterserviceversion.yaml

@@ -867,8 +867,6 @@ 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: quay.io/konveyor/oadp-must-gather:oadp-1.4
                 image: quay.io/konveyor/oadp-operator:oadp-1.4
@@ -1020,8 +1018,6 @@ 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: quay.io/konveyor/oadp-must-gather:oadp-1.4
     name: mustgather
   replaces: oadp-operator.v1.4.9

bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml

@@ -820,7 +820,6 @@ spec:
                               - vsm
                               - openshift
                               - kubevirt
-                              - hypershift
                             type: string
                           type: array
                         defaultSnapshotMoveData:
@@ -1316,7 +1315,6 @@ spec:
                       - gcpPluginImageFqin
                       - resticRestoreImageFqin
                       - kubevirtPluginImageFqin
-                      - hypershiftPluginImageFqin
                       - operator-type
                   type: object
               required:

config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml

@@ -820,7 +820,6 @@ spec:
                               - vsm
                               - openshift
                               - kubevirt
-                              - hypershift
                             type: string
                           type: array
                         defaultSnapshotMoveData:
@@ -1316,7 +1315,6 @@ spec:
                       - gcpPluginImageFqin
                       - resticRestoreImageFqin
                       - kubevirtPluginImageFqin
-                      - hypershiftPluginImageFqin
                       - operator-type
                   type: object
               required:

config/manager/manager.yaml

@@ -58,8 +58,6 @@ 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: quay.io/konveyor/oadp-must-gather:oadp-1.4
         args:

go.mod

@@ -27,7 +27,6 @@ require (
 require (
 	github.com/deckarep/golang-set/v2 v2.3.0
 	github.com/google/go-cmp v0.7.0
-	github.com/openshift/hypershift/api v0.0.0-20240522104800-604a957be25e
 	github.com/vmware-tanzu/velero v1.14.0
 	k8s.io/klog/v2 v2.120.1
 )
@@ -184,5 +183,3 @@ require (
 replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20240822153644-9ac863aaa452
 
 replace github.com/kopia/kopia => github.com/project-velero/kopia v0.0.0-20240417031915-e07d5b7de567
-
-replace github.com/openshift/hypershift => github.com/openshift/hypershift v0.1.52-0.20250828102706-84d7581f683c

go.sum

@@ -708,8 +708,6 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/openshift/api v0.0.0-20240214165302-89248c87b7fc h1:/QQKBisQey7+qtKJS4fReHmXx/GyGRS8Tb+IU2WOMh0=
 github.com/openshift/api v0.0.0-20240214165302-89248c87b7fc/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
-github.com/openshift/hypershift/api v0.0.0-20240522104800-604a957be25e h1:8MuhfnkUWjKdJ35pjPLXkPELRTj89LgJfKwcdKLBII4=
-github.com/openshift/hypershift/api v0.0.0-20240522104800-604a957be25e/go.mod h1:NUkcQ8wwJw0/U7VVhTKSKptjHmIvptSMjL1c0FnTqqs=
 github.com/openshift/velero v0.10.2-0.20240822153644-9ac863aaa452 h1:rIGzeje6KnnudkYkiua/LigiNloNZfE6Kr0hCKqhtZI=
 github.com/openshift/velero v0.10.2-0.20240822153644-9ac863aaa452/go.mod h1:T+tSiinatCuVO7K3zGVxbCcMNYwfIdnlfc8SmIVDI4U=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

pkg/common/common.go

@@ -61,15 +61,14 @@ 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"
-	HypershiftPluginImage = "quay.io/redhat-user-workloads/ocp-art-tenant/oadp-hypershift-oadp-plugin-oadp-1-4"
+	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"
 )
 
 // Plugin names
@@ -80,7 +79,6 @@ const (
 	VeleroPluginForGCP       = "velero-plugin-for-gcp"
 	VeleroPluginForOpenshift = "openshift-velero-plugin"
 	KubeVirtPlugin           = "kubevirt-velero-plugin"
-	HypershiftPlugin         = "hypershift-oadp-plugin"
 )
 
 // Environment Vars keys

pkg/credentials/credentials.go

@@ -78,10 +78,6 @@ var (
 			IsCloudProvider: false,
 			PluginName:      common.KubeVirtPlugin,
 		},
-		oadpv1alpha1.DefaultPluginHypershift: {
-			IsCloudProvider: false,
-			PluginName:      common.HypershiftPlugin,
-		},
 	}
 )
 
@@ -163,16 +159,6 @@ 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 {
 
@@ -193,9 +179,6 @@ func GetPluginImage(defaultPlugin oadpv1alpha1.DefaultPlugin, dpa *oadpv1alpha1.
 
 	case oadpv1alpha1.DefaultPluginKubeVirt:
 		return getKubeVirtPluginImage(dpa)
-
-	case oadpv1alpha1.DefaultPluginHypershift:
-		return getHypershiftPluginImage(dpa)
 	}
 	return ""
 }