From daa83305d5cacf8659e1613ecaaeb86a8de8f2cb Mon Sep 17 00:00:00 2001 From: Katarzyna Kujawa Date: Fri, 29 Mar 2024 10:27:49 +0100 Subject: [PATCH 1/2] chore: prepare 4.6.1 release --- .changelog/3618.fixed.txt | 1 - CHANGELOG.md | 11 +++++++++++ deploy/README.md | 2 +- deploy/helm/sumologic/Chart.yaml | 4 ++-- docs/README.md | 4 ++-- 5 files changed, 16 insertions(+), 6 deletions(-) delete mode 100644 .changelog/3618.fixed.txt diff --git a/.changelog/3618.fixed.txt b/.changelog/3618.fixed.txt deleted file mode 100644 index e16aac4efe..0000000000 --- a/.changelog/3618.fixed.txt +++ /dev/null @@ -1 +0,0 @@ -fix(metrics): use namespaceSelector from configuration for additionalServiceMonitors \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index d9948e874c..80ba5579bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +## [v4.6.1] + +### Released 2024-03-29 + +### Fixed + +- fix(metrics): use namespaceSelector from configuration for additionalServiceMonitors [#3618] + +[#3618]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/3618 +[v4.6.1]: https://github.com/SumoLogic/sumologic-kubernetes-collection/releases/v4.6.1 + ## [v4.6.0] ### Released 2024-03-27 diff --git a/deploy/README.md b/deploy/README.md index 45ef0cbbff..75a2ea948d 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -1,3 +1,3 @@ -# Deployment Guide for unreleased version +# Deployment Guide for v4.6 Moved to [/docs/README.md](/docs/README.md) diff --git a/deploy/helm/sumologic/Chart.yaml b/deploy/helm/sumologic/Chart.yaml index af59b7788c..f8c6abb62e 100644 --- a/deploy/helm/sumologic/Chart.yaml +++ b/deploy/helm/sumologic/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: sumologic -version: 4.6.0 -appVersion: 4.6.0 +version: 4.6.1 +appVersion: 4.6.1 description: A Helm chart for collecting Kubernetes logs, metrics, traces and events into Sumo Logic. type: application keywords: diff --git a/docs/README.md b/docs/README.md index 0414aae06c..b73fbba50c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,10 +1,10 @@ -# Deployment Guide for 4.6 +# Deployment Guide for v4.6 This page has instructions for collecting Kubernetes logs, metrics, and events; enriching them with deployment, pod, and service level metadata; and sending them to Sumo Logic. See our [documentation guide](https://help.sumologic.com/docs/observability/kubernetes/) for details on our Kubernetes Solution. -- [Deployment Guide for unreleased version](#deployment-guide-for-unreleased-version) +- [Deployment Guide for v4.6](#deployment-guide-for-v46) - [Solution overview](#solution-overview) - [Log Collection](#log-collection) - [Metrics Collection](#metrics-collection) From fd8f29fb53234b4c9b56f184f65eb66cdebedbfe Mon Sep 17 00:00:00 2001 From: Katarzyna Kujawa Date: Fri, 29 Mar 2024 13:08:29 +0100 Subject: [PATCH 2/2] fix(test): get rid of unsafe regular expression for chart version replacing --- tests/helm/goldenfile_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/helm/goldenfile_test.go b/tests/helm/goldenfile_test.go index 1a285500ee..8a83755a63 100644 --- a/tests/helm/goldenfile_test.go +++ b/tests/helm/goldenfile_test.go @@ -132,10 +132,10 @@ func runGoldenFileTest(t *testing.T, valuesFileName string, outputFileName strin // expected templates func fixupRenderedYaml(yaml string, chartVersion string) string { checksumRegex := regexp.MustCompile("checksum/config: [a-z0-9]{64}") - chartsRegex := regexp.MustCompile("([^kubernetes-setup:])" + chartVersion) + output := yaml output = strings.ReplaceAll(output, releaseName, "RELEASE-NAME") - output = chartsRegex.ReplaceAllString(output, "$1%CURRENT_CHART_VERSION%") + output = strings.ReplaceAll(output, chartVersion, "%CURRENT_CHART_VERSION%") output = checksumRegex.ReplaceAllLiteralString(output, "checksum/config: '%CONFIG_CHECKSUM%'") output = strings.TrimSuffix(output, "\n") return output