Skip to content

make bundle and VERSION update - after rebase #1901

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

Closed
mpryc wants to merge 1 commit into from
Closed

make bundle and VERSION update - after rebase #1901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
DEFAULT_VERSION := 1.5.0
DEFAULT_VERSION := 1.5.1
VERSION ?= $(DEFAULT_VERSION)

# CHANNELS define the bundle channels used in the bundle.
Expand Down
43 changes: 2 additions & 41 deletions bundle/manifests/oadp-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ metadata:
operatorframework.io/arch.arm64: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
name: oadp-operator.v1.5.0
name: oadp-operator.v1.5.1
namespace: openshift-adp
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -863,13 +863,6 @@ spec:
- patch
- update
- watch
- apiGroups:
- ""
resources:
- persistentvolumerclaims
- persistentvolumes
verbs:
- get
- apiGroups:
- apps
resources:
Expand Down Expand Up @@ -1015,19 +1008,6 @@ spec:
- velero.io
resources:
- '*'
- backuprepositories
Copy link
Copy Markdown
Contributor Author

@mpryc mpryc Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The '*' which is one line above should cover the removals.

- backups
- backupstoragelocations
- datadownloads
- datauploads
- deletebackuprequests
- downloadrequests
- podvolumebackups
- podvolumerestores
- restores
- schedules
- serverstatusrequests
- volumesnapshotlocations
verbs:
- create
- delete
Expand All @@ -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:
Expand Down Expand Up @@ -1326,4 +1287,4 @@ spec:
name: mustgather
- image: quay.io/konveyor/oadp-non-admin:oadp-1.5
name: non-admin-controller
version: 1.5.0
version: 1.5.1
39 changes: 0 additions & 39 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@ rules:
- patch
- update
- watch
- apiGroups:
- ""
resources:
- persistentvolumerclaims
Copy link
Copy Markdown
Contributor Author

@mpryc mpryc Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

persistentvolumerclaims - I think this could have been mistake

Copy link
Copy Markdown
Contributor Author

@mpryc mpryc Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

persistentvolumes is something more problematic as it's not covered by other rbac privs here and I am not sure if we should give that somewhere.

Copy link
Copy Markdown
Contributor Author

@mpryc mpryc Aug 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those are not present in the oadp-dev branch of oadp-operator directory.

- persistentvolumes
verbs:
- get
- apiGroups:
- apps
resources:
Expand Down Expand Up @@ -187,19 +180,6 @@ rules:
- velero.io
resources:
- '*'
- backuprepositories
Copy link
Copy Markdown
Contributor Author

@mpryc mpryc Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The '*' above should cover all the removals.

- backups
- backupstoragelocations
- datadownloads
- datauploads
- deletebackuprequests
- downloadrequests
- podvolumebackups
- podvolumerestores
- restores
- schedules
- serverstatusrequests
- volumesnapshotlocations
verbs:
- create
- delete
Expand All @@ -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