OCPBUGS-11889: disable CORS headers on Thanos querier #1950

machine424 · 2023-04-20T06:37:12Z

I added CHANGELOG entry for this change.
No user facing changes, so no entry in CHANGELOG was needed.
Change commit message + changelog entry
Backport to 4.12/4.13?

openshift-ci-robot · 2023-04-20T06:37:16Z

@machine424: This pull request references Jira Issue OCPBUGS-11889, which is invalid:

expected the bug to target only the "4.14.0" version, but multiple target versions were set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

I added CHANGELOG entry for this change.

No user facing changes, so no entry in CHANGELOG was needed.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot · 2023-04-20T06:39:39Z

@machine424: This pull request references Jira Issue OCPBUGS-11889, which is invalid:

expected the bug to target only the "4.14.0" version, but multiple target versions were set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

I added CHANGELOG entry for this change.

No user facing changes, so no entry in CHANGELOG was needed.

Backport

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot · 2023-04-20T08:12:37Z

@machine424: This pull request references Jira Issue OCPBUGS-11889, which is invalid:

expected the bug to target only the "4.14.0" version, but multiple target versions were set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

I added CHANGELOG entry for this change.

No user facing changes, so no entry in CHANGELOG was needed.

Backport

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

machine424 · 2023-05-17T15:14:39Z

I'll add the possibility to re-enable them using a flag, see the comments on the jira ticket.

openshift-ci-robot · 2023-05-17T15:21:48Z

@machine424: This pull request references Jira Issue OCPBUGS-11889, which is invalid:

expected the bug to target only the "4.14.0" version, but multiple target versions were set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

I added CHANGELOG entry for this change.

No user facing changes, so no entry in CHANGELOG was needed.

Change commit message + changelog entry

Backport?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot · 2023-05-17T20:46:33Z

@machine424: This pull request references Jira Issue OCPBUGS-11889, which is invalid:

expected the bug to target only the "4.14.0" version, but multiple target versions were set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

I added CHANGELOG entry for this change.

No user facing changes, so no entry in CHANGELOG was needed.

Change commit message + changelog entry

Backport?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

pkg/manifests/manifests_test.go

pkg/manifests/types.go

machine424 · 2023-05-22T07:22:37Z

/retest

machine424 · 2023-05-23T08:22:28Z

/jira refresh

openshift-ci-robot · 2023-05-23T08:22:36Z

