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

fix(kuma-cp): change way of setting if resource is read only (backport #5345) #5348

Merged
merged 3 commits into from
Nov 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 21, 2022

This is an automatic backport of pull request #5345 done by Mergify.
Cherry-pick of dd2a67d has failed:

On branch mergify/bp/release-2.0/pr-5345
Your branch is up to date with 'origin/release-2.0'.

You are currently cherry-picking commit dd2a67dfd.
  (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:   pkg/api-server/resource_endpoints.go
	new file:   pkg/api-server/server_test.go
	modified:   pkg/core/resources/model/resource.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/api-server/server.go

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Signed-off-by: Łukasz Dziedziak <[email protected]>
(cherry picked from commit dd2a67d)

# Conflicts:
#	pkg/api-server/server.go
@mergify mergify bot requested a review from a team as a code owner November 21, 2022 10:30
@mergify mergify bot added the conflicts label Nov 21, 2022
Signed-off-by: Łukasz Dziedziak <[email protected]>
Signed-off-by: Łukasz Dziedziak <[email protected]>
@lukidzi lukidzi merged commit 09d3783 into release-2.0 Nov 21, 2022
@lukidzi lukidzi deleted the mergify/bp/release-2.0/pr-5345 branch November 21, 2022 16:10
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.

1 participant