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

The v2 migration script fix - migrate Fluent Bit image key instead of deleting it #1444

Merged
merged 2 commits into from
Feb 19, 2021

Conversation

perk-sumo
Copy link
Contributor

@perk-sumo perk-sumo commented Feb 18, 2021

Convert this: https://github.com/helm/charts/blob/master/stable/fluent-bit/values.yaml#L5

image:
  fluent_bit:
    repository: fluent/fluent-bit
    tag: 1.3.7
  pullPolicy: Always

into this: https://github.com/fluent/helm-charts/blob/fb1f611236a3d4b4f56514bb1d05b23820f8a409/charts/fluent-bit/values.yaml#L9

image:
  repository: fluent/fluent-bit
  tag: 1.3.7
  pullPolicy: Always

@perk-sumo perk-sumo changed the title fix: v2 migration script - migrate Fluent Bit image key instead of de… The v2 migration script fix - migrate Fluent Bit image key instead of deleting it Feb 18, 2021
@perk-sumo perk-sumo marked this pull request as draft February 18, 2021 17:11
@perk-sumo perk-sumo force-pushed the perk-fix-upgrade-v2-script-migrate-fluent-bit-image branch 2 times, most recently from 786e80a to 9dcb54c Compare February 19, 2021 08:50
@perk-sumo perk-sumo force-pushed the perk-fix-upgrade-v2-script-migrate-fluent-bit-image branch 2 times, most recently from 327cebf to 9fa72a4 Compare February 19, 2021 09:46
@perk-sumo perk-sumo marked this pull request as ready for review February 19, 2021 09:48
@perk-sumo perk-sumo force-pushed the perk-fix-upgrade-v2-script-migrate-fluent-bit-image branch 2 times, most recently from b178b60 to 8257ea9 Compare February 19, 2021 11:31
@perk-sumo perk-sumo force-pushed the perk-fix-upgrade-v2-script-migrate-fluent-bit-image branch from 8257ea9 to 577e2a8 Compare February 19, 2021 11:40
@perk-sumo perk-sumo merged commit 5243583 into main Feb 19, 2021
@perk-sumo perk-sumo deleted the perk-fix-upgrade-v2-script-migrate-fluent-bit-image branch February 19, 2021 12:24
@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-1444-to-release-v2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ---mainline 1 5243583091113114e05d79d6a1d533d00e2b2ded
# Push it to GitHub
git push --set-upstream origin backport-1444-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-1444-to-release-v2.0.

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

4 participants