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

Switch to OTC v0.19.2-sumo #1394

Merged
merged 2 commits into from
Feb 11, 2021
Merged

Switch to OTC v0.19.2-sumo #1394

merged 2 commits into from
Feb 11, 2021

Conversation

pmm-sumo
Copy link
Contributor

@pmm-sumo pmm-sumo commented Feb 4, 2021

Description

Update OTC to v0.19.2-sumo


Testing performed
  • Redeploy fluentd and fluentd-events pods
  • Confirm events, logs, and metrics are coming in

pmaciolek and others added 2 commits February 4, 2021 18:14
* yamllint - remove empty line with indent
* test - fix expected output

Signed-off-by: Patryk Matyjasek <pmatyjasek@sumologic.com>
Copy link
Contributor

@pmalek-sumo pmalek-sumo left a comment

Choose a reason for hiding this comment

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

Do we want it in release-v2.0 branch as well?
You can use the labels that our backport bot will pick up

@perk-sumo perk-sumo added this to the v2.0 milestone Feb 11, 2021
@perk-sumo perk-sumo removed this from the v2.0 milestone Feb 11, 2021
@perk-sumo perk-sumo merged commit 1010101 into main Feb 11, 2021
@perk-sumo perk-sumo deleted the otc-0.19 branch February 11, 2021 14:05
@github-actions
Copy link

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

Then, create a pull request where the base branch is release-v2.0 and the compare/head branch is backport-1394-to-release-v2.0.

@perk-sumo
Copy link
Contributor

Backport PR for the release-v2.0: #1413

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants