From b2337ae06bc8dd99bc28ca4595ba2f3b7d553a4d Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Mon, 28 Nov 2022 10:18:06 +0100 Subject: [PATCH 1/7] chore: upgrade kube-prometheus-stack to 42.1.0 Signed-off-by: Dominik Rosiek --- deploy/helm/sumologic/Chart.yaml | 2 +- docs/v3-migration-doc.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/deploy/helm/sumologic/Chart.yaml b/deploy/helm/sumologic/Chart.yaml index 30c8ed1f7b..52896b9272 100644 --- a/deploy/helm/sumologic/Chart.yaml +++ b/deploy/helm/sumologic/Chart.yaml @@ -17,7 +17,7 @@ dependencies: repository: https://fluent.github.io/helm-charts condition: fluent-bit.enabled,sumologic.logs.enabled - name: kube-prometheus-stack - version: 39.11.0 + version: 42.1.0 repository: https://prometheus-community.github.io/helm-charts condition: kube-prometheus-stack.enabled,sumologic.metrics.enabled - name: falco diff --git a/docs/v3-migration-doc.md b/docs/v3-migration-doc.md index 7d64263253..121a0c6c4a 100644 --- a/docs/v3-migration-doc.md +++ b/docs/v3-migration-doc.md @@ -89,6 +89,8 @@ Upgrade of kube-prometheus-stack is a breaking change and requires manual steps: Error: UPGRADE FAILED: cannot patch "collection-kube-state-metrics" with kind Deployment: Deployment.apps "collection-kube-state-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app.kubernetes.io/instance":"collection", "app.kubernetes.io/name":"kube-state-metrics"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable ``` +- In case of overriding `image.repository`, please follow the `kube-prometheus-stack` [migration doc][kube-prometheus-stack-image-migration] on that. + ### Replace special configuration values marked by 'replace' suffix Mechanism to replace special configuration values for traces marked by 'replace' suffix was removed and following special values in configuration are no longer automatically replaced and they need to be changed: @@ -118,3 +120,5 @@ If you're using `otelcol` as the logs/metrics metadata provider, please run one kubectl delete sts --namespace=my-namespace --cascade=false my-release-sumologic-otelcol-logs kubectl delete sts --namespace=my-namespace --cascade=false my-release-sumologic-otelcol-metrics ``` + +[kube-prometheus-stack-image-migration]: https://github.com/prometheus-community/helm-charts/tree/kube-prometheus-stack-42.1.0/charts/kube-prometheus-stack#from-41x-to-42x From fb7927b5f9d15b7498951a6d898fcd96a4ab428d Mon Sep 17 00:00:00 2001 From: Dominik Rosiek Date: Mon, 28 Nov 2022 10:19:38 +0100 Subject: [PATCH 2/7] chore: changelog Signed-off-by: Dominik Rosiek --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4fc877fdb..a1272d90d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - fix(setup):allow credentials to not be set if setup is disabled [#2572] - fix(logs): prevent Fluent Bit from doing metadata enrichment [#2512] -- chore(kube-prometheus-stack): update kube-prometheus-stack chart to 39.11.0 [#2446] +- chore(kube-prometheus-stack): update kube-prometheus-stack chart to 42.1.0 [#2446][#2651] - feat(metrics)!: disable Thanos by default [#2514] - fix(fluentd): Removing PodSecurityPolicy for fluentd [#2605] - feat!: refactor event collection configuration [#2444] @@ -85,6 +85,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2626]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2626 [#2622]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2622 [#2643]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2643 +[#2651]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2651 [Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.17.0...main [telegraf_operator_comapare_1.3.5_and_1.3.10]: https://github.com/influxdata/helm-charts/compare/telegraf-operator-1.3.5...telegraf-operator-1.3.10 [cert-manager-1.4]: https://github.com/cert-manager/cert-manager/releases/tag/v1.4.0 From 709bccb0f50b552e7aec005d20c9e09d24c96d3a Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Tue, 29 Nov 2022 08:03:12 +0100 Subject: [PATCH 3/7] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1272d90d9..3677a720a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -85,6 +85,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2626]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2626 [#2622]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2622 [#2643]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2643 +[#2446]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2446 [#2651]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2651 [Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.17.0...main [telegraf_operator_comapare_1.3.5_and_1.3.10]: https://github.com/influxdata/helm-charts/compare/telegraf-operator-1.3.5...telegraf-operator-1.3.10 From a4120f9501eb730245249f7d8c4954feece869c2 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Wed, 30 Nov 2022 11:34:00 +0100 Subject: [PATCH 4/7] Update docs/v3-migration-doc.md --- docs/v3-migration-doc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/v3-migration-doc.md b/docs/v3-migration-doc.md index a243d38d7e..ad78c8c7df 100644 --- a/docs/v3-migration-doc.md +++ b/docs/v3-migration-doc.md @@ -136,7 +136,7 @@ Upgrade of kube-prometheus-stack is a breaking change and requires manual steps: Error: UPGRADE FAILED: cannot patch "collection-kube-state-metrics" with kind Deployment: Deployment.apps "collection-kube-state-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app.kubernetes.io/instance":"collection", "app.kubernetes.io/name":"kube-state-metrics"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable ``` -- In case of overriding `image.repository`, please follow the `kube-prometheus-stack` [migration doc][kube-prometheus-stack-image-migration] on that. +- In case of overriding `kube-prometheus-stack.**.repository`, please follow the `kube-prometheus-stack` [migration doc][kube-prometheus-stack-image-migration] on that. ### Replace special configuration values marked by 'replace' suffix From 2bbc9dbd68830b02034aa4e480e05b9883211825 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Wed, 30 Nov 2022 13:22:45 +0100 Subject: [PATCH 5/7] Update docs/v3-migration-doc.md --- docs/v3-migration-doc.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/v3-migration-doc.md b/docs/v3-migration-doc.md index 4ea65fa2eb..6af5e713a6 100644 --- a/docs/v3-migration-doc.md +++ b/docs/v3-migration-doc.md @@ -141,7 +141,8 @@ Upgrade of kube-prometheus-stack is a breaking change and requires manual steps: Error: UPGRADE FAILED: cannot patch "collection-kube-state-metrics" with kind Deployment: Deployment.apps "collection-kube-state-metrics" is invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app.kubernetes.io/instance":"collection", "app.kubernetes.io/name":"kube-state-metrics"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable ``` -- In case of overriding `kube-prometheus-stack.**.repository`, please follow the `kube-prometheus-stack` [migration doc][kube-prometheus-stack-image-migration] on that. +- In case of overriding any of the `repository` property under the `kube-prometheus-stack` property, + please follow the `kube-prometheus-stack` [migration doc][kube-prometheus-stack-image-migration] on that. ### Replace special configuration values marked by 'replace' suffix From 970470910c56be2c1778a834b2849bdd5cb7343b Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Wed, 30 Nov 2022 13:23:08 +0100 Subject: [PATCH 6/7] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 980679d81b..c9d7b36f87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - fix(setup):allow credentials to not be set if setup is disabled [#2572] - fix(logs): prevent Fluent Bit from doing metadata enrichment [#2512] -- chore(kube-prometheus-stack): update kube-prometheus-stack chart to 42.1.0 [#2446][#2651] +- chore(kube-prometheus-stack): update kube-prometheus-stack chart to 42.1.0 [#2446] [#2651] - feat(metrics)!: disable Thanos by default [#2514] - fix(fluentd): Removing PodSecurityPolicy for fluentd [#2605] - feat!: refactor event collection configuration [#2444] From 2ce1893b6d282e572aa615672015e97e944a4ab1 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Wed, 30 Nov 2022 13:27:10 +0100 Subject: [PATCH 7/7] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9d7b36f87..ae64121b51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -140,7 +140,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2626]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2626 [#2622]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2622 [#2643]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2643 -[#2446]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2446 [#2651]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2651 [#2648]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2648 [#2649]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2649