Skip to content

Commit 9ab3c18

Browse files
Merge pull request #197 from jparrill/bp1.5/OCPBUGS-77530
[oadp-1.5] OCPBUGS-77928: remove pause mechanism from backup/restore plugin
2 parents 941041b + d9fb0a6 commit 9ab3c18

14 files changed

Lines changed: 44 additions & 6389 deletions

File tree

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0
77
github.com/onsi/gomega v1.38.2
88
github.com/openshift/hive/apis v0.0.0-20241220022629-3f49f26197ff
9-
github.com/openshift/hypershift/api v0.0.0-20260302164434-7af765d8054e
9+
github.com/openshift/hypershift/api v0.0.0-20260306152921-2bfe1933d8a1
1010
github.com/sirupsen/logrus v1.9.3
1111
github.com/vmware-tanzu/velero v1.14.0
1212
k8s.io/api v0.34.2
@@ -85,7 +85,7 @@ require (
8585
k8s.io/client-go v0.34.2
8686
k8s.io/klog/v2 v2.130.1 // indirect
8787
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
88-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
88+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
8989
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
9090
sigs.k8s.io/yaml v1.6.0 // indirect
9191
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
210210
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
211211
github.com/openshift/hive/apis v0.0.0-20241220022629-3f49f26197ff h1:6C1z4xMAruyeiTFGqahxNDpI1cXPCjpaFeIeIodty08=
212212
github.com/openshift/hive/apis v0.0.0-20241220022629-3f49f26197ff/go.mod h1:1vBNCcWNpQyFCz83PWYT/lHUFJ9ost2t5FijHElh6gQ=
213-
github.com/openshift/hypershift/api v0.0.0-20260302164434-7af765d8054e h1:X9X/xevArJm5z+7ByKPgyVNid3CU/LMj6Ih4AToQdGA=
214-
github.com/openshift/hypershift/api v0.0.0-20260302164434-7af765d8054e/go.mod h1:dN8V9JjUjvvJaF3SJFSkb5p2H3CkjwcFDMlABEkQyuU=
213+
github.com/openshift/hypershift/api v0.0.0-20260306152921-2bfe1933d8a1 h1:by2K4v8VEWRv+uPLA6hpAhM9h6RMKwJ7tOQxe1vpcYQ=
214+
github.com/openshift/hypershift/api v0.0.0-20260306152921-2bfe1933d8a1/go.mod h1:dN8V9JjUjvvJaF3SJFSkb5p2H3CkjwcFDMlABEkQyuU=
215215
github.com/openshift/velero v0.10.2-0.20250514165055-8fbcf3a8da11 h1:/BjkW8HljIX96clCuv/V+PzShD3coVcNilCXd/Axlfo=
216216
github.com/openshift/velero v0.10.2-0.20250514165055-8fbcf3a8da11/go.mod h1:+wInt9pLqlRiUZAWsO5eSxLZK9Q3jSV9MFaUrBfvGN0=
217217
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

pkg/common/types.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package common
22

3-
import "time"
4-
53
const (
6-
CAPIPausedAnnotationName string = "cluster.x-k8s.io/paused"
74
CommonBackupAnnotationName string = "hypershift.openshift.io/common-backup-plugin"
85
CommonRestoreAnnotationName string = "hypershift.openshift.io/common-restore-plugin"
96
FSBackupLabelName string = "hypershift.openshift.io/fsbackup"
@@ -14,23 +11,12 @@ const (
1411

1512
PluginConfigMapName string = "hypershift-oadp-plugin-config"
1613

17-
// Default values for the backup plugin.
18-
defaultPVBackupTimeout time.Duration = 30 * time.Minute
19-
defaultPVBackupCheckPace time.Duration = 10 * time.Second
20-
defaultWaitForPausedTimeout time.Duration = 2 * time.Minute
21-
defaultWaitForTimeout time.Duration = 5 * time.Minute
22-
2314
DefaultK8sSAFilePath string = "/var/run/secrets/kubernetes.io/serviceaccount"
2415
KubevirtRHCOSLabel string = "hypershift.openshift.io/is-kubevirt-rhcos"
2516

2617
// Integration with Hypershift, more info here: https://github.com/openshift/hypershift/pull/6195
2718
HostedClusterRestoredFromBackupAnnotation string = "hypershift.openshift.io/restored-from-backup"
2819

29-
// OADP Plugin audit annotations for pause operations
30-
OADPPausedByAnnotation string = "oadp.openshift.io/paused-by"
31-
OADPPausedAtAnnotation string = "oadp.openshift.io/paused-at"
32-
HypershiftOADPPluginName string = "hypershift-oadp-plugin"
33-
3420
// hypershift/cluster-api kinds
3521
HostedClusterKind string = "HostedCluster"
3622
HostedControlPlaneKind string = "HostedControlPlane"

0 commit comments

Comments
 (0)