-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
WebDiscover: allow custom labels for single resource enroll (server, kube, eks, rds) #50606
base: lisa/add-v2-endpoint
Are you sure you want to change the base?
Conversation
15a7e75
to
0729ad9
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll continue the review later today!
web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/ManualHelmDialog.tsx
Outdated
Show resolved
Hide resolved
web/packages/teleport/src/Discover/Database/DeployService/ManualDeploy/ManualDeploy.tsx
Outdated
Show resolved
Hide resolved
web/packages/teleport/src/Discover/Server/DownloadScript/DownloadScript.tsx
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Generate Script" / "Generate Command" would work in the case of the screenshot that you posted. Step 2 talks about generating a command, so it wouldn't be unexpected to have a button that says "Generate Command".
In the case of adding a single server, there's no mention of a command, so I feel a button that says "Generate Command" would be out of place there.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice. 👍 I think it'd make sense to use title case for these since that's what we use for other buttons (e.g. "Add Another Label", "Add a Label").
web/packages/teleport/src/Discover/Server/DownloadScript/DownloadScript.tsx
Show resolved
Hide resolved
<ResourceLabelTooltip resourceKind="kube" /> | ||
</Flex> | ||
<Box mb={3}> | ||
<LabelsCreater |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't seem to enter labels until I fill out Teleport Service Namespace and Kubernetes Cluster Name first. Would it be possible to validate this only once I click on the first "Next"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now I can enter labels separately from the rest of the inputs, but when I click on the first "Next", it fails with "generateScript is not a function" in the console.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this has been fixed, tested both pnpm start-teleport-e
and in my staging cluster
if interested here is the updated vite config: https://github.com/gravitational/teleport/pull/50472/files#diff-3ba1ef1723154b05797a019f68c65252cbdbafd733eff347e99575e0378085a7
web/packages/teleport/src/Discover/Kubernetes/SelfHosted/HelmChart/HelmChart.tsx
Outdated
Show resolved
Hide resolved
web/packages/teleport/src/Discover/Kubernetes/EnrollEKSCluster/EnrollEksCluster.tsx
Outdated
Show resolved
Hide resolved
web/packages/teleport/src/Discover/Database/EnrollRdsDatabase/SingleEnrollment.tsx
Outdated
Show resolved
Hide resolved
3ed0168
to
67c5614
Compare
5634e11
to
0578489
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm still having some issues when adding a single kube cluster.
67c5614
to
fb39fee
Compare
90dd831
to
c4c83db
Compare
fb39fee
to
bc43b78
Compare
Clear cached join token when components unmounts within a step (eg: when re-generating a token by changing a label)
c4c83db
to
1c33122
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice. 👍 I think it'd make sense to use title case for these since that's what we use for other buttons (e.g. "Add Another Label", "Add a Label").
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you have a chance to investigate what was causing the UI to blow up when the requests weren't properly proxied by the Vite server? It makes me think that perhaps we don't account for a failing request somewhere.
part of #46976
recommend reviewing by commit
This PR adds ability to define custom labels for single resource enroll (support for app will be in another PR)
kube story
server story
eks story
rds story
tests done on my staging cluster:
changelog: Adds support for defining labels in the web UI for single resource enroll (server, kubernetes, EKS, and RDS)