Skip to content

Use metadata server to detect GKE environment - #3856

Merged
theacodes merged 6 commits into
googleapis:masterfrom
liyanhui1228:gke-logging
Aug 23, 2017
Merged

Use metadata server to detect GKE environment#3856
theacodes merged 6 commits into
googleapis:masterfrom
liyanhui1228:gke-logging

Conversation

@liyanhui1228

@liyanhui1228liyanhui1228 commented Aug 23, 2017

Copy link
Copy Markdown
Contributor

For #3622. This fixes the get_default_handler() method to let it return the ContainerEngineHandler when in GKE environment using the cluster_name attribute from the metadata server. If this attribute exists, it should be in GKE environment.

@liyanhui1228liyanhui1228 added the api: logging Issues related to the Cloud Logging API. label Aug 23, 2017
@googlebotgooglebot added the cla: yes This human has signed the Contributor License Agreement. label Aug 23, 2017
theacodes
theacodes reviewed Aug 23, 2017
View reviewed changes
Comment threadlogging/google/cloud/logging/_helpers.py
try:
response = requests.get(url, headers=METADATA_HEADERS)

if response.status_code == requests.codes.ok:

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

duggelz
duggelz reviewed Aug 23, 2017
View reviewed changes
Comment threadlogging/google/cloud/logging/_helpers.py Outdated
See: https://cloud.google.com/compute/docs/storing-retrieving-metadata

:type metadata_key: str
:param metadata_key: Key of the metadata which will form the url.

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Comment threadlogging/tests/unit/test__helpers.py Outdated

def test_request_exception(self):
metadata_key = 'test_url_cannot_connect'
metadata_url = 'invalid_url'

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@liyanhui1228

liyanhui1228 commented Aug 23, 2017

Copy link
Copy Markdown
ContributorAuthor

@dhermes Danny could you please do a final pass for this and merge if looks good?

@theacodes

theacodes commented Aug 23, 2017

Copy link
Copy Markdown
Contributor

LGTM, will merge once CI completes.

@theacodes
theacodes merged commit 0dd7249 into googleapis:masterAug 23, 2017
@dhermes

dhermes commented Aug 23, 2017

Copy link
Copy Markdown
Contributor

Thanks @jonparrott!

@dhermesdhermes mentioned this pull request Aug 24, 2017
Merged
parthea pushed a commit that referenced this pull request Nov 24, 2025
@liyanhui1228Jon Wayne Parrott
Logging: Use metadata server to detect GKE environment (#3856)
bfd9442
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dhermesdhermesAwaiting requested review from dhermes
3 more reviewers
@lukesneeringerlukesneeringerlukesneeringer approved these changes
@theacodestheacodestheacodes approved these changes
@duggelzduggelzduggelz approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

api: loggingIssues related to the Cloud Logging API.cla: yesThis human has signed the Contributor License Agreement.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@liyanhui1228@theacodes@dhermes@lukesneeringer@duggelz@googlebot