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

ha-autoscale-cluster: Source unit file environment variables from /etc/default/teleport #48040

Merged
merged 1 commit into from
Oct 29, 2024

Conversation

webvictim
Copy link
Contributor

@webvictim webvictim commented Oct 28, 2024

This removes some deprecated code scheduled for cleanup in 17.0.0.

Tested by deploying ha-autoscale-cluster with local 16.4.6 OSS and Enterprise AMI builds.

Changelog: Teleport AMIs no longer source /etc/teleport.d/conf in the Proxy Service systemd unit. Use /etc/default/teleport if you want to set Proxy Service environment variables.

@webvictim webvictim added terraform-deployment-examples Issues relating to Terraform deployment examples under examples/aws/terraform terraform Legacy Terraform label backport/branch/v14 no-changelog Indicates that a PR does not require a changelog entry backport/branch/v15 backport/branch/v16 backport/branch/v17 labels Oct 28, 2024
@webvictim webvictim self-assigned this Oct 28, 2024
@webvictim webvictim requested review from zmb3 and hugoShaka October 28, 2024 19:34
@github-actions github-actions bot requested a review from klizhentas October 28, 2024 19:34
Copy link

This pull request is automatically being deployed by Amplify Hosting (learn more).

Access this pull request here: https://pr-48040.d3pp5qlev8mo18.amplifyapp.com

@@ -14,3 +14,8 @@ TELEPORT_ENABLE_POSTGRES=${enable_postgres_listener}
USE_ACM=${use_acm}
USE_TLS_ROUTING=${use_tls_routing}
EOF
cat >>/etc/default/teleport <<EOF
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is /etc/teleport.d/conf also necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, that file is sourced all over the place.

I could theoretically rewrite all the places it's used to use /etc/default/teleport instead, but setting a lot of extra environment variables in the environment file Teleport itself sources might have unintended consequences. It'd also be a huge PR that would need a lot of testing.

At the moment there's a relatively clean split between "environment variables used by Teleport" and "environment variables used by the AMI/unit files".

@webvictim webvictim enabled auto-merge October 29, 2024 14:20
@hugoShaka hugoShaka removed the no-changelog Indicates that a PR does not require a changelog entry label Oct 29, 2024
Copy link
Contributor

@hugoShaka hugoShaka left a comment

Choose a reason for hiding this comment

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

LGTM, I added a changelog, don't hesitate to rephrase it.

We'll need to add this in the version fine prints as this can be a breaking change for some users doing weird things.

@webvictim webvictim added this pull request to the merge queue Oct 29, 2024
@public-teleport-github-review-bot public-teleport-github-review-bot bot removed the request for review from klizhentas October 29, 2024 15:36
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Oct 29, 2024
@webvictim webvictim enabled auto-merge October 29, 2024 16:50
@webvictim webvictim added this pull request to the merge queue Oct 29, 2024
Merged via the queue into master with commit 425846a Oct 29, 2024
46 of 48 checks passed
@webvictim webvictim deleted the gus/terraform/remove-deprecation branch October 29, 2024 17:02
@public-teleport-github-review-bot

@webvictim See the table below for backport results.

Branch Result
branch/v17 Create PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/branch/v17 size/sm terraform Legacy Terraform label terraform-deployment-examples Issues relating to Terraform deployment examples under examples/aws/terraform
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants