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

helm - Add reuse-values when running helm diff #683

Conversation

abikouo
Copy link
Contributor

@abikouo abikouo commented Feb 28, 2024

SUMMARY

closes #680

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

helm

Copy link

Copy link

Copy link
Contributor

@GomathiselviS GomathiselviS left a comment

Choose a reason for hiding this comment

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

Everything looks good. I believe it would be preferable to adhere to the Fully Qualified Collection Name (FQCN) format for all module calls within the tasks in the test you added to ensure alignment with coding standards.

@abikouo
Copy link
Contributor Author

abikouo commented Mar 1, 2024

Everything looks good. I believe it would be preferable to adhere to the Fully Qualified Collection Name (FQCN) format for all module calls within the tasks in the test you added to ensure alignment with coding standards.

Done

Copy link

Copy link

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/2bba7bd19e2d4d2eaaed7cec2c045f7d

✔️ ansible-galaxy-importer SUCCESS in 4m 09s
✔️ build-ansible-collection SUCCESS in 7m 34s

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 23e94b6 into ansible-collections:main Mar 1, 2024
81 checks passed
Copy link

patchback bot commented Mar 1, 2024

Backport to stable-3: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 23e94b6 on top of patchback/backports/stable-3/23e94b60c1202e67d35903d8f6d298fbb15f35cc/pr-683

Backporting merged PR #683 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/kubernetes.core.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-3/23e94b60c1202e67d35903d8f6d298fbb15f35cc/pr-683 upstream/stable-3
  4. Now, cherry-pick PR helm - Add reuse-values when running helm diff #683 contents into that branch:
    $ git cherry-pick -x 23e94b60c1202e67d35903d8f6d298fbb15f35cc
    If it'll yell at you with something like fatal: Commit 23e94b60c1202e67d35903d8f6d298fbb15f35cc is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 23e94b60c1202e67d35903d8f6d298fbb15f35cc
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR helm - Add reuse-values when running helm diff #683 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-3/23e94b60c1202e67d35903d8f6d298fbb15f35cc/pr-683
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link

patchback bot commented Mar 1, 2024

Backport to stable-2: 💔 cherry-picking failed — target branch does not exist

❌ Failed to find branch stable-2

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Copy link

patchback bot commented Mar 1, 2024

Backport to stable-3: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-3/23e94b60c1202e67d35903d8f6d298fbb15f35cc/pr-683

Backported as #692

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Mar 1, 2024
helm - Add reuse-values when running helm diff

SUMMARY

closes #680

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

helm

Reviewed-by: GomathiselviS
Reviewed-by: Alina Buzachis
(cherry picked from commit 23e94b6)
abikouo added a commit that referenced this pull request Mar 1, 2024
helm - Add reuse-values when running helm diff

SUMMARY

closes #680

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

helm

Reviewed-by: GomathiselviS
Reviewed-by: Alina Buzachis
(cherry picked from commit 23e94b6)

Co-authored-by: Bikouo Aubin <79859644+abikouo@users.noreply.github.com>
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.

Helm diff does not use reuse-values
3 participants