@machine424: This pull request references Jira Issue OCPBUGS-11889, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.14.0) matches configured target version for branch (4.14.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot · 2023-05-23T08:22:52Z

@machine424: This pull request references Jira Issue OCPBUGS-11889, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.14.0) matches configured target version for branch (4.14.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

In response to this:

I added CHANGELOG entry for this change.

No user facing changes, so no entry in CHANGELOG was needed.

Change commit message + changelog entry

Backport to 4.12/4.13?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

machine424 · 2023-05-31T08:35:46Z

/retest

jan--f

One last nit, other this looks good.

jan--f · 2023-05-31T13:17:09Z

pkg/manifests/types.go

@@ -258,6 +258,9 @@ type ThanosQuerierConfig struct {
 	// The possible values are `error`, `warn`, `info`, and `debug`.
 	// The default value is `info`.
 	LogLevel string `json:"logLevel,omitempty"`
+	// A Boolean flag that enables setting CORS headers.
+	// The default value is `false`.


Suggested change

// The default value is `false`.

// The default value is `false`.

// If enabled, Thanos sets CORS headers to be allowed by all.

I assume you're talking about Access-Control-Allow-Origin: *

How about?

// A Boolean flag that enables setting CORS headers. // The headers would allow access from any origin. // The default value is `false`.

I pushed a this version.

simonpasquier · 2023-06-05T12:42:10Z

CHANGELOG.md

@@ -4,6 +4,7 @@

 - [#1937](https://github.com/openshift/cluster-monitoring-operator/pull/1937) Disables btrfs collector
 - [#1910](https://github.com/openshift/cluster-monitoring-operator/pull/1910) Add new web console usage metrics
+- [#1950](https://github.com/openshift/cluster-monitoring-operator/pull/1950) Disable CORS headers on Thanos querier by defaut and add a flag to enable them back.


note for the future: you don't have to update the CHANGELOG.md especially for bug fixes as they are tracked/documented in JIRA.

The line is blurry here as this stems from an RFE :)

well this is linked to an OCPBUGS-XXX ticket :)

…add a flag to re-enable them Signed-off-by: Ayoub Mrini <amrini@redhat.com>

jan--f · 2023-06-06T08:39:04Z

/lgtm
/label docs-approved
/label px-approved
Adding doc and px approval as per agreement.
Ping @juzhao for qe approval.

openshift-ci · 2023-06-06T08:39:33Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jan--f, machine424

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:

~~OWNERS~~ [jan--f]

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

jan--f · 2023-06-06T09:14:18Z

/retest-required

openshift-ci-robot · 2023-06-06T11:50:43Z

/retest-required

Remaining retests: 0 against base HEAD 5ff7b96 and 2 for PR HEAD d6f5b30 in total

simonpasquier · 2023-06-06T15:12:11Z

/skip

openshift-ci · 2023-06-06T18:11:10Z

@machine424: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/versions	`d6f5b30`	link	false	`/test versions`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

openshift-ci-robot · 2023-06-06T18:15:34Z

@machine424: Jira Issue OCPBUGS-11889: All pull requests linked via external trackers have merged:

openshift/cluster-monitoring-operator#1950

Jira Issue OCPBUGS-11889 has been moved to the MODIFIED state.

In response to this:

I added CHANGELOG entry for this change.

No user facing changes, so no entry in CHANGELOG was needed.

Change commit message + changelog entry

Backport to 4.12/4.13?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 20, 2023

openshift-ci bot requested review from jan--f and sthaha April 20, 2023 06:37

machine424 force-pushed the thanos-cors branch from 7a1a5bb to b65ea26 Compare April 20, 2023 08:12

machine424 force-pushed the thanos-cors branch from b65ea26 to 05dd6d7 Compare May 17, 2023 20:46

machine424 commented May 17, 2023

View reviewed changes

pkg/manifests/manifests_test.go Show resolved Hide resolved

sthaha reviewed May 18, 2023

View reviewed changes

pkg/manifests/types.go Show resolved Hide resolved

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 31, 2023

machine424 force-pushed the thanos-cors branch from 05dd6d7 to 1d2d3fa Compare May 31, 2023 09:46

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 31, 2023

machine424 force-pushed the thanos-cors branch from 1d2d3fa to f901933 Compare May 31, 2023 09:48

jan--f suggested changes May 31, 2023

View reviewed changes

simonpasquier reviewed Jun 5, 2023

View reviewed changes

OCPBUGS-11889: disable CORS headers by default on Thanos querier and …

d6f5b30

…add a flag to re-enable them Signed-off-by: Ayoub Mrini <amrini@redhat.com>

machine424 force-pushed the thanos-cors branch from f901933 to d6f5b30 Compare June 6, 2023 06:41

openshift-ci bot added docs-approved Signifies that Docs has signed off on this PR px-approved Signifies that Product Support has signed off on this PR labels Jun 6, 2023

openshift-ci bot assigned jan--f Jun 6, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 6, 2023

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 6, 2023

openshift-merge-robot merged commit 6fd54e3 into openshift:master Jun 6, 2023
15 checks passed

juzhao mentioned this pull request Jun 8, 2023

typo in 4.14 CHANGELOG.md and CONTRIBUTING.md #1992

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OCPBUGS-11889: disable CORS headers on Thanos querier #1950

OCPBUGS-11889: disable CORS headers on Thanos querier #1950

machine424 commented Apr 20, 2023 •

edited

openshift-ci-robot commented Apr 20, 2023

openshift-ci-robot commented Apr 20, 2023

openshift-ci-robot commented Apr 20, 2023

machine424 commented May 17, 2023

openshift-ci-robot commented May 17, 2023

openshift-ci-robot commented May 17, 2023

machine424 commented May 22, 2023

machine424 commented May 23, 2023

openshift-ci-robot commented May 23, 2023

openshift-ci-robot commented May 23, 2023

machine424 commented May 31, 2023

jan--f left a comment

jan--f May 31, 2023 •

edited

machine424 May 31, 2023 •

edited

machine424 Jun 6, 2023

simonpasquier Jun 5, 2023

jan--f Jun 6, 2023

simonpasquier Jun 6, 2023

jan--f commented Jun 6, 2023

openshift-ci bot commented Jun 6, 2023

jan--f commented Jun 6, 2023

openshift-ci-robot commented Jun 6, 2023

simonpasquier commented Jun 6, 2023

openshift-ci bot commented Jun 6, 2023

openshift-ci-robot commented Jun 6, 2023

	// The default value is `false`.
	// The default value is `false`.
	// If enabled, Thanos sets CORS headers to be allowed by all.

OCPBUGS-11889: disable CORS headers on Thanos querier #1950

OCPBUGS-11889: disable CORS headers on Thanos querier #1950

Conversation

machine424 commented Apr 20, 2023 • edited

openshift-ci-robot commented Apr 20, 2023

openshift-ci-robot commented Apr 20, 2023

openshift-ci-robot commented Apr 20, 2023

machine424 commented May 17, 2023

openshift-ci-robot commented May 17, 2023

openshift-ci-robot commented May 17, 2023

machine424 commented May 22, 2023

machine424 commented May 23, 2023

openshift-ci-robot commented May 23, 2023

openshift-ci-robot commented May 23, 2023

machine424 commented May 31, 2023

jan--f left a comment

Choose a reason for hiding this comment

jan--f May 31, 2023 • edited

Choose a reason for hiding this comment

machine424 May 31, 2023 • edited

Choose a reason for hiding this comment

machine424 Jun 6, 2023

Choose a reason for hiding this comment

simonpasquier Jun 5, 2023

Choose a reason for hiding this comment

jan--f Jun 6, 2023

Choose a reason for hiding this comment

simonpasquier Jun 6, 2023

Choose a reason for hiding this comment

jan--f commented Jun 6, 2023

openshift-ci bot commented Jun 6, 2023

jan--f commented Jun 6, 2023

openshift-ci-robot commented Jun 6, 2023

simonpasquier commented Jun 6, 2023

openshift-ci bot commented Jun 6, 2023

openshift-ci-robot commented Jun 6, 2023

machine424 commented Apr 20, 2023 •

edited

jan--f May 31, 2023 •

edited

machine424 May 31, 2023 •

edited