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

Backport of Removed nodename and status from consul snapshot save -append-filename command and using leader version in version into release/1.15.x #18685

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

This PR is auto-generated from #18680 to be assessed for backporting due to the inclusion of the label backport/1.15.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@absolutelightning
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "5353c807068363848db0c506db9ea2a014f54f8e", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Description

Using leader version in version. Also removes nodename and status in consul snapshot save -append-filename command

Testing & Reproduction steps

make dev
./bin/consul agent -dev -config-file=../server.json
./bin/consul snapshot save -append-filename version,dc snap.bkp

asheshvidyut@asheshvidyut-H2GX766V9T ~/consul (fix-snapshot-save-append-file %) » ./bin/consul snapshot save -append-filename version,dc snap.bkp                                        130 ↵
Saved and verified snapshot to index 17
asheshvidyut@asheshvidyut-H2GX766V9T ~/consul (fix-snapshot-save-append-file %) » ls | grep snap-1.17.0-dc1.bkp
snap-1.17.0-dc1.bkp

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix-snapshot-save-append-file/adequately-adapted-possum branch 2 times, most recently from 864f1fb to d3d2482 Compare September 6, 2023 10:19
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix-snapshot-save-append-file/adequately-adapted-possum branch from 4e85c88 to 35dc208 Compare September 6, 2023 10:19
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging September 6, 2023 10:20 Inactive
Copy link

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@github-actions github-actions bot added type/docs Documentation needs to be created/updated/clarified theme/cli Flags and documentation for the CLI interface labels Sep 6, 2023
@hc-github-team-consul-core
Copy link
Contributor Author

🤔 This PR has changes in the website/ directory but does not have a type/docs-cherrypick label. If the changes are for the next version, this can be ignored. If they are updates to current docs, attach the label to auto cherrypick to the stable-website branch after merging.

@vercel vercel bot temporarily deployed to Preview – consul September 6, 2023 10:31 Inactive
…e command and using leader version in version (#18680)

* init

* fix tests

* fix tests lint

* fix api call inside dc

* updated doc

* address comments
@absolutelightning absolutelightning marked this pull request as ready for review September 6, 2023 10:40
@absolutelightning absolutelightning requested a review from a team as a code owner September 6, 2023 10:40
@absolutelightning absolutelightning enabled auto-merge (squash) September 6, 2023 10:44
@absolutelightning absolutelightning merged commit fa9e837 into release/1.15.x Sep 6, 2023
82 checks passed
@absolutelightning absolutelightning deleted the backport/fix-snapshot-save-append-file/adequately-adapted-possum branch September 6, 2023 10:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/cli Flags and documentation for the CLI interface type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants