From 4e418753c55ab7175cf1911c8fe0cdc906bef5e6 Mon Sep 17 00:00:00 2001 From: Michal Pryc Date: Tue, 12 Aug 2025 18:55:08 +0200 Subject: [PATCH 1/2] Removed .gitmodules and git sub-modules Removal of the .gitmodules and git-submodules from the repo as they were causing make bundle to fail. Signed-off-by: Michal Pryc --- .gitmodules | 12 ------------ must-gather/kopia | 1 - must-gather/restic | 1 - must-gather/velero | 1 - 4 files changed, 15 deletions(-) delete mode 100644 .gitmodules delete mode 160000 must-gather/kopia delete mode 160000 must-gather/restic delete mode 160000 must-gather/velero diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 782b2cd5b7b..00000000000 --- a/.gitmodules +++ /dev/null @@ -1,12 +0,0 @@ -[submodule "must-gather/velero"] - path = must-gather/velero - url = https://github.com/openshift/velero - branch = oadp-1.5 -[submodule "must-gather/restic"] - path = must-gather/restic - url = https://github.com/openshift/restic - branch = oadp-1.5 -[submodule "must-gather/kopia"] - path = must-gather/kopia - url = https://github.com/migtools/kopia - branch = oadp-1.5 diff --git a/must-gather/kopia b/must-gather/kopia deleted file mode 160000 index 20bfabbfc7a..00000000000 --- a/must-gather/kopia +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 20bfabbfc7a029fb3fe339ebe92c94e270acc365 diff --git a/must-gather/restic b/must-gather/restic deleted file mode 160000 index 20114d0350e..00000000000 --- a/must-gather/restic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 20114d0350e6655248b07735b221ed52483ed329 diff --git a/must-gather/velero b/must-gather/velero deleted file mode 160000 index 924d1fb321f..00000000000 --- a/must-gather/velero +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 924d1fb321fb28928938404b654933a3c4f5a2d1 From b7689dbc7bc7e4484e698c3c40abd021df3e86ec Mon Sep 17 00:00:00 2001 From: Michal Pryc Date: Tue, 12 Aug 2025 21:21:27 +0200 Subject: [PATCH 2/2] make bundle and VERSION update - after rebase Updated VERSION in the Makefile to 1.5.1 Ran: make bundle Signed-off-by: Michal Pryc --- .../oadp-operator.clusterserviceversion.yaml | 39 ------------------- config/rbac/role.yaml | 39 ------------------- 2 files changed, 78 deletions(-) diff --git a/bundle/manifests/oadp-operator.clusterserviceversion.yaml b/bundle/manifests/oadp-operator.clusterserviceversion.yaml index 80f4cf12112..82752fd2574 100644 --- a/bundle/manifests/oadp-operator.clusterserviceversion.yaml +++ b/bundle/manifests/oadp-operator.clusterserviceversion.yaml @@ -863,13 +863,6 @@ spec: - patch - update - watch - - apiGroups: - - "" - resources: - - persistentvolumerclaims - - persistentvolumes - verbs: - - get - apiGroups: - apps resources: @@ -1015,19 +1008,6 @@ spec: - velero.io resources: - '*' - - backuprepositories - - backups - - backupstoragelocations - - datadownloads - - datauploads - - deletebackuprequests - - downloadrequests - - podvolumebackups - - podvolumerestores - - restores - - schedules - - serverstatusrequests - - volumesnapshotlocations verbs: - create - delete @@ -1036,25 +1016,6 @@ spec: - patch - update - watch - - apiGroups: - - velero.io - resources: - - backuprepositories/status - - backups/status - - backupstoragelocations/status - - datadownloads/status - - datauploads/status - - deletebackuprequests/status - - downloadrequests/status - - podvolumebackups/status - - podvolumerestores/status - - restores/status - - schedules/status - - serverstatusrequests/status - verbs: - - get - - patch - - update - apiGroups: - authentication.k8s.io resources: diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 286b9a964ba..fbd9cb5985c 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -35,13 +35,6 @@ rules: - patch - update - watch -- apiGroups: - - "" - resources: - - persistentvolumerclaims - - persistentvolumes - verbs: - - get - apiGroups: - apps resources: @@ -187,19 +180,6 @@ rules: - velero.io resources: - '*' - - backuprepositories - - backups - - backupstoragelocations - - datadownloads - - datauploads - - deletebackuprequests - - downloadrequests - - podvolumebackups - - podvolumerestores - - restores - - schedules - - serverstatusrequests - - volumesnapshotlocations verbs: - create - delete @@ -208,22 +188,3 @@ rules: - patch - update - watch -- apiGroups: - - velero.io - resources: - - backuprepositories/status - - backups/status - - backupstoragelocations/status - - datadownloads/status - - datauploads/status - - deletebackuprequests/status - - downloadrequests/status - - podvolumebackups/status - - podvolumerestores/status - - restores/status - - schedules/status - - serverstatusrequests/status - verbs: - - get - - patch - - update