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

Prepare for 0.3.0 #95

Merged
merged 5 commits into from
Aug 29, 2024
Merged

Prepare for 0.3.0 #95

merged 5 commits into from
Aug 29, 2024

Conversation

thepetk
Copy link
Contributor

@thepetk thepetk commented Aug 13, 2024

Please specify the area for this PR

N/A

What does does this PR do / why we need it:

This PR prepares the release-v0 for the v0.3.0 release.

Which issue(s) this PR fixes:

Fixes devfile/api#1605

PR acceptance criteria:

  • Test Coverage
    • Are your changes sufficiently tested, and are any applicable test cases added or updated to cover your changes?
  • Gosec scans

Documentation

  • Does the registry operator documentation need to be updated with your changes?

Testing changes

Running Unit Tests

Running Integration Tests

Special notes to the reviewer:

bundle.Dockerfile Outdated Show resolved Hide resolved
Copy link
Member

@michael-valdron michael-valdron left a comment

Choose a reason for hiding this comment

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

Also ignore failures with k8s checks as we still need k8s compatibility in our integration tests devfile/api#1313.

@Jdubrick
Copy link
Contributor

We should hold this release until #93 is merged so the release can contain the critical sev fix

@michael-valdron
Copy link
Member

michael-valdron commented Aug 13, 2024

We should hold this release until #93 is merged so the release can contain the critical sev fix

@Jdubrick I agree, though since these are only prep changes in the release branch and the release will not be cut until the release branch is merged into main so we can continue with this PR.

@thepetk The second PR to merge this target branch into main should be on hold until #93 is merged so we can include that fix in this release.

@thepetk
Copy link
Contributor Author

thepetk commented Aug 14, 2024

We should hold this release until #93 is merged so the release can contain the critical sev fix

@Jdubrick I agree, though since these are only prep changes in the release branch and the release will not be cut until the release branch is merged into main so we can continue with this PR.

@thepetk The second PR to merge this target branch into main should be on hold until #93 is merged so we can include that fix in this release.

I've added a blocker label on devfile/api#1620 for devfile/api#1605. Once the registry-library is bumped up I'll remove the it :)

.github/workflows/ci.yaml Fixed Show fixed Hide fixed
.github/workflows/ci.yaml Fixed Show fixed Hide fixed
.github/workflows/ci.yaml Fixed Show fixed Hide fixed
.github/workflows/ci.yaml Fixed Show fixed Hide fixed
@thepetk
Copy link
Contributor Author

thepetk commented Aug 20, 2024

@Jdubrick @michael-valdron an attempt to merge the 0.3.0 release-v0 branch to main.

@Jdubrick
Copy link
Contributor

@Jdubrick @michael-valdron an attempt to merge the 0.3.0 release-v0 branch to main.

Is this in an effort to try and fix the git log? Maybe I misheard but I thought we were moving to having separate release branches?

@michael-valdron
Copy link
Member

@Jdubrick @michael-valdron an attempt to merge the 0.3.0 release-v0 branch to main.

Is this in an effort to try and fix the git log? Maybe I misheard but I thought we were moving to having separate release branches?

@Jdubrick I see that we have documented it in devfile/api#1516 and this is still the case that each release would have their own release branch. I think that this should follow our other repositories release processes though where the release is cut in main then its release branch is created if a major, or minor as suggested recently. Patches should be merged in after release.

The release branches should be used for backports, so if we wanted to patch prior feature versions we can backport changes and cut patch releases under the release branches.

@thepetk
Copy link
Contributor Author

thepetk commented Aug 20, 2024

@Jdubrick @michael-valdron an attempt to merge the 0.3.0 release-v0 branch to main.

Is this in an effort to try and fix the git log? Maybe I misheard but I thought we were moving to having separate release branches?

This merge IMO is required to have an up-to-date tree for the main branch. The release branch will open once we merge the release-v0 to main and it will include the minor version too (e.g release-v0.3) to support potential backported fixes.

cc @michael-valdron

@thepetk
Copy link
Contributor Author

thepetk commented Aug 20, 2024

@Jdubrick @michael-valdron an attempt to merge the 0.3.0 release-v0 branch to main.

Is this in an effort to try and fix the git log? Maybe I misheard but I thought we were moving to having separate release branches?

This merge IMO is required to have an up-to-date tree for the main branch. The release branch will open once we merge the release-v0 to main and it will include the minor version too (e.g release-v0.3) to support potential backported fixes.

cc @michael-valdron

:D Actually @michael-valdron was faster and more verbose than me

@Jdubrick
Copy link
Contributor

@Jdubrick @michael-valdron an attempt to merge the 0.3.0 release-v0 branch to main.

Is this in an effort to try and fix the git log? Maybe I misheard but I thought we were moving to having separate release branches?

This merge IMO is required to have an up-to-date tree for the main branch. The release branch will open once we merge the release-v0 to main and it will include the minor version too (e.g release-v0.3) to support potential backported fixes.

cc @michael-valdron

