Skip to content

fix agent config templating when using appResource and discovery#35781

Merged
hugoShaka merged 2 commits intomasterfrom
hugo/fix-agent-chart-discovery-appResource
Dec 15, 2023
Merged

fix agent config templating when using appResource and discovery#35781
hugoShaka merged 2 commits intomasterfrom
hugo/fix-agent-chart-discovery-appResource

Conversation

@hugoShaka
Copy link
Copy Markdown
Contributor

Changelog: fix a bug in teleport-kube-agent chart when using both appResources and the discovery role.

The bug was caused by a mismatched indentation between the .Values.appResources | toYaml and the items added when Discovery was on. I also updated all the nindent X to make more sense.

uri: https://console.aws.amazon.com/ec2/v2/home
labels:
env: test
appResources:
Copy link
Copy Markdown
Contributor

@tigrato tigrato Dec 15, 2023

Choose a reason for hiding this comment

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

can you add a test case for this file to ensure all fields are filled ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It's a bit hard because the config is not rendered directly but in a string in a configmap key, we can't use assert.sets. Best I can do is a snapshot.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done in 7fc079c

@hugoShaka hugoShaka requested a review from tigrato December 15, 2023 17:03
Merged via the queue into master with commit 4f5674e Dec 15, 2023
@hugoShaka hugoShaka deleted the hugo/fix-agent-chart-discovery-appResource branch December 15, 2023 17:35
@public-teleport-github-review-bot
Copy link
Copy Markdown

@hugoShaka See the table below for backport results.

Branch Result
branch/v13 Failed
branch/v14 Create PR

@hugoShaka hugoShaka changed the title fix agent config tempalting when using appResource and discovery fix agent config templating when using appResource and discovery Dec 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants