diff --git a/.github/workflows/ci-scheduled.yaml b/.github/workflows/ci-scheduled.yaml index 1acad0b..c4afa24 100644 --- 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 index 397d8cc..08ad733 100644 --- 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 index fb7e025..225cc1c 100644 --- 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 index 815ba73..7c83197 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -212,6 +212,7 @@ kube-prometheus-stack: ## thanos: logLevel: info + objectStorageConfig: {} thanosService: enabled: true diff --git a/multicluster-config/observer-values-openshift.yaml b/multicluster-config/observer-values-openshift.yaml index bab9a82..3804e39 100644 --- 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 index 807a873..e43f0a1 100644 --- 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 index 27c5a97..f845dbe 100644 --- 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 index 733247f..ff5b896 100644 --- 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