From 151e1e3b35629b9a930a1b98eff9fb2c0b7e986e Mon Sep 17 00:00:00 2001 From: Jabar Asadi Date: Fri, 8 Sep 2023 11:07:04 +0200 Subject: [PATCH] feat: Bump kube-prometheus-stack to 46.8.1 --- licenses.d2iq.yaml | 19 +++++++++++++++---- .../{46.8.0 => 46.8.1}/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 .../{46.8.0 => 46.8.1}/helmrelease.yaml | 2 +- .../helmrelease/extra-images.txt | 0 .../helmrelease/kube-prometheus-stack.yaml | 6 +++--- .../helmrelease/kustomization.yaml | 0 .../{46.8.0 => 46.8.1}/kustomization.yaml | 0 17 files changed, 21 insertions(+), 10 deletions(-) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/defaults/cm.yaml (99%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/defaults/kustomization.yaml (100%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/etcd-metrics-proxy.yaml (92%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/etcd-metrics-proxy/cert.yaml (100%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/etcd-metrics-proxy/client-rbac.yaml (100%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/etcd-metrics-proxy/kube-rbac-proxy.yaml (100%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/grafana-dashboards/calico.json (100%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/grafana-dashboards/controller-runtime.json (100%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/grafana-dashboards/flux-cluster-stats.json (100%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/grafana-dashboards/flux-control-plane.json (100%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/grafana-dashboards/kustomization.yaml (100%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/helmrelease.yaml (91%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/helmrelease/extra-images.txt (100%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/helmrelease/kube-prometheus-stack.yaml (95%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/helmrelease/kustomization.yaml (100%) rename services/kube-prometheus-stack/{46.8.0 => 46.8.1}/kustomization.yaml (100%) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index d638b31aae..ddca45d0ce 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -112,6 +112,12 @@ resources: notice_path: NOTICE.md ref: v${image_tag} url: https://github.com/grafana/grafana + - container_image: docker.io/grafana/grafana:10.0.3 + sources: + - license_path: LICENSE + notice_path: NOTICE.md + ref: v${image_tag} + url: https://github.com/grafana/grafana - container_image: docker.io/grafana/loki:2.8.2 sources: - license_path: LICENSE @@ -533,6 +539,11 @@ resources: - license_path: LICENSE ref: ${image_tag} url: https://github.com/kiwigrid/k8s-sidecar + - container_image: quay.io/kiwigrid/k8s-sidecar:1.24.6 + sources: + - license_path: LICENSE + ref: ${image_tag} + url: https://github.com/kiwigrid/k8s-sidecar - container_image: quay.io/kubernetes-multicluster/kubefed:v0.9.1 sources: - license_path: LICENSE @@ -543,13 +554,13 @@ resources: - license_path: LICENSE ref: nfs-provisioner-${image_tag} url: https://github.com/kubernetes-retired/external-storage - - container_image: quay.io/prometheus-operator/prometheus-config-reloader:v0.65.2 + - container_image: quay.io/prometheus-operator/prometheus-config-reloader:v0.66.0 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.65.2 + - container_image: quay.io/prometheus-operator/prometheus-operator:v0.66.0 sources: - license_path: LICENSE notice_path: NOTICE @@ -567,7 +578,7 @@ resources: notice_path: NOTICE ref: ${image_tag} url: https://github.com/prometheus/alertmanager - - container_image: quay.io/prometheus/node-exporter:v1.5.0 + - container_image: quay.io/prometheus/node-exporter:v1.6.0 sources: - license_path: LICENSE notice_path: NOTICE @@ -579,7 +590,7 @@ resources: notice_path: NOTICE ref: ${image_tag} url: https://github.com/prometheus/prometheus - - container_image: quay.io/prometheus/prometheus:v2.44.0 + - container_image: quay.io/prometheus/prometheus:v2.45.0 sources: - license_path: LICENSE notice_path: NOTICE diff --git a/services/kube-prometheus-stack/46.8.0/defaults/cm.yaml b/services/kube-prometheus-stack/46.8.1/defaults/cm.yaml similarity index 99% rename from services/kube-prometheus-stack/46.8.0/defaults/cm.yaml rename to services/kube-prometheus-stack/46.8.1/defaults/cm.yaml index 455a89e153..350db22987 100644 --- a/services/kube-prometheus-stack/46.8.0/defaults/cm.yaml +++ b/services/kube-prometheus-stack/46.8.1/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: kube-prometheus-stack-46.8.0-d2iq-defaults + name: kube-prometheus-stack-46.8.1-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/kube-prometheus-stack/46.8.0/defaults/kustomization.yaml b/services/kube-prometheus-stack/46.8.1/defaults/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/defaults/kustomization.yaml rename to services/kube-prometheus-stack/46.8.1/defaults/kustomization.yaml diff --git a/services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy.yaml b/services/kube-prometheus-stack/46.8.1/etcd-metrics-proxy.yaml similarity index 92% rename from services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy.yaml rename to services/kube-prometheus-stack/46.8.1/etcd-metrics-proxy.yaml index 8882afa31d..44042bb5b7 100644 --- a/services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy.yaml +++ b/services/kube-prometheus-stack/46.8.1/etcd-metrics-proxy.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy + path: ./services/kube-prometheus-stack/46.8.1/etcd-metrics-proxy sourceRef: kind: GitRepository name: management diff --git a/services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/cert.yaml b/services/kube-prometheus-stack/46.8.1/etcd-metrics-proxy/cert.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/cert.yaml rename to services/kube-prometheus-stack/46.8.1/etcd-metrics-proxy/cert.yaml diff --git a/services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/client-rbac.yaml b/services/kube-prometheus-stack/46.8.1/etcd-metrics-proxy/client-rbac.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/client-rbac.yaml rename to services/kube-prometheus-stack/46.8.1/etcd-metrics-proxy/client-rbac.yaml diff --git a/services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/kube-rbac-proxy.yaml b/services/kube-prometheus-stack/46.8.1/etcd-metrics-proxy/kube-rbac-proxy.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/etcd-metrics-proxy/kube-rbac-proxy.yaml rename to services/kube-prometheus-stack/46.8.1/etcd-metrics-proxy/kube-rbac-proxy.yaml diff --git a/services/kube-prometheus-stack/46.8.0/grafana-dashboards/calico.json b/services/kube-prometheus-stack/46.8.1/grafana-dashboards/calico.json similarity index 100% rename from services/kube-prometheus-stack/46.8.0/grafana-dashboards/calico.json rename to services/kube-prometheus-stack/46.8.1/grafana-dashboards/calico.json diff --git a/services/kube-prometheus-stack/46.8.0/grafana-dashboards/controller-runtime.json b/services/kube-prometheus-stack/46.8.1/grafana-dashboards/controller-runtime.json similarity index 100% rename from services/kube-prometheus-stack/46.8.0/grafana-dashboards/controller-runtime.json rename to services/kube-prometheus-stack/46.8.1/grafana-dashboards/controller-runtime.json diff --git a/services/kube-prometheus-stack/46.8.0/grafana-dashboards/flux-cluster-stats.json b/services/kube-prometheus-stack/46.8.1/grafana-dashboards/flux-cluster-stats.json similarity index 100% rename from services/kube-prometheus-stack/46.8.0/grafana-dashboards/flux-cluster-stats.json rename to services/kube-prometheus-stack/46.8.1/grafana-dashboards/flux-cluster-stats.json diff --git a/services/kube-prometheus-stack/46.8.0/grafana-dashboards/flux-control-plane.json b/services/kube-prometheus-stack/46.8.1/grafana-dashboards/flux-control-plane.json similarity index 100% rename from services/kube-prometheus-stack/46.8.0/grafana-dashboards/flux-control-plane.json rename to services/kube-prometheus-stack/46.8.1/grafana-dashboards/flux-control-plane.json diff --git a/services/kube-prometheus-stack/46.8.0/grafana-dashboards/kustomization.yaml b/services/kube-prometheus-stack/46.8.1/grafana-dashboards/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/grafana-dashboards/kustomization.yaml rename to services/kube-prometheus-stack/46.8.1/grafana-dashboards/kustomization.yaml diff --git a/services/kube-prometheus-stack/46.8.0/helmrelease.yaml b/services/kube-prometheus-stack/46.8.1/helmrelease.yaml similarity index 91% rename from services/kube-prometheus-stack/46.8.0/helmrelease.yaml rename to services/kube-prometheus-stack/46.8.1/helmrelease.yaml index d4676f7c65..efbde6d170 100644 --- a/services/kube-prometheus-stack/46.8.0/helmrelease.yaml +++ b/services/kube-prometheus-stack/46.8.1/helmrelease.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/kube-prometheus-stack/46.8.0/helmrelease + path: ./services/kube-prometheus-stack/46.8.1/helmrelease sourceRef: kind: GitRepository name: management diff --git a/services/kube-prometheus-stack/46.8.0/helmrelease/extra-images.txt b/services/kube-prometheus-stack/46.8.1/helmrelease/extra-images.txt similarity index 100% rename from services/kube-prometheus-stack/46.8.0/helmrelease/extra-images.txt rename to services/kube-prometheus-stack/46.8.1/helmrelease/extra-images.txt diff --git a/services/kube-prometheus-stack/46.8.0/helmrelease/kube-prometheus-stack.yaml b/services/kube-prometheus-stack/46.8.1/helmrelease/kube-prometheus-stack.yaml similarity index 95% rename from services/kube-prometheus-stack/46.8.0/helmrelease/kube-prometheus-stack.yaml rename to services/kube-prometheus-stack/46.8.1/helmrelease/kube-prometheus-stack.yaml index e29a45ad99..20871e51b4 100644 --- a/services/kube-prometheus-stack/46.8.0/helmrelease/kube-prometheus-stack.yaml +++ b/services/kube-prometheus-stack/46.8.1/helmrelease/kube-prometheus-stack.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-charts-staging namespace: kommander-flux - version: 46.8.0 + version: 46.8.1 interval: 15s install: timeout: 5m0s @@ -27,7 +27,7 @@ spec: releaseName: kube-prometheus-stack valuesFrom: - kind: ConfigMap - name: kube-prometheus-stack-46.8.0-d2iq-defaults + name: kube-prometheus-stack-46.8.1-d2iq-defaults - kind: ConfigMap name: kube-prometheus-stack-mgmt-overrides optional: true @@ -77,4 +77,4 @@ data: # Since Grafana is a subchart of kube-prometheus-stack, get the version of the Grafana chart dependency at: # https://github.com/mesosphere/charts/tree/master/staging/kube-prometheus-stack/charts # Then, check https://artifacthub.io/packages/helm/grafana/grafana/ for app version - version: "9.5.3" + version: "9.5.5" diff --git a/services/kube-prometheus-stack/46.8.0/helmrelease/kustomization.yaml b/services/kube-prometheus-stack/46.8.1/helmrelease/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/helmrelease/kustomization.yaml rename to services/kube-prometheus-stack/46.8.1/helmrelease/kustomization.yaml diff --git a/services/kube-prometheus-stack/46.8.0/kustomization.yaml b/services/kube-prometheus-stack/46.8.1/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/46.8.0/kustomization.yaml rename to services/kube-prometheus-stack/46.8.1/kustomization.yaml