Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

telemeter-server: Always set OpenShift telemetry tenant ID #332

Merged
merged 1 commit into from May 5, 2020

Conversation

brancz
Copy link
Contributor

@brancz brancz commented May 5, 2020

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 5, 2020
@kakkoyun
Copy link
Contributor

kakkoyun commented May 5, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 5, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brancz, kakkoyun

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@@ -79,7 +77,7 @@ func (h *Handler) Receive(w http.ResponseWriter, r *http.Request) {
return
}
req = req.WithContext(ctx)
req.Header.Add("THANOS-TENANT", r.Context().Value(authorize.TenantKey).(string))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe we should make this configurable via a flag so we don't have to make a new PR to telemeter every time the tenant ID changes. WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why would it change? it's kind of final ..

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when we run in different environments, or someone else runs this somewhere

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hopefully, this is replaced by OIDC soo anyway, no? If so, we could just leave it as is and then update to the proper new flow later.

@brancz
Copy link
Contributor Author

brancz commented May 5, 2020

Merging this as we need it for our production system. This has nothing to do with anything shipped in OpenShift, it's entirely server side.

@brancz brancz merged commit 7339ac9 into openshift:master May 5, 2020
@brancz brancz deleted the forward-tenant branch May 5, 2020 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants