wip

lib/usertasks/descriptions.go

@@ -26,14 +26,25 @@ import (
 //go:embed descriptions/*.md
 var descriptionsFS embed.FS
 
-// DescriptionForDiscoverEC2Issue returns the description of the issue and fixing steps.
-// The returned string contains a markdown document.
-// If issue type is not recognized or doesn't have a specific description, them an empty string is returned.
-func DescriptionForDiscoverEC2Issue(issueType string) string {
+func loadIssueDescription(issueType string) string {
 	filename := fmt.Sprintf("descriptions/%s.md", issueType)
 	bs, err := descriptionsFS.ReadFile(filename)
 	if err != nil {
 		return ""
 	}
 	return string(bs)
 }
+
+// DescriptionForDiscoverEC2Issue returns the description of the issue and fixing steps.
+// The returned string contains a markdown document.
+// If issue type is not recognized or doesn't have a specific description, them an empty string is returned.
+func DescriptionForDiscoverEC2Issue(issueType string) string {
+	return loadIssueDescription(issueType)
+}
+
+// DescriptionForDiscoverEKSIssue returns the description of the issue and fixing steps.
+// The returned string contains a markdown document.
+// If issue type is not recognized or doesn't have a specific description, them an empty string is returned.
+func DescriptionForDiscoverEKSIssue(issueType string) string {
+	return loadIssueDescription(issueType)
+}

lib/usertasks/descriptions/eks-agent-not-connecting.md

@@ -0,0 +1,11 @@
+The process of automatically enrolling EKS Clusters into Teleport, starts by installing the [`teleport-kube-agent`](https://goteleport.com/docs/reference/helm-reference/teleport-kube-agent/) to the cluster.
+
+If the installation is successful, the EKS Cluster will appear in your Resources list.
+
+However, the following EKS Clusters did not automatically enrolled.
+This usually happens when the installation is taking too long or there was an error preventing the HELM chart installation.
+
+Navigate to the Teleport Agent to get more information.
+
+[//]: <> (UI must include a column on clusters list:)
+[//]: <> (Open Teleport Agent: https://<region>.console.aws.amazon.com/eks/home?region=<region>#/clusters/<cluster-name>/statefulsets/teleport-kube-agent?namespace=teleport-agent)

lib/usertasks/descriptions/eks-authentication-mode-unsupported.md

@@ -0,0 +1,6 @@
+Teleport uses the Amazon EKS API to install the Teleport Kubernetes Agent.
+
+Please enable API (or API and Config Map) authentication mode in the following EKS Clusters so that they can be automatically enrolled.
+
+[//]: <> (UI must include a column on clusters list:)
+[//]: <> (Manage access: https://<region>.console.aws.amazon.com/eks/home?region=<region>#/clusters/<cluster-name>/manage-access)

lib/usertasks/descriptions/eks-cluster-unreachable.md

@@ -0,0 +1,8 @@
+The EKS Cluster must be accessible from the Teleport Auth Service in order for Teleport to deploy the Teleport Kubernetes Agent.
+
+The following EKS Clusters couldn't be accessed.
+
+Ensure their networking configuration allows access from Teleport.
+
+[//]: <> (UI must include a column on clusters list:)
+[//]: <> (Manage endpoint access: https://<region>.console.aws.amazon.com/eks/home?region=<region>#/clusters/<cluster-name>/manage-endpoint-access)

lib/usertasks/descriptions/eks-missing-endpoint-public-access.md

@@ -0,0 +1,7 @@
+The EKS Cluster must be publicly accessible in order for Teleport to deploy the Teleport Kubernetes Agent.
+
+The following EKS Clusters don't have a public endpoint.
+
+
+[//]: <> (UI must include a column on clusters list:)
+[//]: <> (Manage endpoint access: https://<region>.console.aws.amazon.com/eks/home?region=<region>#/clusters/<cluster-name>/manage-endpoint-access)

lib/usertasks/descriptions/eks-status-not-active.md

@@ -0,0 +1,6 @@
+Only EKS Clusters whose status is active can be automatically enrolled into teleport.
+
+The following are not active.
+
+[//]: <> (UI must include a column on clusters list:)
+[//]: <> (Manage cluster: https://<region>.console.aws.amazon.com/eks/home?region=<region>#/clusters/<cluster-name>)

lib/usertasks/descriptions_test.go

@@ -30,4 +30,7 @@ func TestAllDescriptions(t *testing.T) {
 	for _, issueType := range usertasksapi.DiscoverEC2IssueTypes {
 		require.NotEmpty(t, DescriptionForDiscoverEC2Issue(issueType), "issue type %q is missing descriptions/%s.md file", issueType, issueType)
 	}
+	for _, issueType := range usertasksapi.DiscoverEKSIssueTypes {
+		require.NotEmpty(t, DescriptionForDiscoverEKSIssue(issueType), "issue type %q is missing descriptions/%s.md file", issueType, issueType)
+	}
 }

lib/web/ui/usertask.go

@@ -24,6 +24,7 @@ import (
 	"github.com/gravitational/trace"
 
 	usertasksv1 "github.com/gravitational/teleport/api/gen/proto/go/teleport/usertasks/v1"
+	apiusertasks "github.com/gravitational/teleport/api/types/usertasks"
 	"github.com/gravitational/teleport/lib/usertasks"
 )
 
@@ -52,6 +53,8 @@ type UserTaskDetail struct {
 	Description string `json:"description,omitempty"`
 	// DiscoverEC2 contains the task details for the DiscoverEC2 tasks.
 	DiscoverEC2 *usertasksv1.DiscoverEC2 `json:"discoverEc2,omitempty"`
+	// DiscoverEKS contains the task details for the DiscoverEKS tasks.
+	DiscoverEKS *usertasksv1.DiscoverEKS `json:"discoverEks,omitempty"`
 }
 
 // UpdateUserTaskStateRequest is a request to update a UserTask
@@ -92,10 +95,19 @@ func MakeUserTasks(uts []*usertasksv1.UserTask) []UserTask {
 
 // MakeDetailedUserTask creates a UI UserTask representation containing all the details.
 func MakeDetailedUserTask(ut *usertasksv1.UserTask) UserTaskDetail {
+	var description string
+	switch ut.GetSpec().GetTaskType() {
+	case apiusertasks.TaskTypeDiscoverEC2:
+		description = usertasks.DescriptionForDiscoverEC2Issue(ut.GetSpec().GetIssueType())
+	case apiusertasks.TaskTypeDiscoverEKS:
+		description = usertasks.DescriptionForDiscoverEKSIssue(ut.GetSpec().GetIssueType())
+	}
+
 	return UserTaskDetail{
 		UserTask:    MakeUserTask(ut),
-		Description: usertasks.DescriptionForDiscoverEC2Issue(ut.GetSpec().GetIssueType()),
+		Description: description,
 		DiscoverEC2: ut.GetSpec().GetDiscoverEc2(),
+		DiscoverEKS: ut.GetSpec().GetDiscoverEks(),
 	}
 }