OCPBUGS-8044: Garbage collect grafana-dashboard-etcd #1016

Elbehery · 2023-03-02T12:33:30Z

resolves https://issues.redhat.com/browse/OCPBUGS-8044

openshift-ci-robot · 2023-03-02T12:33:42Z

@Elbehery: This pull request references Jira Issue OCPBUGS-8044, 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.13.0) matches configured target version for branch (4.13.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @geliu2016

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

In response to this:

resolves https://issues.redhat.com/browse/OCPBUGS-8044

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.

Elbehery · 2023-03-02T12:33:57Z

/assign @wking
/assign @tjungblu
/assign @dusk125

tjungblu · 2023-03-02T12:46:40Z

manifests/0000_90_cluster-etcd-operator_02-dashboards.yaml

+    release.openshift.io/delete: "true"
+  labels:
+    console.openshift.io/dashboard: "true"
+  name: remove-etcd-dashboard


I'm not entirely sure what that does, @Elbehery. This will create a new configmap with the name "remove-etcd-dashboard" that will then be removed by the CVO.

I think we need to patch the existing configmap grafana-dashboard-etcd with the annotation release.openshift.io/delete: "true".

thanks @tjungblu for your prompt review

So iiuc from my chat with @wking , if we add the annotation to the existing CM, all etcd-dashboards will be removed

Currently we have two dashboard for etcd. I think adding a new CM with the annotation will remove one of them, please correct me if i a wrong

if we add the annotation to the existing CM, all etcd-dashboards will be removed

yes, that's my point. You need to add the annotation on the existing CM that you want to remove. What you committed here creates an entirely new configmap that will be deleted and recreated again - all the time.

tjungblu · 2023-03-02T12:48:09Z

manifests/0000_90_cluster-etcd-operator_02-dashboards.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1


also another nitpick, why not put it next to the existing dashboard in jsonnet?
https://github.com/openshift/cluster-etcd-operator/blob/master/jsonnet/dashboard.jsonnet

+1, this is the best option .. i will change it now 👍🏽

Done 👍🏽

Thanks. Strange that the verify job doesn't complain, doesn't this need to go into the binary with make update?

i ran make update, make verify !!

let me reassure 👍🏽

ran them again, nothing changed :/

ah it was hack/generate.sh. Can you try that?
Also while reading the docs https://github.com/openshift/cluster-etcd-operator/blob/master/docs/HACKING.md#cvo-resource-removal ...

could you kindly document this annotation approach in the cvo-resource-removal section?

wking · 2023-03-02T14:51:11Z

jsonnet/dashboard.jsonnet

+      'release.openshift.io/delete': "true",
+    },
+    labels: {
+      'console.openshift.io/dashboard': 'true',


There's no need to set labels on a deletion manifest, because the CVO will delete the resource if it exists, labels isn't part of matching a manifest to a resource (just the group, kind, namespace, and name), and deleted resources don't retain any labels.

wking · 2023-03-02T14:51:39Z

jsonnet/dashboard.jsonnet

+    labels: {
+      'console.openshift.io/dashboard': 'true',
+    },
+    name: 'remove-etcd-dashboard',


This should be grafana-dashboard-etcd (the name of the resource you want to delete)

Elbehery · 2023-03-02T15:27:21Z

/label tide/merge-method-squash

Elbehery · 2023-03-02T15:55:30Z

@simonpasquier Hello ✋🏽

Would you mind having a look here plz ? ..

I used a list to have two CM in the dashboard manifest, i validated it on https://jsonnet.org/learning/tools.html

yet it fails the CI 🤔

simonpasquier

/lgtm

openshift-ci-robot · 2023-03-02T16:25:57Z

/retest-required

Remaining retests: 0 against base HEAD b40e0f9 and 2 for PR HEAD 8c257b1 in total

tjungblu · 2023-03-03T10:50:41Z

/hold cancel

tjungblu · 2023-03-03T10:51:34Z

@wking one final review please?

Elbehery · 2023-03-03T11:02:24Z

/cherry-pick release-4.12

openshift-cherrypick-robot · 2023-03-03T11:02:25Z

@Elbehery: once the present PR merges, I will cherry-pick it on top of release-4.12 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.12

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.

Elbehery · 2023-03-03T11:02:32Z

/cherry-pick release-4.11

openshift-cherrypick-robot · 2023-03-03T11:02:34Z

@Elbehery: once the present PR merges, I will cherry-pick it on top of release-4.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.11

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.

Elbehery · 2023-03-03T14:06:07Z

/retest-required

Elbehery · 2023-03-03T15:28:39Z

/retest-required

tjungblu · 2023-03-06T08:43:52Z

/lgtm

openshift-ci · 2023-03-06T10:37:54Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Elbehery, simonpasquier, tjungblu, wking

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~~ [Elbehery,tjungblu]

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

openshift-ci-robot · 2023-03-06T11:25:58Z

/retest-required

Remaining retests: 0 against base HEAD 7bb6221 and 2 for PR HEAD 581fff1 in total

tjungblu · 2023-03-06T14:15:19Z

/retest-required

openshift-ci · 2023-03-06T15:05:40Z

@Elbehery: 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-robot · 2023-03-06T15:08:47Z

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

openshift/cluster-etcd-operator#1016

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

In response to this:

resolves https://issues.redhat.com/browse/OCPBUGS-8044

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-cherrypick-robot · 2023-03-06T15:09:34Z

@Elbehery: new pull request created: #1019

In response to this:

/cherry-pick release-4.12

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-cherrypick-robot · 2023-03-06T15:10:12Z

@Elbehery: #1016 failed to apply on top of branch "release-4.11":

Applying: OCPBUGS-8044: Garbage collect grafana-dashboard-etcd
Applying: add jsonnet
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 add jsonnet
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.11

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.

Elbehery · 2023-03-10T09:28:35Z

/cherry-pick release-4.13

openshift-cherrypick-robot · 2023-03-10T09:29:19Z

@Elbehery: new pull request created: #1023

In response to this:

/cherry-pick release-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 bot requested a review from geliu2016 March 2, 2023 12:34

openshift-ci bot assigned dusk125, tjungblu and wking Mar 2, 2023

openshift-ci bot requested review from hasbro17 and tjungblu March 2, 2023 12:35

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

tjungblu reviewed Mar 2, 2023

View reviewed changes

OCPBUGS-8044: Garbage collect grafana-dashboard-etcd

f1cede6

Elbehery force-pushed the garbage-collect-grafana-dashboard branch from 0eb536f to f1cede6 Compare March 2, 2023 13:10

wking reviewed Mar 2, 2023

View reviewed changes

Elbehery added 3 commits March 2, 2023 15:51

add jsonnet

d6e085b

remove labels

9fd6398

add list construct

8c257b1

Elbehery force-pushed the garbage-collect-grafana-dashboard branch from b2e02d7 to 8c257b1 Compare March 2, 2023 15:26

openshift-ci bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Mar 2, 2023

simonpasquier reviewed Mar 2, 2023

View reviewed changes

openshift-ci bot assigned simonpasquier Mar 2, 2023

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

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 3, 2023

Elbehery added 2 commits March 3, 2023 11:31

add go.mod go.sum

3c18107

add vendor

581fff1

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

Elbehery mentioned this pull request Mar 3, 2023

add resource removal by CVO #1017

Merged

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

wking approved these changes Mar 6, 2023

View reviewed changes

openshift-merge-robot merged commit 01a88bf into openshift:master Mar 6, 2023

openshift-cherrypick-robot mentioned this pull request Mar 6, 2023

[release-4.12] OCPBUGS-8393: Garbage collect grafana-dashboard-etcd #1019

Merged

Elbehery mentioned this pull request Mar 9, 2023

[release-4.11] OCPBUGS-9908: Garbage collect grafana-dashboard-etcd #1022

Merged

openshift-cherrypick-robot mentioned this pull request Mar 10, 2023

[release-4.13] OCPBUGS-9957: Garbage collect grafana-dashboard-etcd #1023

Merged

Elbehery deleted the garbage-collect-grafana-dashboard branch February 14, 2024 17:39

OCPBUGS-8044: Garbage collect grafana-dashboard-etcd #1016

OCPBUGS-8044: Garbage collect grafana-dashboard-etcd #1016

Conversation

Elbehery commented Mar 2, 2023

openshift-ci-robot commented Mar 2, 2023

Elbehery commented Mar 2, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tjungblu Mar 2, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Elbehery commented Mar 2, 2023

Elbehery commented Mar 2, 2023

simonpasquier left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Mar 2, 2023

tjungblu commented Mar 3, 2023

tjungblu commented Mar 3, 2023

Elbehery commented Mar 3, 2023

openshift-cherrypick-robot commented Mar 3, 2023

Elbehery commented Mar 3, 2023

openshift-cherrypick-robot commented Mar 3, 2023

Elbehery commented Mar 3, 2023

Elbehery commented Mar 3, 2023

tjungblu commented Mar 6, 2023

openshift-ci bot commented Mar 6, 2023

openshift-ci-robot commented Mar 6, 2023

tjungblu commented Mar 6, 2023

openshift-ci bot commented Mar 6, 2023

openshift-ci-robot commented Mar 6, 2023

openshift-cherrypick-robot commented Mar 6, 2023

openshift-cherrypick-robot commented Mar 6, 2023

Elbehery commented Mar 10, 2023

openshift-cherrypick-robot commented Mar 10, 2023

tjungblu Mar 2, 2023 •

edited

Loading