Skip to content

[v15] Add EKS auto discovery for dynamic integration based fetchers.#38772

Merged
AntonAM merged 1 commit intobranch/v15from
anton/backport-38204-branch/v15
Feb 29, 2024
Merged

[v15] Add EKS auto discovery for dynamic integration based fetchers.#38772
AntonAM merged 1 commit intobranch/v15from
anton/backport-38204-branch/v15

Conversation

@AntonAM
Copy link
Copy Markdown
Contributor

@AntonAM AntonAM commented Feb 29, 2024

Backport #38204 to branch/v15.

Depends on #38771

Manual backport - couple of phantom merge conflicts on neighbouring line because of TAG matchers.

@AntonAM AntonAM added the no-changelog Indicates that a PR does not require a changelog entry label Feb 29, 2024
@AntonAM AntonAM changed the title [v15] Add EKS auto discovery for dynamic integration based fetchers. (#38204) [v15] Add EKS auto discovery for dynamic integration based fetchers. Feb 29, 2024
@zmb3
Copy link
Copy Markdown
Collaborator

zmb3 commented Feb 29, 2024

/excludeflake *

@AntonAM AntonAM force-pushed the anton/backport-38204-branch/v15 branch from b673d42 to a08f3d0 Compare February 29, 2024 01:38
* AWSOIDC: Move enrollment of EKS clusters to the gRPC service.

* Fix after rebase.

* Add EKS auto discovery for dynamic integration based fetchers.

* Remove commented code.

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>

* Remove unneeded code.

Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>

* Add missing godoc.

* Initiate map with length.

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>

* Fix typo in the interface name.

* Introduce iam join method for EKS enrollment.

* Correctly process DiscoveredEKSCluster in kube watcher.

* Remove remaining CreateToken related code from Discovery service.

* Change var initialization.

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>

* Remove dev version detection for EKS enrollment.

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>

* Revert "Introduce iam join method for EKS enrollment."

This reverts commit 0eb3f4f1226239a5d4e768ebe9129535be318ccb.

* Fix usage of a missing function.

* Refactor cluster features to be a function.

* Change discovery to use gRPC call for EKS enrollment.

* Remove unused mock.

* Correct a comment.

* Remove token creation permission from Discovery service.

* Fix after rebase.

* Improve sorting clusters by region and integration.

Co-authored-by: Tiago Silva <tiago.silva@goteleport.com>

* Return and error if cluster features are missing.

* Fix tests.

---------

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
Co-authored-by: Marco André Dinis <marco.dinis@goteleport.com>
Co-authored-by: Tiago Silva <tiago.silva@goteleport.com>
@AntonAM AntonAM force-pushed the anton/backport-38204-branch/v15 branch from a08f3d0 to 2ec52fc Compare February 29, 2024 02:04
@AntonAM AntonAM enabled auto-merge February 29, 2024 02:25
@AntonAM AntonAM added this pull request to the merge queue Feb 29, 2024
Merged via the queue into branch/v15 with commit 95e4acf Feb 29, 2024
@AntonAM AntonAM deleted the anton/backport-38204-branch/v15 branch February 29, 2024 02:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport discovery no-changelog Indicates that a PR does not require a changelog entry size/lg

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants