From 26cb34ea013affde205617a26ca2e086346a44f2 Mon Sep 17 00:00:00 2001 From: Jabar Asadi Date: Fri, 8 Sep 2023 13:06:09 +0200 Subject: [PATCH] feat: Bump kube-prometheus-stack to 46.8.1 --- licenses.d2iq.yaml | 15 +++++++++++++-- services/kommander/0.5.2/defaults/cm.yaml | 2 +- .../{44.2.2 => 46.8.1}/defaults/cm.yaml | 2 +- .../defaults/kustomization.yaml | 0 .../grafana-dashboards/calico.json | 0 .../grafana-dashboards/controller-runtime.json | 0 .../grafana-dashboards/flux-cluster-stats.json | 0 .../grafana-dashboards/flux-control-plane.json | 0 .../grafana-dashboards/kustomization.yaml | 0 .../{44.2.2 => 46.8.1}/helmrelease.yaml | 2 +- .../helmrelease/kube-prometheus-stack.yaml | 6 +++--- .../{44.2.2 => 46.8.1}/kustomization.yaml | 0 .../{44.2.2 => 46.8.1}/pre-upgrade.yaml | 2 +- .../delete-node-exporter-daemonset.yaml | 0 14 files changed, 20 insertions(+), 9 deletions(-) rename services/kube-prometheus-stack/{44.2.2 => 46.8.1}/defaults/cm.yaml (99%) rename services/kube-prometheus-stack/{44.2.2 => 46.8.1}/defaults/kustomization.yaml (100%) rename services/kube-prometheus-stack/{44.2.2 => 46.8.1}/grafana-dashboards/calico.json (100%) rename services/kube-prometheus-stack/{44.2.2 => 46.8.1}/grafana-dashboards/controller-runtime.json (100%) rename services/kube-prometheus-stack/{44.2.2 => 46.8.1}/grafana-dashboards/flux-cluster-stats.json (100%) rename services/kube-prometheus-stack/{44.2.2 => 46.8.1}/grafana-dashboards/flux-control-plane.json (100%) rename services/kube-prometheus-stack/{44.2.2 => 46.8.1}/grafana-dashboards/kustomization.yaml (100%) rename services/kube-prometheus-stack/{44.2.2 => 46.8.1}/helmrelease.yaml (92%) rename services/kube-prometheus-stack/{44.2.2 => 46.8.1}/helmrelease/kube-prometheus-stack.yaml (96%) rename services/kube-prometheus-stack/{44.2.2 => 46.8.1}/kustomization.yaml (100%) rename services/kube-prometheus-stack/{44.2.2 => 46.8.1}/pre-upgrade.yaml (91%) rename services/kube-prometheus-stack/{44.2.2 => 46.8.1}/pre-upgrade/delete-node-exporter-daemonset.yaml (100%) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index bd96ab5b8..87167d1a5 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -76,6 +76,12 @@ resources: ref: v${image_tag} license_path: LICENSE notice_path: NOTICE.md + - container_image: docker.io/grafana/grafana:9.5.5 + sources: + - url: https://github.com/grafana/grafana + ref: v${image_tag} + license_path: LICENSE + notice_path: NOTICE.md - container_image: docker.io/grafana/loki:2.7.3 sources: - url: https://github.com/grafana/loki @@ -330,6 +336,11 @@ resources: - url: https://github.com/kiwigrid/k8s-sidecar ref: ${image_tag} license_path: LICENSE + - container_image: quay.io/kiwigrid/k8s-sidecar:1.24.3 + sources: + - url: https://github.com/kiwigrid/k8s-sidecar + ref: ${image_tag} + license_path: LICENSE - container_image: quay.io/kubernetes-multicluster/kubefed:v0.10.0 sources: - url: https://github.com/kubernetes-sigs/kubefed @@ -340,7 +351,7 @@ resources: - url: https://github.com/kubernetes-retired/external-storage ref: nfs-provisioner-${image_tag} license_path: LICENSE - - container_image: quay.io/prometheus-operator/prometheus-operator:v0.62.0 + - container_image: quay.io/prometheus-operator/prometheus-operator:v0.65.2 sources: - url: https://github.com/prometheus-operator/prometheus-operator ref: ${image_tag} @@ -374,7 +385,7 @@ resources: - url: https://github.com/kubernetes/kube-state-metrics ref: ${image_tag} license_path: LICENSE - - container_image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.7.0 + - container_image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.9.2 sources: - url: https://github.com/kubernetes/kube-state-metrics ref: ${image_tag} diff --git a/services/kommander/0.5.2/defaults/cm.yaml b/services/kommander/0.5.2/defaults/cm.yaml index c59f941d9..b38770243 100644 --- a/services/kommander/0.5.2/defaults/cm.yaml +++ b/services/kommander/0.5.2/defaults/cm.yaml @@ -107,7 +107,7 @@ data: traefik: "20.8.0" kubernetes-dashboard: "6.0.0" kubecost: "0.33.2" - kube-prometheus-stack: "44.2.2" + kube-prometheus-stack: "46.8.1" prometheus-adapter: "4.0.2" prometheus-thanos-traefik: "0.0.1" kubecost-thanos-traefik: "0.0.1" diff --git a/services/kube-prometheus-stack/44.2.2/defaults/cm.yaml b/services/kube-prometheus-stack/46.8.1/defaults/cm.yaml similarity index 99% rename from services/kube-prometheus-stack/44.2.2/defaults/cm.yaml rename to services/kube-prometheus-stack/46.8.1/defaults/cm.yaml index 945a19dea..5307372d0 100644 --- a/services/kube-prometheus-stack/44.2.2/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-44.2.2-d2iq-defaults + name: kube-prometheus-stack-46.8.1-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | diff --git a/services/kube-prometheus-stack/44.2.2/defaults/kustomization.yaml b/services/kube-prometheus-stack/46.8.1/defaults/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/44.2.2/defaults/kustomization.yaml rename to services/kube-prometheus-stack/46.8.1/defaults/kustomization.yaml diff --git a/services/kube-prometheus-stack/44.2.2/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/44.2.2/grafana-dashboards/calico.json rename to services/kube-prometheus-stack/46.8.1/grafana-dashboards/calico.json diff --git a/services/kube-prometheus-stack/44.2.2/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/44.2.2/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/44.2.2/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/44.2.2/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/44.2.2/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/44.2.2/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/44.2.2/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/44.2.2/grafana-dashboards/kustomization.yaml rename to services/kube-prometheus-stack/46.8.1/grafana-dashboards/kustomization.yaml diff --git a/services/kube-prometheus-stack/44.2.2/helmrelease.yaml b/services/kube-prometheus-stack/46.8.1/helmrelease.yaml similarity index 92% rename from services/kube-prometheus-stack/44.2.2/helmrelease.yaml rename to services/kube-prometheus-stack/46.8.1/helmrelease.yaml index 0af61d4b1..e6cdcae62 100644 --- a/services/kube-prometheus-stack/44.2.2/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/44.2.2/helmrelease + path: ./services/kube-prometheus-stack/46.8.1/helmrelease dependsOn: - name: kube-prometheus-stack-pre-upgrade sourceRef: diff --git a/services/kube-prometheus-stack/44.2.2/helmrelease/kube-prometheus-stack.yaml b/services/kube-prometheus-stack/46.8.1/helmrelease/kube-prometheus-stack.yaml similarity index 96% rename from services/kube-prometheus-stack/44.2.2/helmrelease/kube-prometheus-stack.yaml rename to services/kube-prometheus-stack/46.8.1/helmrelease/kube-prometheus-stack.yaml index fea0ce2f9..aa032f7a8 100644 --- a/services/kube-prometheus-stack/44.2.2/helmrelease/kube-prometheus-stack.yaml +++ b/services/kube-prometheus-stack/46.8.1/helmrelease/kube-prometheus-stack.yaml @@ -14,7 +14,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-charts-staging namespace: kommander-flux - version: 44.2.1 + version: 46.8.1 interval: 15s install: timeout: 5m0s @@ -30,7 +30,7 @@ spec: releaseName: kube-prometheus-stack valuesFrom: - kind: ConfigMap - name: kube-prometheus-stack-44.2.2-d2iq-defaults + name: kube-prometheus-stack-46.8.1-d2iq-defaults - kind: ConfigMap name: kube-prometheus-stack-mgmt-overrides optional: true @@ -80,4 +80,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.3.1" + version: "9.5.5" diff --git a/services/kube-prometheus-stack/44.2.2/kustomization.yaml b/services/kube-prometheus-stack/46.8.1/kustomization.yaml similarity index 100% rename from services/kube-prometheus-stack/44.2.2/kustomization.yaml rename to services/kube-prometheus-stack/46.8.1/kustomization.yaml diff --git a/services/kube-prometheus-stack/44.2.2/pre-upgrade.yaml b/services/kube-prometheus-stack/46.8.1/pre-upgrade.yaml similarity index 91% rename from services/kube-prometheus-stack/44.2.2/pre-upgrade.yaml rename to services/kube-prometheus-stack/46.8.1/pre-upgrade.yaml index fa0a21419..123bc8138 100644 --- a/services/kube-prometheus-stack/44.2.2/pre-upgrade.yaml +++ b/services/kube-prometheus-stack/46.8.1/pre-upgrade.yaml @@ -9,7 +9,7 @@ spec: wait: true interval: 6h retryInterval: 1m - path: ./services/kube-prometheus-stack/44.2.2/pre-upgrade + path: ./services/kube-prometheus-stack/46.8.1/pre-upgrade sourceRef: kind: GitRepository name: management diff --git a/services/kube-prometheus-stack/44.2.2/pre-upgrade/delete-node-exporter-daemonset.yaml b/services/kube-prometheus-stack/46.8.1/pre-upgrade/delete-node-exporter-daemonset.yaml similarity index 100% rename from services/kube-prometheus-stack/44.2.2/pre-upgrade/delete-node-exporter-daemonset.yaml rename to services/kube-prometheus-stack/46.8.1/pre-upgrade/delete-node-exporter-daemonset.yaml