Bug 2038419: Bump Grafana to 8.3.4 and handle datasource migration #1543

arajkumar · 2022-01-24T06:15:14Z

Newer version of grafana(e.g v8.3.3) seem to be supporting basic auth
only through secureJsonData.basicAuthPassword. This PR ensures the
creation of new datasources secret with secureJsonData.basicAuthPassword field and removes old secret during upgrade.

Signed-off-by: Arunprasad Rajkumar arajkuma@redhat.com

I added CHANGELOG entry for this change.
No user facing changes, so no entry in CHANGELOG was needed.

arajkumar · 2022-01-24T07:36:59Z

/retest

Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>

arajkumar · 2022-01-24T07:47:38Z

/retitle Bug 2038419: Bump Grafana to 8.3.4 and handle datasource migration

openshift-ci · 2022-01-24T07:47:47Z

@arajkumar: This pull request references Bugzilla bug 2038419, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @lihongyan1

In response to this:

Bug 2038419: Bump Grafana to 8.3.4 and handle datasource migration

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.

arajkumar · 2022-01-24T07:47:52Z

/cc @simonpasquier

simonpasquier

/lgtm
/hold

waiting for @prashbnair's review :)

simonpasquier · 2022-01-24T09:05:42Z

pkg/manifests/manifests.go

