Skip to content
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.

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

pulling in velero upstream changes as of 26 Aug 2022 #809

Merged
merged 1 commit into from
Sep 8, 2022

Conversation

sseago
Copy link
Contributor

@sseago sseago commented Aug 26, 2022

This includes the first round of kopia-related changes, which
may temporarily break things.

The most visible change is the renaming of the "resticrepository"
CRD to "backuprepository".

This also points oadp-operator back to latest velero/plugin images (from 1.9 branches)
and updates builder image to latest go version (currently 1.18.4).

@codecov-commenter
Copy link

Codecov Report

Merging #809 (efc3a74) into master (76822f7) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #809   +/-   ##
=======================================
  Coverage   31.68%   31.68%           
=======================================
  Files          16       16           
  Lines        3080     3080           
=======================================
  Hits          976      976           
  Misses       2012     2012           
  Partials       92       92           
Impacted Files Coverage Δ
pkg/common/common.go 100.00% <ø> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@sseago
Copy link
Contributor Author

sseago commented Aug 26, 2022

/retest

@weshayutin
Copy link
Contributor

Looks good to me..
@rayfordj you will want to take a look at this one :)

@weshayutin
Copy link
Contributor

/LGTM

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 30, 2022
Comment on lines 221 to 232
of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
nullable: true
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
nullable: true
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
Copy link
Member

Choose a reason for hiding this comment

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

Becareful removing nullables here. It's removed when make generate runs I think.

#796 might mitigate this issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@kaovilai Thanks for catching that. I hadn't intended on including this change in the PR. I'll remove it (it's one of the files I have to generally ignore from make bundle since it makes changes even when I didn't touch it.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 31, 2022
@openshift-ci
Copy link

openshift-ci bot commented Aug 31, 2022

New changes are detected. LGTM label has been removed.

@sseago
Copy link
Contributor Author

sseago commented Aug 31, 2022

/retest

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 31, 2022
This includes the first round of kopia-related changes, which
may temporarily break things.

The most visible change is the renaming of the "resticrepository"
CRD to "backuprepository".

This also points oadp-operator back to latest velero/plugin images (from 1.9 branches)
and updates builder image to latest go version (currently 1.18.4).
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 1, 2022
@@ -1,5 +1,5 @@
# Build the manager binary
FROM quay.io/konveyor/builder:v1.17.2 as builder
FROM quay.io/konveyor/builder as builder
Copy link
Member

Choose a reason for hiding this comment

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

Should we be using a tagged version such that it is clear what go version is used?

@sseago
Copy link
Contributor Author

sseago commented Sep 1, 2022

/retest

@openshift-ci
Copy link

openshift-ci bot commented Sep 1, 2022

@sseago: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@kaovilai
Copy link
Member

kaovilai commented Sep 6, 2022

From scrum the intention is that openshift:master does not have to be for 1.1.z. We have oadp-1.1 for that.
So openshift:master may point to a higher velero version.

@sseago
Copy link
Contributor Author

sseago commented Sep 6, 2022

@kaovilai Yes -- that's what this PR is for. To move oadp-master away from the 1.1 version of velero (1.9.z) and point instead to the main-tracking branch in our fork.

@sseago sseago merged commit 74ee911 into openshift:master Sep 8, 2022
weshayutin added a commit to weshayutin/oadp-operator that referenced this pull request Sep 9, 2022
For new developers it may not be clear why some of the make commands
are not working properly.  For example [1] changed the minimum
required golang to successfully use `make deploy-olm`. It was
also not 100% clear what golang version would work across platforms.

It may be helpful to specify the required version and expose it
via the makefile.

[1]openshift#809
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants