Upgrade kube-prometheus-stack

Signed-off-by: Roman Hros <[email protected]>
dNationCloud · Nov 13, 2023 · c7cb97c · c7cb97c
1 parent 6a165c3
commit c7cb97c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 18 deletions.
diff --git a/.github/workflows/ci-scheduled.yaml b/.github/workflows/ci-scheduled.yaml
@@ -28,10 +28,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - k8s-version: v1.17.5
-            stack-version: v1.3
-          - k8s-version: v1.18.8
-            stack-version: v1.3
           - k8s-version: v1.19.7
             stack-version: v1.3
           - k8s-version: v1.20.2

diff --git a/README.md b/README.md
@@ -48,8 +48,6 @@ If you're experiencing issues please read the [documentation](https://dnationclo
 
 ||dNation monitoring v1.3|dNation monitoring v1.4|dNation monitoring v2.0|dNation monitoring v2.3|dNation monitoring v2.5|
 |-|-|-|-|-|-|
-|Kubernetes v1.17|✓|||||
-|Kubernetes v1.18|✓|||||
 |Kubernetes v1.19|✓|||||
 |Kubernetes v1.20|✓|||||
 |Kubernetes v1.21||✓|✓|||

diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -15,7 +15,7 @@
 
 apiVersion: v2
 name: dnation-kubernetes-monitoring-stack
-version: 3.2.0
+version: 3.3.0
 appVersion: 2.5.3  # dnation-kubernetes-monitoring
 description: An umbrella helm chart for Kubernetes monitoring based on kube-prometheus-stack, thanos, loki, loki-distributed, promtail and dnation-kubernetes-monitoring.
 keywords:
@@ -33,7 +33,7 @@ sources:
 - https://github.com/dNationCloud/kubernetes-monitoring-stack
 dependencies:
 - name: kube-prometheus-stack
-  version: "45.10.*"
+  version: "53.0.*"
   repository: https://prometheus-community.github.io/helm-charts
   condition: kube-prometheus-stack.enabled
 - name: thanos

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -212,6 +212,7 @@ kube-prometheus-stack:
       ##
       thanos:
         logLevel: info
+        objectStorageConfig: {}
     thanosService:
       enabled: true
 
@@ -275,6 +276,7 @@ kube-prometheus-stack:
     ## Define security context of grafana container
     ##
     securityContext:
+      runAsNonRoot: false
       runAsUser: 0
       runAsGroup: 0
       fsGroup: 0
@@ -312,9 +314,8 @@ kube-prometheus-stack:
         provider:
           name: 'dNation'
           folder: 'dNation'
-          disableDeletion: false
+          disableDelete: false
           allowUiUpdates: true
-          editable: true
       datasources:
         label: grafana_datasource
         defaultDatasourceEnabled: false

diff --git a/multicluster-config/observer-values-openshift.yaml b/multicluster-config/observer-values-openshift.yaml
@@ -156,8 +156,9 @@ kube-prometheus-stack:
       replicas: 2
       thanos:
         objectStorageConfig:
-          name: thanos-objstore-config
-          key: objstore.yml
+          existingSecret:
+            name: thanos-objstore-config
+            key: objstore.yml
     thanosService:
       enabled: true
 

diff --git a/multicluster-config/observer-values.yaml b/multicluster-config/observer-values.yaml
@@ -134,7 +134,8 @@ kube-prometheus-stack:
       replicas: 2
       thanos:
         objectStorageConfig:
-          name: thanos-objstore-config
-          key: objstore.yml
+          existingSecret:
+            name: thanos-objstore-config
+            key: objstore.yml
     thanosService:
       enabled: true
diff --git a/multicluster-config/workload-values-openshift.yaml b/multicluster-config/workload-values-openshift.yaml
@@ -62,8 +62,9 @@ kube-prometheus-stack:
       replicas: 2
       thanos:
         objectStorageConfig:
-          name: thanos-objstore-config
-          key: objstore.yml
+          existingSecret:
+            name: thanos-objstore-config
+            key: objstore.yml
     thanosService:
       enabled: true
 

diff --git a/multicluster-config/workload-values.yaml b/multicluster-config/workload-values.yaml
@@ -44,8 +44,9 @@ kube-prometheus-stack:
       replicas: 2
       thanos:
         objectStorageConfig:
-          name: thanos-objstore-config
-          key: objstore.yml
+          existingSecret:
+            name: thanos-objstore-config
+            key: objstore.yml
     thanosService:
       enabled: true