Skip to content

Update master to oadp-dev references #285

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

Open
mpryc wants to merge 1 commit into
base: oadp-dev
Choose a base branch
from
Open

Update master to oadp-dev references #285

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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Continuous Integration
on:
push:
branches:
- master
- oadp-dev
- oadp-1.5
pull_request:
branches:
- master
- oadp-dev
- oadp-1.5
schedule:
- cron: '0 0 * * 1' # Every Monday at 00:00 UTC
Expand Down
2 changes: 1 addition & 1 deletion config/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ resources:
#- ../prometheus

patches:
# Create same deployment as OADP https://github.com/openshift/oadp-operator/blob/master/controllers/nonadmin_controller.go
# Create same deployment as OADP https://github.com/openshift/oadp-operator/blob/oadp-dev/controllers/nonadmin_controller.go
- path: manager_oadp_patch.yaml
# Protect the /metrics endpoint by putting it behind auth.
# If you want your controller-manager to expose the /metrics
Expand Down
6 changes: 3 additions & 3 deletions docs/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ If you are upgrading project's kubebuilder version, please follow [upgrade kubeb

To install OADP operator from default or a release branch in your cluster, with related OADP NAC from default or same release branch, run
```sh
git clone --depth=1 git@github.com:openshift/oadp-operator.git -b master # or appropriate branch
git clone --depth=1 git@github.com:openshift/oadp-operator.git -b oadp-dev # or appropriate branch
cd oadp-operator
make deploy-olm
```
Expand All @@ -36,7 +36,7 @@ To install OADP operator from a branch in your cluster, with OADP NAC from curre
export NAC_PATH=$PWD # or appropriate NAC repository path, already with current branch pointing to development branch
export DEV_IMG=ttl.sh/oadp-non-admin-$(git rev-parse --short HEAD)-$(echo $RANDOM):1h
IMG=$DEV_IMG make docker-build docker-push
git clone --depth=1 git@github.com:openshift/oadp-operator.git -b master # or appropriate branch
git clone --depth=1 git@github.com:openshift/oadp-operator.git -b oadp-dev # or appropriate branch
cd oadp-operator
NON_ADMIN_CONTROLLER_PATH=$NAC_PATH NON_ADMIN_CONTROLLER_IMG=$DEV_IMG make update-non-admin-manifests deploy-olm
```
Expand Down Expand Up @@ -141,7 +141,7 @@ If Velero version or its objects needs changes, follow this workflow:

To upgrade OADP version, run
```sh
go get github.com/openshift/oadp-operator@master # or appropriate branch
go get github.com/openshift/oadp-operator@oadp-dev # or appropriate branch
```

TODO when to update oadp-operator version in go.mod?
Expand Down
Loading