@@ -276,6 +276,7 @@ var (
 	TrustedCABundleKey = "ca-bundle.crt"

 	AlertmanagerLegacyServiceMonitorName                = "alertmanager"
+	GrafanaLegacyDataSourceSecretName                   = "grafana-datasources"


(nit) since it's only used in pkg/tasks/grafana.go, it could be moved there.

prashbnair · 2022-01-24T09:33:58Z

/lgtm

simonpasquier · 2022-01-24T10:01:34Z

/skip

philipgough

/lgtm

arajkumar · 2022-01-25T03:31:43Z

/retest

prashbnair · 2022-01-25T05:20:42Z

/lgtm

arajkumar · 2022-01-25T05:25:04Z

I've verified the upgrade path 4.9.x to 4.10.ci works with the fix.

openshift-ci · 2022-01-25T05:25:20Z

@arajkumar: This pull request references Bugzilla bug 2038419, which is valid.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @lihongyan1

In response to this:

Bug 2038419: Bump Grafana to 8.3.4 and handle datasource migration

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.

arajkumar · 2022-01-25T06:30:14Z

/hold cancel

arajkumar · 2022-01-25T07:17:38Z

/retest

prashbnair · 2022-01-25T07:25:20Z

pkg/tasks/grafana.go

@@ -120,6 +122,11 @@ func (t *GrafanaTask) create(ctx context.Context) error {
 		return errors.Wrap(err, "reconciling Grafana Datasources Secret failed")
 	}

+	err = t.client.DeleteSecretByNamespaceAndName(ctx, sds.GetNamespace(), grafanaLegacyDataSourceSecretName)


Can we not reuse the DeleteSecret method by creating a Secret with name and namespace?

Fixed it.

/hold for testing!

Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>

This reverts commit b715974.

Newer version of grafana(e.g v8.3.3) seem to be supporting basic auth only through `secureJsonData.basicAuthPassword`. This PR ensures the creation of new datasources secret with `secureJsonData.basicAuthPassword` field and removes old secret during upgrade. Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>

prashbnair · 2022-01-25T08:33:49Z

/lgtm

openshift-ci · 2022-01-25T08:34:23Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arajkumar, PhilipGough, prashbnair, simonpasquier

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~~ [PhilipGough,arajkumar,prashbnair,simonpasquier]

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

arajkumar · 2022-01-25T13:29:08Z

/hold cancel
/retest
/skip

openshift-bot · 2022-01-25T18:29:52Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2022-01-25T20:20:31Z

@arajkumar: all tests passed!

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 · 2022-01-25T20:21:56Z

@arajkumar: All pull requests linked via external trackers have merged:

Bugzilla bug 2038419 has been moved to the MODIFIED state.

In response to this:

Bug 2038419: Bump Grafana to 8.3.4 and handle datasource migration

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 bot requested review from philipgough and sthaha January 24, 2022 06:15

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 24, 2022

Bump grafana label to v8.3.4

2583b28

Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>

arajkumar force-pushed the fix-grafana-v8.3.x branch from a0acd0c to c748c72 Compare January 24, 2022 07:45

openshift-ci bot changed the title ~~Handle Grafana datasources migration~~ Bug 2038419: Bump Grafana to 8.3.4 and handle datasource migration Jan 24, 2022

openshift-ci bot added the bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. label Jan 24, 2022

openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jan 24, 2022

openshift-ci bot requested a review from lihongyan1 January 24, 2022 07:47

openshift-ci bot requested a review from simonpasquier January 24, 2022 07:47

simonpasquier reviewed Jan 24, 2022

View reviewed changes

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 24, 2022

openshift-ci bot assigned simonpasquier Jan 24, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 24, 2022

openshift-ci bot assigned prashbnair Jan 24, 2022

philipgough approved these changes Jan 24, 2022

View reviewed changes

openshift-ci bot assigned philipgough Jan 24, 2022

arajkumar force-pushed the fix-grafana-v8.3.x branch from c748c72 to 6692d36 Compare January 24, 2022 17:35

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 24, 2022

openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed lgtm Indicates that a PR is ready to be merged. labels Jan 25, 2022

arajkumar requested a review from philipgough January 25, 2022 05:25

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 25, 2022

prashbnair reviewed Jan 25, 2022

View reviewed changes

arajkumar added 3 commits January 25, 2022 13:35

Add changelog entry for grafana version bump

82559fe

Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>

Revert "Reverting the secureJsonData change for the grafana password"

b09ff84

This reverts commit b715974.

arajkumar force-pushed the fix-grafana-v8.3.x branch from 1139830 to b4f4ab6 Compare January 25, 2022 08:06

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 25, 2022

arajkumar requested a review from prashbnair January 25, 2022 08:09

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 25, 2022

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 25, 2022

openshift-merge-robot merged commit fa1cb8f into openshift:master Jan 25, 2022

simonpasquier mentioned this pull request Jan 26, 2022

WIP: Revert "Reverting the secureJsonData change for the grafana password" #1541

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 2038419: Bump Grafana to 8.3.4 and handle datasource migration #1543

Bug 2038419: Bump Grafana to 8.3.4 and handle datasource migration #1543

arajkumar commented Jan 24, 2022 •

edited

Loading

arajkumar commented Jan 24, 2022

arajkumar commented Jan 24, 2022

openshift-ci bot commented Jan 24, 2022

arajkumar commented Jan 24, 2022

simonpasquier left a comment

simonpasquier Jan 24, 2022

prashbnair commented Jan 24, 2022

simonpasquier commented Jan 24, 2022

philipgough left a comment

arajkumar commented Jan 25, 2022

prashbnair commented Jan 25, 2022

arajkumar commented Jan 25, 2022

openshift-ci bot commented Jan 25, 2022

arajkumar commented Jan 25, 2022

arajkumar commented Jan 25, 2022

prashbnair Jan 25, 2022

arajkumar Jan 25, 2022

prashbnair commented Jan 25, 2022

openshift-ci bot commented Jan 25, 2022

arajkumar commented Jan 25, 2022

openshift-bot commented Jan 25, 2022

openshift-ci bot commented Jan 25, 2022

openshift-ci bot commented Jan 25, 2022

Bug 2038419: Bump Grafana to 8.3.4 and handle datasource migration #1543

Bug 2038419: Bump Grafana to 8.3.4 and handle datasource migration #1543

Conversation

arajkumar commented Jan 24, 2022 • edited Loading

arajkumar commented Jan 24, 2022

arajkumar commented Jan 24, 2022

openshift-ci bot commented Jan 24, 2022

arajkumar commented Jan 24, 2022

simonpasquier left a comment

Choose a reason for hiding this comment

simonpasquier Jan 24, 2022

Choose a reason for hiding this comment

prashbnair commented Jan 24, 2022

simonpasquier commented Jan 24, 2022

philipgough left a comment

Choose a reason for hiding this comment

arajkumar commented Jan 25, 2022

prashbnair commented Jan 25, 2022

arajkumar commented Jan 25, 2022

openshift-ci bot commented Jan 25, 2022

arajkumar commented Jan 25, 2022

arajkumar commented Jan 25, 2022

prashbnair Jan 25, 2022

Choose a reason for hiding this comment

arajkumar Jan 25, 2022

Choose a reason for hiding this comment

prashbnair commented Jan 25, 2022

openshift-ci bot commented Jan 25, 2022

arajkumar commented Jan 25, 2022

openshift-bot commented Jan 25, 2022

openshift-ci bot commented Jan 25, 2022

openshift-ci bot commented Jan 25, 2022

arajkumar commented Jan 24, 2022 •

edited

Loading