Merge branch 'master' into smallinsky/emit_usage_event_forward_error

gravitational · Nov 19, 2024 · bdda8ca · bdda8ca
2 parents af5c6f5 + 9f5b360
commit bdda8ca
Show file tree

Hide file tree

Showing 111 changed files with 3,214 additions and 1,180 deletions.
diff --git a/api/gen/proto/go/teleport/discoveryconfig/v1/discoveryconfig.pb.go b/api/gen/proto/go/teleport/discoveryconfig/v1/discoveryconfig.pb.go
diff --git a/api/proto/teleport/discoveryconfig/v1/discoveryconfig.proto b/api/proto/teleport/discoveryconfig/v1/discoveryconfig.proto
@@ -91,6 +91,12 @@ enum DiscoveryConfigState {
 message IntegrationDiscoveredSummary {
   // AWSEC2 contains the summary for the AWS EC2 discovered instances.
   ResourcesDiscoveredSummary aws_ec2 = 1;
+
+  // AWSRDS contains the summary for the AWS RDS discovered databases.
+  ResourcesDiscoveredSummary aws_rds = 2;
+
+  // AWSEKS contains the summary for the AWS EKS discovered clusters.
+  ResourcesDiscoveredSummary aws_eks = 3;
 }
 
 // ResourcesDiscoveredSummary represents the AWS resources that were discovered.

diff --git a/assets/loadtest/Makefile b/assets/loadtest/Makefile
@@ -117,13 +117,14 @@ deploy-tc:
 .PHONY: join-tc
 join-tc:
 	kubectl get pod -n tc -o name --no-headers \
-    	| xargs -P 20 -n 1 -I {} kubectl -n tc exec {} -- tctl create -f /etc/teleport/tc.yaml
+    	| xargs -P 10 -n 1 -I {} kubectl -n tc exec {} -- tctl create -f /etc/teleport/tc.yaml
 
 # deletes trusted clusters
 .PHONY: delete-tc
 delete-tc:
 	helm delete -n tc trusted-cluster
-	tctl get rc | grep ' name:' | cut -d ':' -f2- | xargs -P 20 -n 1 -I {} tctl rm rc/{}
+	kubectl --namespace teleport exec deploy/teleport-auth \
+		-- /busybox/sh -c "tctl get rc | grep ' name:' | cut -d ':' -f2- | xargs -P 20 -n 1 -I {} tctl rm rc/{}"
 
 # creates a bot used by the soak tests to authenticate with the cluster
 .PHONY: create-soaktest-bot