From 96d968256292e2171cc947dcc1af80e5296e17a5 Mon Sep 17 00:00:00 2001 From: Mesosphere CI Robot Date: Tue, 1 Oct 2024 04:03:23 +0200 Subject: [PATCH] feat: Bump kube-prometheus-stack to 63.0.0 (#2671) * chore: Update kube-prometheus-stack 60.4.1 => 63.0.0 * chore: Move kube-prometheus-stack/60.4.1 => 63.0.0 * build: Updated licenses.d2iq.yaml * feat(kps): Bump centralized-grafana * feat: bump promethues stack * build: Updated licenses.d2iq.yaml --------- Co-authored-by: d2iq-mergebot Co-authored-by: Grace Do Co-authored-by: Shubham Gupta --- licenses.d2iq.yaml | 14 ++--- .../centralized-grafana.yaml | 4 +- .../{60.4.1 => 63.0.0}/defaults/cm.yaml | 2 +- .../defaults/kustomization.yaml | 0 .../grafana-dashboards/global-overview.json | 0 .../grafana-dashboards/kustomization.yaml | 0 .../{60.4.1 => 63.0.0}/kustomization.yaml | 0 .../{60.4.1 => 63.0.0}/rbac/grafana.yaml | 0 .../rbac/kustomization.yaml | 0 .../60.4.1/rbac/alertmanager.yaml | 40 -------------- .../60.4.1/rbac/grafana.yaml | 53 ------------------- .../{60.4.1 => 63.0.0}/defaults/cm.yaml | 2 +- .../defaults/kustomization.yaml | 0 .../etcd-metrics-proxy.yaml | 2 +- .../etcd-metrics-proxy/cert.yaml | 0 .../etcd-metrics-proxy/client-rbac.yaml | 0 .../etcd-metrics-proxy/kube-rbac-proxy.yaml | 0 .../grafana-dashboards/calico.json | 0 .../controller-runtime.json | 0 .../flux-cluster-stats.json | 0 .../flux-control-plane.json | 0 .../grafana-dashboards/kustomization.yaml | 0 .../grafana-dashboards/pv-stats.json | 0 .../{60.4.1 => 63.0.0}/helmrelease.yaml | 2 +- .../helmrelease/extra-images.txt | 0 .../helmrelease/kube-prometheus-stack.yaml | 4 +- .../helmrelease/kustomization.yaml | 0 .../{60.4.1 => 63.0.0}/kustomization.yaml | 0 .../63.0.0/rbac/alertmanager.yaml | 40 ++++++++++++++ .../63.0.0/rbac/grafana.yaml | 53 +++++++++++++++++++ .../rbac/kustomization.yaml | 0 .../{60.4.1 => 63.0.0}/rbac/prometheus.yaml | 46 ++++++++-------- 32 files changed, 131 insertions(+), 131 deletions(-) rename services/centralized-grafana/{60.4.1 => 63.0.0}/centralized-grafana.yaml (94%) rename services/centralized-grafana/{60.4.1 => 63.0.0}/defaults/cm.yaml (98%) rename services/centralized-grafana/{60.4.1 => 63.0.0}/defaults/kustomization.yaml (100%) rename services/centralized-grafana/{60.4.1 => 63.0.0}/grafana-dashboards/global-overview.json (100%) rename services/centralized-grafana/{60.4.1 => 63.0.0}/grafana-dashboards/kustomization.yaml (100%) rename services/centralized-grafana/{60.4.1 => 63.0.0}/kustomization.yaml (100%) rename services/centralized-grafana/{60.4.1 => 63.0.0}/rbac/grafana.yaml (100%) rename services/centralized-grafana/{60.4.1 => 63.0.0}/rbac/kustomization.yaml (100%) delete mode 100644 services/kube-prometheus-stack/60.4.1/rbac/alertmanager.yaml delete mode 100644 services/kube-prometheus-stack/60.4.1/rbac/grafana.yaml rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/defaults/cm.yaml (99%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/defaults/kustomization.yaml (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/etcd-metrics-proxy.yaml (92%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/etcd-metrics-proxy/cert.yaml (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/etcd-metrics-proxy/client-rbac.yaml (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/etcd-metrics-proxy/kube-rbac-proxy.yaml (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/grafana-dashboards/calico.json (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/grafana-dashboards/controller-runtime.json (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/grafana-dashboards/flux-cluster-stats.json (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/grafana-dashboards/flux-control-plane.json (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/grafana-dashboards/kustomization.yaml (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/grafana-dashboards/pv-stats.json (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/helmrelease.yaml (93%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/helmrelease/extra-images.txt (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/helmrelease/kube-prometheus-stack.yaml (96%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/helmrelease/kustomization.yaml (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/kustomization.yaml (100%) create mode 100644 services/kube-prometheus-stack/63.0.0/rbac/alertmanager.yaml create mode 100644 services/kube-prometheus-stack/63.0.0/rbac/grafana.yaml rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/rbac/kustomization.yaml (100%) rename services/kube-prometheus-stack/{60.4.1 => 63.0.0}/rbac/prometheus.yaml (50%) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 40c38b055..290ed80ec 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -29,7 +29,7 @@ resources: notice_path: NOTICE.md ref: v${image_tag%-d2iq.0} url: https://github.com/grafana/grafana - - container_image: docker.io/grafana/grafana:11.0.0 + - container_image: docker.io/grafana/grafana:11.2.0 sources: - license_path: LICENSE notice_path: NOTICE.md @@ -480,13 +480,13 @@ resources: - license_path: LICENSE ref: ${image_tag%-d2iq.1} url: https://github.com/kiwigrid/k8s-sidecar - - container_image: quay.io/prometheus-operator/prometheus-config-reloader:v0.74.0 + - container_image: quay.io/prometheus-operator/prometheus-config-reloader:v0.76.1 sources: - license_path: LICENSE notice_path: NOTICE ref: ${image_tag} url: https://github.com/prometheus-operator/prometheus-operator - - container_image: quay.io/prometheus-operator/prometheus-operator:v0.74.0 + - container_image: quay.io/prometheus-operator/prometheus-operator:v0.76.1 sources: - license_path: LICENSE notice_path: NOTICE @@ -504,7 +504,7 @@ resources: notice_path: NOTICE ref: ${image_tag} url: https://github.com/prometheus/alertmanager - - container_image: quay.io/prometheus/node-exporter:v1.8.1 + - container_image: quay.io/prometheus/node-exporter:v1.8.2 sources: - license_path: LICENSE notice_path: NOTICE @@ -516,13 +516,13 @@ resources: notice_path: NOTICE ref: ${image_tag} url: https://github.com/prometheus/prometheus - - container_image: quay.io/prometheus/prometheus:v2.53.0 + - container_image: quay.io/prometheus/prometheus:v2.54.1 sources: - license_path: LICENSE notice_path: NOTICE ref: ${image_tag} url: https://github.com/prometheus/prometheus - - container_image: quay.io/thanos/thanos:v0.35.1 + - container_image: quay.io/thanos/thanos:v0.36.1 sources: - license_path: LICENSE ref: ${image_tag} @@ -532,7 +532,7 @@ resources: - license_path: LICENSE ref: ${image_tag} url: https://github.com/kubernetes/kube-state-metrics - - container_image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.12.0 + - container_image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.13.0 sources: - license_path: LICENSE ref: ${image_tag} diff --git a/services/centralized-grafana/60.4.1/centralized-grafana.yaml b/services/centralized-grafana/63.0.0/centralized-grafana.yaml similarity index 94% rename from services/centralized-grafana/60.4.1/centralized-grafana.yaml rename to services/centralized-grafana/63.0.0/centralized-grafana.yaml index 1b5438392..a6c34940a 100644 --- a/services/centralized-grafana/60.4.1/centralized-grafana.yaml +++ b/services/centralized-grafana/63.0.0/centralized-grafana.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-charts-staging namespace: kommander-flux - version: 60.4.0 + version: 63.0.0 interval: 15s install: crds: CreateReplace @@ -25,7 +25,7 @@ spec: releaseName: centralized-grafana valuesFrom: - kind: ConfigMap - name: centralized-grafana-60.4.1-d2iq-defaults + name: centralized-grafana-63.0.0-d2iq-defaults targetNamespace: ${releaseNamespace} --- apiVersion: v1 diff --git a/services/centralized-grafana/60.4.1/defaults/cm.yaml b/services/centralized-grafana/63.0.0/defaults/cm.yaml similarity index 98% rename from services/centralized-grafana/60.4.1/defaults/cm.yaml rename to services/centralized-grafana/63.0.0/defaults/cm.yaml index 8d5926bcf..799c86af5 100644 --- a/services/centralized-grafana/60.4.1/defaults/cm.yaml +++ b/services/centralized-grafana/63.0.0/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: centralized-grafana-60.4.1-d2iq-defaults + name: centralized-grafana-63.0.0-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/centralized-grafana/60.4.1/defaults/kustomization.yaml b/services/centralized-grafana/63.0.0/defaults/kustomization.yaml similarity index 100% rename from services/centralized-grafana/60.4.1/defaults/kustomization.yaml rename to services/centralized-grafana/63.0.0/defaults/kustomization.yaml diff --git a/services/centralized-grafana/60.4.1/grafana-dashboards/global-overview.json b/services/centralized-grafana/63.0.0/grafana-dashboards/global-overview.json similarity index 100% rename from services/centralized-grafana/60.4.1/grafana-dashboards/global-overview.json rename to services/centralized-grafana/63.0.0/grafana-dashboards/global-overview.json diff --git a/services/centralized-grafana/60.4.1/grafana-dashboards/kustomization.yaml b/services/centralized-grafana/63.0.0/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/centralized-grafana/60.4.1/grafana-dashboards/kustomization.yaml rename to services/centralized-grafana/63.0.0/grafana-dashboards/kustomization.yaml diff --git a/services/centralized-grafana/60.4.1/kustomization.yaml b/services/centralized-grafana/63.0.0/kustomization.yaml similarity index 100% rename from services/centralized-grafana/60.4.1/kustomization.yaml rename to services/centralized-grafana/63.0.0/kustomization.yaml diff --git a/services/centralized-grafana/60.4.1/rbac/grafana.yaml b/services/centralized-grafana/63.0.0/rbac/grafana.yaml similarity index 100% rename from services/centralized-grafana/60.4.1/rbac/grafana.yaml rename to services/centralized-grafana/63.0.0/rbac/grafana.yaml diff --git a/services/centralized-grafana/60.4.1/rbac/kustomization.yaml b/services/centralized-grafana/63.0.0/rbac/kustomization.yaml similarity index 100% rename from services/centralized-grafana/60.4.1/rbac/kustomization.yaml rename to services/centralized-grafana/63.0.0/rbac/kustomization.yaml diff --git a/services/kube-prometheus-stack/60.4.1/rbac/alertmanager.yaml b/services/kube-prometheus-stack/60.4.1/rbac/alertmanager.yaml deleted file mode 100644 index 557c994c4..000000000 --- a/services/kube-prometheus-stack/60.4.1/rbac/alertmanager.yaml +++ /dev/null @@ -1,40 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: dkp-kube-prometheus-stack-alertmanager-admin -rules: -- nonResourceURLs: - - /dkp/alertmanager - - /dkp/alertmanager/* - verbs: - - get - - head - - post - - put - - delete ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: dkp-kube-prometheus-stack-alertmanager-view -rules: -- nonResourceURLs: - - /dkp/alertmanager - - /dkp/alertmanager/* - verbs: - - get - - head ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: dkp-kube-prometheus-stack-alertmanager-edit -rules: -- nonResourceURLs: - - /dkp/alertmanager - - /dkp/alertmanager/* - verbs: - - get - - head - - post - - put diff --git a/services/kube-prometheus-stack/60.4.1/rbac/grafana.yaml b/services/kube-prometheus-stack/60.4.1/rbac/grafana.yaml deleted file mode 100644 index dc1eafd50..000000000 --- a/services/kube-prometheus-stack/60.4.1/rbac/grafana.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: dkp-kube-prometheus-stack-grafana-admin - labels: - rbac.authorization.k8s.io/aggregate-to-admin: "true" -rules: -- nonResourceURLs: - - /dkp/grafana - - /dkp/grafana/* - verbs: - - get - - head - - post - - put - - delete ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: dkp-kube-prometheus-stack-grafana-view - labels: - rbac.authorization.k8s.io/aggregate-to-view: "true" -rules: -- nonResourceURLs: - - /dkp/grafana - - /dkp/grafana/* - - /dkp/grafana/api/datasources/proxy/* - verbs: - - get - - head -- nonResourceURLs: - - /dkp/grafana/api/datasources/proxy/* - - /dkp/grafana/api/ds/query - - /dkp/grafana/api/frontend-metrics - verbs: - - post ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: dkp-kube-prometheus-stack-grafana-edit - labels: - rbac.authorization.k8s.io/aggregate-to-edit: "true" -rules: -- nonResourceURLs: - - /dkp/grafana - - /dkp/grafana/* - verbs: - - get - - head - - post - - put diff --git a/services/kube-prometheus-stack/60.4.1/defaults/cm.yaml b/services/kube-prometheus-stack/63.0.0/defaults/cm.yaml similarity index 99% rename from services/kube-prometheus-stack/60.4.1/defaults/cm.yaml rename to services/kube-prometheus-stack/63.0.0/defaults/cm.yaml index 64fa1974e..5c349d86d 100644 --- a/services/kube-prometheus-stack/60.4.1/defaults/cm.yaml +++ b/services/kube-prometheus-stack/63.0.0/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: kube-prometheus-stack-60.4.1-d2iq-defaults + name: kube-prometheus-stack-63.0.0-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/kube-prometheus-stack/60.4.1/defaults/kustomization.yaml b/services/kube-prometheus-stack/63.0.0/defaults/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/60.4.1/defaults/kustomization.yaml rename to services/kube-prometheus-stack/63.0.0/defaults/kustomization.yaml diff --git a/services/kube-prometheus-stack/60.4.1/etcd-metrics-proxy.yaml b/services/kube-prometheus-stack/63.0.0/etcd-metrics-proxy.yaml similarity index 92% rename from services/kube-prometheus-stack/60.4.1/etcd-metrics-proxy.yaml rename to services/kube-prometheus-stack/63.0.0/etcd-metrics-proxy.yaml index cc481f048..4003a5382 100644 --- a/services/kube-prometheus-stack/60.4.1/etcd-metrics-proxy.yaml +++ b/services/kube-prometheus-stack/63.0.0/etcd-metrics-proxy.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/kube-prometheus-stack/60.4.1/etcd-metrics-proxy + path: ./services/kube-prometheus-stack/63.0.0/etcd-metrics-proxy sourceRef: kind: GitRepository name: management diff --git a/services/kube-prometheus-stack/60.4.1/etcd-metrics-proxy/cert.yaml b/services/kube-prometheus-stack/63.0.0/etcd-metrics-proxy/cert.yaml similarity index 100% rename from services/kube-prometheus-stack/60.4.1/etcd-metrics-proxy/cert.yaml rename to services/kube-prometheus-stack/63.0.0/etcd-metrics-proxy/cert.yaml diff --git a/services/kube-prometheus-stack/60.4.1/etcd-metrics-proxy/client-rbac.yaml b/services/kube-prometheus-stack/63.0.0/etcd-metrics-proxy/client-rbac.yaml similarity index 100% rename from services/kube-prometheus-stack/60.4.1/etcd-metrics-proxy/client-rbac.yaml rename to services/kube-prometheus-stack/63.0.0/etcd-metrics-proxy/client-rbac.yaml diff --git a/services/kube-prometheus-stack/60.4.1/etcd-metrics-proxy/kube-rbac-proxy.yaml b/services/kube-prometheus-stack/63.0.0/etcd-metrics-proxy/kube-rbac-proxy.yaml similarity index 100% rename from services/kube-prometheus-stack/60.4.1/etcd-metrics-proxy/kube-rbac-proxy.yaml rename to services/kube-prometheus-stack/63.0.0/etcd-metrics-proxy/kube-rbac-proxy.yaml diff --git a/services/kube-prometheus-stack/60.4.1/grafana-dashboards/calico.json b/services/kube-prometheus-stack/63.0.0/grafana-dashboards/calico.json similarity index 100% rename from services/kube-prometheus-stack/60.4.1/grafana-dashboards/calico.json rename to services/kube-prometheus-stack/63.0.0/grafana-dashboards/calico.json diff --git a/services/kube-prometheus-stack/60.4.1/grafana-dashboards/controller-runtime.json b/services/kube-prometheus-stack/63.0.0/grafana-dashboards/controller-runtime.json similarity index 100% rename from services/kube-prometheus-stack/60.4.1/grafana-dashboards/controller-runtime.json rename to services/kube-prometheus-stack/63.0.0/grafana-dashboards/controller-runtime.json diff --git a/services/kube-prometheus-stack/60.4.1/grafana-dashboards/flux-cluster-stats.json b/services/kube-prometheus-stack/63.0.0/grafana-dashboards/flux-cluster-stats.json similarity index 100% rename from services/kube-prometheus-stack/60.4.1/grafana-dashboards/flux-cluster-stats.json rename to services/kube-prometheus-stack/63.0.0/grafana-dashboards/flux-cluster-stats.json diff --git a/services/kube-prometheus-stack/60.4.1/grafana-dashboards/flux-control-plane.json b/services/kube-prometheus-stack/63.0.0/grafana-dashboards/flux-control-plane.json similarity index 100% rename from services/kube-prometheus-stack/60.4.1/grafana-dashboards/flux-control-plane.json rename to services/kube-prometheus-stack/63.0.0/grafana-dashboards/flux-control-plane.json diff --git a/services/kube-prometheus-stack/60.4.1/grafana-dashboards/kustomization.yaml b/services/kube-prometheus-stack/63.0.0/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/60.4.1/grafana-dashboards/kustomization.yaml rename to services/kube-prometheus-stack/63.0.0/grafana-dashboards/kustomization.yaml diff --git a/services/kube-prometheus-stack/60.4.1/grafana-dashboards/pv-stats.json b/services/kube-prometheus-stack/63.0.0/grafana-dashboards/pv-stats.json similarity index 100% rename from services/kube-prometheus-stack/60.4.1/grafana-dashboards/pv-stats.json rename to services/kube-prometheus-stack/63.0.0/grafana-dashboards/pv-stats.json diff --git a/services/kube-prometheus-stack/60.4.1/helmrelease.yaml b/services/kube-prometheus-stack/63.0.0/helmrelease.yaml similarity index 93% rename from services/kube-prometheus-stack/60.4.1/helmrelease.yaml rename to services/kube-prometheus-stack/63.0.0/helmrelease.yaml index bf2624e8d..c8f746e0c 100644 --- a/services/kube-prometheus-stack/60.4.1/helmrelease.yaml +++ b/services/kube-prometheus-stack/63.0.0/helmrelease.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/kube-prometheus-stack/60.4.1/helmrelease + path: ./services/kube-prometheus-stack/63.0.0/helmrelease sourceRef: kind: GitRepository name: management diff --git a/services/kube-prometheus-stack/60.4.1/helmrelease/extra-images.txt b/services/kube-prometheus-stack/63.0.0/helmrelease/extra-images.txt similarity index 100% rename from services/kube-prometheus-stack/60.4.1/helmrelease/extra-images.txt rename to services/kube-prometheus-stack/63.0.0/helmrelease/extra-images.txt diff --git a/services/kube-prometheus-stack/60.4.1/helmrelease/kube-prometheus-stack.yaml b/services/kube-prometheus-stack/63.0.0/helmrelease/kube-prometheus-stack.yaml similarity index 96% rename from services/kube-prometheus-stack/60.4.1/helmrelease/kube-prometheus-stack.yaml rename to services/kube-prometheus-stack/63.0.0/helmrelease/kube-prometheus-stack.yaml index f4a5bcb3b..58010ceff 100644 --- a/services/kube-prometheus-stack/60.4.1/helmrelease/kube-prometheus-stack.yaml +++ b/services/kube-prometheus-stack/63.0.0/helmrelease/kube-prometheus-stack.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-charts-staging namespace: kommander-flux - version: 60.4.0 + version: 63.0.0 interval: 15s install: timeout: 5m0s @@ -27,7 +27,7 @@ spec: releaseName: kube-prometheus-stack valuesFrom: - kind: ConfigMap - name: kube-prometheus-stack-60.4.1-d2iq-defaults + name: kube-prometheus-stack-63.0.0-d2iq-defaults - kind: ConfigMap name: kube-prometheus-stack-mgmt-overrides optional: true diff --git a/services/kube-prometheus-stack/60.4.1/helmrelease/kustomization.yaml b/services/kube-prometheus-stack/63.0.0/helmrelease/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/60.4.1/helmrelease/kustomization.yaml rename to services/kube-prometheus-stack/63.0.0/helmrelease/kustomization.yaml diff --git a/services/kube-prometheus-stack/60.4.1/kustomization.yaml b/services/kube-prometheus-stack/63.0.0/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/60.4.1/kustomization.yaml rename to services/kube-prometheus-stack/63.0.0/kustomization.yaml diff --git a/services/kube-prometheus-stack/63.0.0/rbac/alertmanager.yaml b/services/kube-prometheus-stack/63.0.0/rbac/alertmanager.yaml new file mode 100644 index 000000000..0f01e6f6a --- /dev/null +++ b/services/kube-prometheus-stack/63.0.0/rbac/alertmanager.yaml @@ -0,0 +1,40 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: dkp-kube-prometheus-stack-alertmanager-admin +rules: + - nonResourceURLs: + - /dkp/alertmanager + - /dkp/alertmanager/* + verbs: + - get + - head + - post + - put + - delete +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: dkp-kube-prometheus-stack-alertmanager-view +rules: + - nonResourceURLs: + - /dkp/alertmanager + - /dkp/alertmanager/* + verbs: + - get + - head +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: dkp-kube-prometheus-stack-alertmanager-edit +rules: + - nonResourceURLs: + - /dkp/alertmanager + - /dkp/alertmanager/* + verbs: + - get + - head + - post + - put diff --git a/services/kube-prometheus-stack/63.0.0/rbac/grafana.yaml b/services/kube-prometheus-stack/63.0.0/rbac/grafana.yaml new file mode 100644 index 000000000..6408ca373 --- /dev/null +++ b/services/kube-prometheus-stack/63.0.0/rbac/grafana.yaml @@ -0,0 +1,53 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: dkp-kube-prometheus-stack-grafana-admin + labels: + rbac.authorization.k8s.io/aggregate-to-admin: "true" +rules: + - nonResourceURLs: + - /dkp/grafana + - /dkp/grafana/* + verbs: + - get + - head + - post + - put + - delete +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: dkp-kube-prometheus-stack-grafana-view + labels: + rbac.authorization.k8s.io/aggregate-to-view: "true" +rules: + - nonResourceURLs: + - /dkp/grafana + - /dkp/grafana/* + - /dkp/grafana/api/datasources/proxy/* + verbs: + - get + - head + - nonResourceURLs: + - /dkp/grafana/api/datasources/proxy/* + - /dkp/grafana/api/ds/query + - /dkp/grafana/api/frontend-metrics + verbs: + - post +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: dkp-kube-prometheus-stack-grafana-edit + labels: + rbac.authorization.k8s.io/aggregate-to-edit: "true" +rules: + - nonResourceURLs: + - /dkp/grafana + - /dkp/grafana/* + verbs: + - get + - head + - post + - put diff --git a/services/kube-prometheus-stack/60.4.1/rbac/kustomization.yaml b/services/kube-prometheus-stack/63.0.0/rbac/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/60.4.1/rbac/kustomization.yaml rename to services/kube-prometheus-stack/63.0.0/rbac/kustomization.yaml diff --git a/services/kube-prometheus-stack/60.4.1/rbac/prometheus.yaml b/services/kube-prometheus-stack/63.0.0/rbac/prometheus.yaml similarity index 50% rename from services/kube-prometheus-stack/60.4.1/rbac/prometheus.yaml rename to services/kube-prometheus-stack/63.0.0/rbac/prometheus.yaml index 98a59d94d..d3d555bd4 100644 --- a/services/kube-prometheus-stack/60.4.1/rbac/prometheus.yaml +++ b/services/kube-prometheus-stack/63.0.0/rbac/prometheus.yaml @@ -3,38 +3,38 @@ kind: ClusterRole metadata: name: dkp-kube-prometheus-stack-prometheus-admin rules: -- nonResourceURLs: - - /dkp/prometheus - - /dkp/prometheus/* - verbs: - - get - - head - - post - - put - - delete + - nonResourceURLs: + - /dkp/prometheus + - /dkp/prometheus/* + verbs: + - get + - head + - post + - put + - delete --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: dkp-kube-prometheus-stack-prometheus-view rules: -- nonResourceURLs: - - /dkp/prometheus - - /dkp/prometheus/* - verbs: - - get - - head + - nonResourceURLs: + - /dkp/prometheus + - /dkp/prometheus/* + verbs: + - get + - head --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: dkp-kube-prometheus-stack-prometheus-edit rules: -- nonResourceURLs: - - /dkp/prometheus - - /dkp/prometheus/* - verbs: - - get - - head - - post - - put + - nonResourceURLs: + - /dkp/prometheus + - /dkp/prometheus/* + verbs: + - get + - head + - post + - put