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 #2530: fix type and do not add cross-namespace owner references #2535

Merged
merged 3 commits into from
Jul 30, 2021

Conversation

nicolaferraro
Copy link
Member

Release Note

Fixed ImagePullError when using global operator in OpenShift

pkg/trait/owner.go Outdated Show resolved Hide resolved
@astefanutti astefanutti merged commit f168d64 into main Jul 30, 2021
@astefanutti astefanutti deleted the fix-global-operator branch July 30, 2021 07:55
@github-actions
Copy link
Contributor

The backport to release-1.5.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-1.5.x release-1.5.x
# Navigate to the new working tree
cd .worktrees/backport-release-1.5.x
# Create a new branch
git switch --create backport-2535-to-release-1.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ---mainline 1 f168d646a79949de404a20d334472d283ad9b07d
# Push it to GitHub
git push --set-upstream origin backport-2535-to-release-1.5.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-1.5.x

Then, create a pull request where the base branch is release-1.5.x and the compare/head branch is backport-2535-to-release-1.5.x.

@nicolaferraro nicolaferraro mentioned this pull request Sep 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants