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(metrics): change targetallocator ServiceAccount name #3604

Merged
merged 1 commit into from
Mar 26, 2024

Conversation

swiatekm
Copy link

This is to avoid conflict with the operator's default. After the change, we can freely switch between the two without worrying about ownership conflicts. Helm errors if we tell it to manage a resource which already exists and is managed by the operator.

In #3515 we let the operator manage the target allocator's ServiceAccount. Then in #3539, we went back to managing it ourselves, because we needed to attach our own pull secrets to it. This results in an error when upgrading, because Helm refuses to manage a resource which is already managed by the operator, based on standard labels. Changing the name fixes this problem.

Fixes #3588. I'm also going to backport this change to v4.5 and release v4.5.2, as it currently blocks the upgrade for any user with Otel metrics enabled.

Checklist

  • Changelog updated or skip changelog label added
  • Template tests added for new features

This is to avoid conflict with the operator's default. After the change,
we can freely switch between the two without worrying about ownership
conflicts. Helm errors if we tell it to manage a resource which
already exists and is managed by the operator.
@swiatekm swiatekm requested a review from a team as a code owner March 25, 2024 16:35
@swiatekm swiatekm merged commit 6581b47 into main Mar 26, 2024
48 checks passed
@swiatekm swiatekm deleted the fix/metrics/ta-serviceaccount branch March 26, 2024 09:11
@sumo-backporter
Copy link
Contributor

The backport to release-v4.5 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-v4.5 release-v4.5
# Navigate to the new working tree
cd .worktrees/backport-release-v4.5
# Create a new branch
git switch --create backport-3604-to-release-v4.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6581b47285f29488458e7b775d6495c059fe1a80
# Push it to GitHub
git push --set-upstream origin backport-3604-to-release-v4.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-v4.5

Then, create a pull request where the base branch is release-v4.5 and the compare/head branch is backport-3604-to-release-v4.5.

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.

4.4.0 to 4.5.1 upgrade failed: rendered manifests contain a resource that already exists
2 participants