Ah okay, so this merge is a one-time git tree fix and moving forward each release is going to have its own release branch used for backports but we are tagging and releasing from main?

@michael-valdron
Copy link
Member

@Jdubrick @michael-valdron an attempt to merge the 0.3.0 release-v0 branch to main.

Is this in an effort to try and fix the git log? Maybe I misheard but I thought we were moving to having separate release branches?

This merge IMO is required to have an up-to-date tree for the main branch. The release branch will open once we merge the release-v0 to main and it will include the minor version too (e.g release-v0.3) to support potential backported fixes.
cc @michael-valdron

Ah okay, so this merge is a one-time git tree fix and moving forward each release is going to have its own release branch used for backports but we are tagging and releasing from main?

In most cases yes, except for backport releases in prior feature versions.

@thepetk
Copy link
Contributor Author

thepetk commented Aug 20, 2024

@Jdubrick @michael-valdron an attempt to merge the 0.3.0 release-v0 branch to main.

Is this in an effort to try and fix the git log? Maybe I misheard but I thought we were moving to having separate release branches?

This merge IMO is required to have an up-to-date tree for the main branch. The release branch will open once we merge the release-v0 to main and it will include the minor version too (e.g release-v0.3) to support potential backported fixes.
cc @michael-valdron

Ah okay, so this merge is a one-time git tree fix and moving forward each release is going to have its own release branch used for backports but we are tagging and releasing from main?

Yeah, the difference here is we close once and for all the release-v0 branch and once merged we cut release-v0.3. For next releases, we won't do the same as we will have already cut release-vx.x for the release.

@thepetk
Copy link
Contributor Author

thepetk commented Aug 22, 2024

@michael-valdron / @Jdubrick thoughts for the review?

Copy link
Member

@michael-valdron michael-valdron left a comment

Choose a reason for hiding this comment

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

I'd suggest bringing in up to my recent commit as well: 85ef7f3

Signed-off-by: Michael Valdron <[email protected]>
Signed-off-by: thepetk <[email protected]>
Signed-off-by: thepetk <[email protected]>
Signed-off-by: thepetk <[email protected]>
@thepetk
Copy link
Contributor Author

thepetk commented Aug 22, 2024

I'd suggest bringing in up to my recent commit as well: 85ef7f3

@michael-valdron I've rebased my branch to current main. Out of curiosity, is it necessary to go through the process again? I'm thinking the extra commit is a doc update. Just to have more context on what the release process is including :)

@michael-valdron
Copy link
Member

I'd suggest bringing in up to my recent commit as well: 85ef7f3

@michael-valdron I've rebased my branch to current main. Out of curiosity, is it necessary to go through the process again? I'm thinking the extra commit is a doc update. Just to have more context on what the release process is including :)

@thepetk Just wanted to include updates to requirements to show up to date expectations for the release. I think this should be it for this release. 🙂

@thepetk
Copy link
Contributor Author

thepetk commented Aug 24, 2024

I'd suggest bringing in up to my recent commit as well: 85ef7f3

@michael-valdron I've rebased my branch to current main. Out of curiosity, is it necessary to go through the process again? I'm thinking the extra commit is a doc update. Just to have more context on what the release process is including :)

@thepetk Just wanted to include updates to requirements to show up to date expectations for the release. I think this should be it for this release. 🙂

@michael-valdron nice thanks! Feel free to review!

Copy link
Contributor

@Jdubrick Jdubrick left a comment

Choose a reason for hiding this comment

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

lgtm

Should get @michael-valdron approval as well

@thepetk
Copy link
Contributor Author

thepetk commented Aug 27, 2024

lgtm

Should get @michael-valdron approval as well

Yeah +1 might seem to be small but we're actually rebasing a lot of stuff :)

Copy link
Member

@michael-valdron michael-valdron left a comment

Choose a reason for hiding this comment

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

Just need to pin the version hashes for the go install commands and the rest lgtm.

.github/workflows/ci.yaml Outdated Show resolved Hide resolved
.github/workflows/ci.yaml Outdated Show resolved Hide resolved
.github/workflows/ci.yaml Outdated Show resolved Hide resolved
.github/workflows/ci.yaml Outdated Show resolved Hide resolved
@openshift-ci openshift-ci bot removed the lgtm label Aug 28, 2024
@thepetk
Copy link
Contributor Author

thepetk commented Aug 28, 2024

Just need to pin the version hashes for the go install commands and the rest lgtm.

Yeah I was planning to open a new issue on this as it's out of scope for this issue. But I did a quick pass and I've added pins everywhere. I did the same for the gosec to be consistent with all others.

Copy link
Member

@michael-valdron michael-valdron left a comment

Choose a reason for hiding this comment

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

/lgtm

Changes looks good for release, running bash check_version.sh produces:

All version tags match!

Copy link

openshift-ci bot commented Aug 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Jdubrick, michael-valdron, thepetk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [Jdubrick,michael-valdron,thepetk]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@thepetk thepetk merged commit 6404012 into devfile:main Aug 29, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Publish 0.3.0 release for registry-operator
4 participants