Merge branch 'develop' into add-sidecar-volume

sentry-kubernetes · Jul 11, 2024 · f977bb1 · f977bb1
2 parents 3122525 + 6d28480
commit f977bb1
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 9 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Run chart-testing (lint)
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct lint --target-branch ${{ github.event.repository.default_branch }}
+        run: ct lint --target-branch ${{ github.event.repository.default_branch }} --check-version-increment=false
 
       - name: Create kind cluster
         if: steps.list-changed.outputs.changed == 'true'

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1 +1 @@
-{"clickhouse":"3.9.0","sentry":"23.11.0","sentry-kubernetes":"0.3.4"}
+{"charts/clickhouse":"3.10.0","charts/sentry":"23.12.0","charts/sentry-kubernetes":"0.3.4"}
diff --git a/charts/clickhouse/CHANGELOG.md b/charts/clickhouse/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [3.10.0](https://github.com/sentry-kubernetes/charts/compare/clickhouse-v3.9.0...clickhouse-v3.10.0) (2024-07-11)
+
+
+### Features
+
+* **clickhouse:** allow overriding Clickhouse host ([#1356](https://github.com/sentry-kubernetes/charts/issues/1356)) ([bf0aaf3](https://github.com/sentry-kubernetes/charts/commit/bf0aaf346d5363fef2b12e2caee6f4b4750d45fd))
+
 ## [3.9.0](https://github.com/sentry-kubernetes/charts/compare/clickhouse-v3.8.0...clickhouse-v3.9.0) (2024-05-21)
 
 

diff --git a/charts/clickhouse/Chart.yaml b/charts/clickhouse/Chart.yaml
@@ -12,6 +12,6 @@ keywords:
 name: clickhouse
 sources:
   - https://github.com/sentry-kubernetes/charts
-version: 3.9.0
+version: 3.10.0
 maintainers:
   - name: sentry-kubernetes
diff --git a/charts/clickhouse/templates/configmap-config.yaml b/charts/clickhouse/templates/configmap-config.yaml
@@ -21,7 +21,7 @@ data:
         <users_config>users.xml</users_config>
 
         <display_name>{{ template "clickhouse.fullname" . }}</display_name>
-        <listen_host>0.0.0.0</listen_host>
+        <listen_host>{{ .Values.clickhouse.listen_host | default "0.0.0.0" }}</listen_host>
         <http_port>{{ .Values.clickhouse.http_port | default "8123" }}</http_port>
         <tcp_port>{{ .Values.clickhouse.tcp_port | default "9000" }}</tcp_port>
         <interserver_http_port>{{ .Values.clickhouse.interserver_http_port | default "9009" }}</interserver_http_port>

diff --git a/charts/clickhouse/values.yaml b/charts/clickhouse/values.yaml
@@ -118,6 +118,9 @@ clickhouse:
   ## Default value: /var/lib/clickhouse
   path: "/var/lib/clickhouse"
   ##
+  ## The host to listen on
+  listen_host: "0.0.0.0"
+  ##
   ## The port for connecting to the server over HTTP
   http_port: "8123"
   ##

diff --git a/charts/sentry/CHANGELOG.md b/charts/sentry/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [23.12.0](https://github.com/sentry-kubernetes/charts/compare/sentry-v23.11.0...sentry-v23.12.0) (2024-07-11)
+
+
+### Features
+
+* add parameters for web workers TTL ([#1355](https://github.com/sentry-kubernetes/charts/issues/1355)) ([a1b218f](https://github.com/sentry-kubernetes/charts/commit/a1b218f69a8ea20a987e11a94dbf052d5a05d3a8))
+
+
+### Bug Fixes
+
+* remove 'profiling-global-suspect-functions' as it is not supported on self hosted ([#1358](https://github.com/sentry-kubernetes/charts/issues/1358)) ([25004f6](https://github.com/sentry-kubernetes/charts/commit/25004f67e4cba551bb78d5c42af80d2e631c50de))
+
 ## [23.11.0](https://github.com/sentry-kubernetes/charts/compare/sentry-v23.10.0...sentry-v23.11.0) (2024-06-24)
 
 

diff --git a/charts/sentry/Chart.yaml b/charts/sentry/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sentry
 description: A Helm chart for Kubernetes
 type: application
-version: 23.11.1
+version: 23.12.1
 appVersion: 24.5.1
 dependencies:
   - name: memcached

diff --git a/charts/sentry/templates/_helper-sentry.tpl b/charts/sentry/templates/_helper-sentry.tpl
@@ -307,9 +307,9 @@ sentry.conf.py: |-
       # Turn off memory reporting
       "memory-report": False,
       # Some stuff so uwsgi will cycle workers sensibly
-      'max-requests': 100000,
-      'max-requests-delta': 500,
-      'max-worker-lifetime': 86400,
+      'max-requests': {{ .Values.config.web.maxRequests }},
+      'max-requests-delta': {{ .Values.config.web.maxRequestsDelta }},
+      'max-worker-lifetime': {{ .Values.config.web.maxWorkerLifetime }},
       # Duplicate options from sentry default just so we don't get
       # bit by sentry changing a default value that we depend on.
       'thunder-lock': True,
@@ -451,7 +451,6 @@ sentry.conf.py: |-
               "organizations:profiling-using-transactions",
               "organizations:profiling-beta",
               "organizations:profiling-stacktrace-links",
-              "organizations:profiling-global-suspect-functions",
               "organizations:profiling-cpu-chart",
               "organizations:profiling-memory-chart",
               "organizations:profiling-view",

diff --git a/charts/sentry/values.yaml b/charts/sentry/values.yaml
@@ -1729,6 +1729,9 @@ config:
     # No YAML relay config given
   web:
     httpKeepalive: 15
+    maxRequests: 100000
+    maxRequestsDelta: 500
+    maxWorkerLifetime: 86400
 
 clickhouse:
   enabled: true
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"clickhouse":"3.9.0","sentry":"23.11.0","sentry-kubernetes":"0.3.4"}
		{"charts/clickhouse":"3.10.0","charts/sentry":"23.12.0","charts/sentry-kubernetes":"0.3.4"}