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

chore(csv): bump csv min k8s version to 1.25 (backport #910) #911

Merged
merged 2 commits into from
Jul 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 9, 2024

Welcome to Cryostat! 👋

Before contributing, make sure you have:

  • Read the contributing guidelines
  • Linked a relevant issue which this PR resolves
  • Linked any other relevant issues, PR's, or documentation, if any
  • Resolved all conflicts, if any
  • Rebased your branch PR on top of the latest upstream main branch
  • Attached at least one of the following labels to the PR: [chore, ci, docs, feat, fix, test]
  • Signed all commits: git commit -S -m "YOUR_COMMIT_MESSAGE"

Fixes: cryostatio/cryostatio.github.io#194

Description of the change:

Bumped min k8s version in CSV to 1.25.0

Motivation for the change:

See cryostatio/cryostatio.github.io#194 (comment). Might be a little odd if anyone already installs cryostat-operator with 1.21-1.24 k8s.


This is an automatic backport of pull request #910 done by Mergify.

Signed-off-by: Thuan Vo <[email protected]>
(cherry picked from commit f84caf0)

# Conflicts:
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@mergify mergify bot added the conflicts label Jul 9, 2024
@mergify mergify bot assigned tthvo Jul 9, 2024
Copy link
Contributor Author

mergify bot commented Jul 9, 2024

Cherry-pick of f84caf0 has failed:

On branch mergify/bp/cryostat-v3.0/pr-910
Your branch is up to date with 'origin/cryostat-v3.0'.

You are currently cherry-picking commit f84caf0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   README.md
	modified:   config/manifests/bases/cryostat-operator.clusterserviceversion.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bundle/manifests/cryostat-operator.clusterserviceversion.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@andrewazores andrewazores added chore Refactor, rename, cleanup, etc. safe-to-test and removed conflicts labels Jul 9, 2024
@andrewazores
Copy link
Member

/build_test

Copy link

github-actions bot commented Jul 9, 2024

/build_test completed successfully ✅.
View Actions Run.

@ebaron ebaron merged commit 3ea1022 into cryostat-v3.0 Jul 9, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat-v3.0/pr-910 branch July 9, 2024 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Refactor, rename, cleanup, etc. safe-to-test
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants