Fix gcp resource detection when using workload identity #10486
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
I was testing #10347, which updated gcp resource detection, and got this error on clusters with workload identity:
failed to detect resource {"kind": "processor", "name": "resourcedetection", "pipeline": "logs", "error": "metadata: GCE metadata \"instance/name\" not defined"}
. It turns out that on GKE, onlyinstance/hostname
is available, notinstance/name
. Hostname is an fqdn, not the name of the instance. E.g.gke-wi-collector-test-default-pool-5a7b28f7-nxwt.c.my-project.internal
, so we shouldn't use that as the hostname. It would be nice to have the instance name, but that might need to be obtained through the downward API instead of the GKE metadata server...Testing:
Fixed unit tests, and manually tested.