Skip to content

Backport of Adding support for Enterprise and other improvement on the Customizing Vault Version for WanFed Test into release/1.2.x#2746

Closed
hc-github-team-consul-core wants to merge 1 commit intorelease/1.2.xfrom
backport/vault-consul-compatibility-test-v2/likely-happy-alien
Closed

Backport of Adding support for Enterprise and other improvement on the Customizing Vault Version for WanFed Test into release/1.2.x#2746
hc-github-team-consul-core wants to merge 1 commit intorelease/1.2.xfrom
backport/vault-consul-compatibility-test-v2/likely-happy-alien

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

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

🚨

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:
@20sr20
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: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

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


Changes proposed in this PR:

This is the extension of the PR -
#2043

In this PR, the followings were addressed -

  1. Now the vault enterprise version can be provided in the cli command. The previous PR only addressed Vault OSS.
  2. Two flags “-no-cleanup-wan-fed” and “test-duration” were introduced to not to cleanup the test environment after successful setup to give it time to do manual testing for features/to reproduce customer issues. Default is 1 hour.

Update on July 14 on this - After the first review, the above flags are removed, instead a new flag "-no-cleanup" was introduced.

  1. This was tested in Kind environment and it works fine. The following was placed back to use the “use-kind” option for WanFed test.

    if cfg.UseKind {
    t.Skipf("Skipping this test because it's currently flaky on kind")
    }

How I've tested this PR:

How I expect reviewers to test this PR:

Checklist:

  • Tests added
  • CHANGELOG entry added

    HashiCorp engineers only, community PRs should not add a changelog entry.
    Entries should use present tense (e.g. Add support for...)


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/vault-consul-compatibility-test-v2/likely-happy-alien branch from aaab38a to 86cd307 Compare August 9, 2023 15:59
@hashicorp-cla
Copy link
Copy Markdown

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

@wilkermichael
Copy link
Copy Markdown
Contributor

aborting this

@github-actions github-actions bot deleted the backport/vault-consul-compatibility-test-v2/likely-happy-alien branch September 1, 2025 06:13
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.

4 participants