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

enos: use the initial version's install dir in upgrade #27496

Merged
merged 1 commit into from
Jun 13, 2024

Conversation

ryancragun
Copy link
Collaborator

Description

Fix a race in the upgrade scenario by waiting for the cluster to elect a leader before attempting to get the ip addresses.

https://github.com/hashicorp/vault/actions/runs/9503957362/job/26200475179?pr=27493#step:11:55

TODO only if you're a HashiCorp employee

  • Labels: If this PR is the CE portion of an ENT change, and that ENT change is
    getting backported to N-2, use the new style backport/ent/x.x.x+ent labels
    instead of the old style backport/x.x.x labels.
  • Labels: If this PR is a CE only change, it can only be backported to N, so use
    the normal backport/x.x.x label (there should be only 1).
  • ENT Breakage: If this PR either 1) removes a public function OR 2) changes the signature
    of a public function, even if that change is in a CE file, double check that
    applying the patch for this PR to the ENT repo and running tests doesn't
    break any tests. Sometimes ENT only tests rely on public functions in CE
    files.
  • Jira: If this change has an associated Jira, it's referenced either
    in the PR description, commit message, or branch name.
  • RFC: If this change has an associated RFC, please link it in the description.
  • ENT PR: If this change has an associated ENT PR, please link it in the
    description. Also, make sure the changelog is in this PR, not in your ENT PR.

@ryancragun ryancragun requested a review from a team as a code owner June 13, 2024 19:50
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jun 13, 2024
Copy link

github-actions bot commented Jun 13, 2024

CI Results:
All required Go tests succeeded but failures were detected ⚠️
Failures:

Test Type Package Test Logs
race command TestAuditDisableCommand_Run view test results
race command TestAuditEnableCommand_Run view test results
race command TestAuditListCommand_Run view test results
race command TestAuthCommand_Run view test results
race command TestAuthDisableCommand_Run view test results
race command TestAuthEnableCommand_Run view test results
race command TestAuthHelpCommand_Run view test results
race command TestAuthListCommand_Run view test results
race command TestAuthMoveCommand_Run view test results
race command TestAuthTuneCommand_Run view test results

and 109 - 10 other tests

Copy link

github-actions bot commented Jun 13, 2024

Build Results:
All builds succeeded! ✅

@ryancragun ryancragun force-pushed the ryan/fix-upgrade branch 2 times, most recently from 2d54150 to 895b5a2 Compare June 13, 2024 20:10
@ryancragun ryancragun changed the title enos: wait for a leader election before getting cluster ips enos: use the initial version's install dir in upgrade Jun 13, 2024
@ryancragun ryancragun force-pushed the ryan/fix-upgrade branch 3 times, most recently from 8194272 to b2cc6a5 Compare June 13, 2024 21:23
@ryancragun ryancragun enabled auto-merge (squash) June 13, 2024 21:53
Fix the upgrade scenario by utilizing the correct Vault install location
for the initial install and by using different initial upgrade versions.
Before we had upgrade versions that were only available for Enterprise
which would fail on CE.

Signed-off-by: Ryan Cragun <me@ryan.ec>
@ryancragun ryancragun disabled auto-merge June 13, 2024 21:54
@ryancragun ryancragun enabled auto-merge (squash) June 13, 2024 22:01
@ryancragun ryancragun merged commit 456f180 into main Jun 13, 2024
83 of 85 checks passed
@ryancragun ryancragun deleted the ryan/fix-upgrade branch June 13, 2024 22:21
ryancragun added a commit that referenced this pull request Jun 17, 2024
Fix the upgrade scenario by utilizing the correct Vault install location
for the initial install and by using different initial upgrade versions.
Before we had upgrade versions that were only available for Enterprise
which would fail on CE.

Signed-off-by: Ryan Cragun <me@ryan.ec>
ryancragun pushed a commit that referenced this pull request Jun 17, 2024
…into release/1.17.x (#27493)

* backport of commit 84935e4

* enos: use the correct install during upgrade (#27496)

Fix the upgrade scenario by utilizing the correct Vault install location
for the initial install and by using different initial upgrade versions.
Before we had upgrade versions that were only available for Enterprise
which would fail on CE.

Signed-off-by: Ryan Cragun <me@ryan.ec>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-changelog pr/no-milestone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants