Skip to content

OneOff Script: use ent build if cluster is Enterprise#33061

Merged
marcoandredinis merged 2 commits intomasterfrom
marco/oneoff_use_ent_bin
Oct 9, 2023
Merged

OneOff Script: use ent build if cluster is Enterprise#33061
marcoandredinis merged 2 commits intomasterfrom
marco/oneoff_use_ent_bin

Conversation

@marcoandredinis
Copy link
Copy Markdown
Contributor

We were always using the OSS version of teleport in the one-off scripts.

This PR changes that to pick the correct version depending on the running version in the Proxy.

@marcoandredinis marcoandredinis added discover Issues related to Teleport Discover backport/branch/v13 labels Oct 6, 2023
@github-actions github-actions Bot requested review from avatus and greedy52 October 6, 2023 10:45
@marcoandredinis marcoandredinis force-pushed the marco/oneoff_use_ent_bin branch from d5a331c to f40e492 Compare October 6, 2023 12:54
Comment thread lib/web/scripts/oneoff/oneoff.sh Outdated
@marcoandredinis
Copy link
Copy Markdown
Contributor Author

The flaky tester is failing because the test times out.
It is compressing some files using gzip and it takes around 4s (locally)

Can I please get a waiver on this flaky test? (admins only? cc @r0mant )

I can change the compression level to BestSpeed for this test if that's preferable

@r0mant
Copy link
Copy Markdown
Collaborator

r0mant commented Oct 6, 2023

I can change the compression level to BestSpeed for this test if that's preferable

@marcoandredinis Would this speed up the test? If so, that would be better, yes.

@marcoandredinis marcoandredinis force-pushed the marco/oneoff_use_ent_bin branch from f40e492 to 8a48969 Compare October 6, 2023 16:04
@marcoandredinis
Copy link
Copy Markdown
Contributor Author

It goes from 4s to less than a second (locally at least)
This method is used elsewhere: for compressing the certificates for Database Access
But I think it should be ok to always use best speed, but please let me know if you think otherwise.

@marcoandredinis marcoandredinis added this pull request to the merge queue Oct 6, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 6, 2023
@marcoandredinis marcoandredinis added this pull request to the merge queue Oct 6, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 6, 2023
@avatus avatus added this pull request to the merge queue Oct 6, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 6, 2023
@avatus avatus added this pull request to the merge queue Oct 7, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 7, 2023
@marcoandredinis marcoandredinis added this pull request to the merge queue Oct 9, 2023
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Oct 9, 2023
We were always using the OSS version of teleport in the one-off scripts.

This PR changes that to pick the correct version depending on the
running version in the Proxy.
@marcoandredinis marcoandredinis force-pushed the marco/oneoff_use_ent_bin branch from 8a48969 to aa4d6a4 Compare October 9, 2023 07:11
@marcoandredinis marcoandredinis added this pull request to the merge queue Oct 9, 2023
Merged via the queue into master with commit c3550a2 Oct 9, 2023
@marcoandredinis marcoandredinis deleted the marco/oneoff_use_ent_bin branch October 9, 2023 14:03
@public-teleport-github-review-bot
Copy link
Copy Markdown

@marcoandredinis See the table below for backport results.

Branch Result
branch/v13 Create PR
branch/v14 Create PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

discover Issues related to Teleport Discover size/sm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants