Merge pull request #1023 from openshift-cherrypick-robot/cherry-pick-…

…1016-to-release-4.13 [release-4.13] OCPBUGS-9957: Garbage collect grafana-dashboard-etcd
openshift · Mar 13, 2023 · aaeed42 · aaeed42
2 parents b40e0f9 + d8d3bb1
commit aaeed42
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/hack/generate.sh b/hack/generate.sh
@@ -11,3 +11,4 @@ fi
 cd jsonnet && jb update
 jsonnet -J vendor main.jsonnet  | gojsontoyaml > ../manifests/0000_90_etcd-operator_03_prometheusrule.yaml
 jsonnet -J vendor dashboard.jsonnet  | gojsontoyaml > ../manifests/0000_90_cluster-etcd-operator_01-dashboards.yaml
+jsonnet -J vendor removed_dashboard.jsonnet  | gojsontoyaml > ../manifests/0000_90_cluster-etcd-operator_02-removed-dashboard.yaml
diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "b9c0684981e1e1bc76f3c745cc7aef0178a1bdcb",
+      "version": "d358e35f3e614b171009d6599a63460eac03d019",
       "sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
     }
   ],

diff --git a/jsonnet/removed_dashboard.jsonnet b/jsonnet/removed_dashboard.jsonnet
@@ -0,0 +1,13 @@
+{
+  apiVersion: 'v1',
+  kind: 'ConfigMap',
+  metadata: {
+    annotations: {
+      'include.release.openshift.io/self-managed-high-availability': 'true',
+      'include.release.openshift.io/single-node-developer': 'true',
+      'release.openshift.io/delete': "true",
+    },
+    name: 'grafana-dashboard-etcd',
+    namespace: 'openshift-config-managed',
+  }
+}
diff --git a/manifests/0000_90_cluster-etcd-operator_02-removed-dashboard.yaml b/manifests/0000_90_cluster-etcd-operator_02-removed-dashboard.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/delete: "true"
+  name: grafana-dashboard-etcd
+  namespace: openshift-config-managed