From 20dfc3d64f502843ae23d38eaece87969c4dc97c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B0=8Fhao?= <44084348+hzhswyz@users.noreply.github.com> Date: Sun, 30 Mar 2025 10:41:01 +0800 Subject: [PATCH] fix inclusionRegexps not working (#1972) --- helm/core/templates/configmap.yaml | 2 +- helm/core/values.yaml | 5 +++++ helm/higress/README.md | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/helm/core/templates/configmap.yaml b/helm/core/templates/configmap.yaml index 21e15a1f1..a5991981a 100644 --- a/helm/core/templates/configmap.yaml +++ b/helm/core/templates/configmap.yaml @@ -85,7 +85,7 @@ {{- end }} proxyStatsMatcher: inclusionRegexps: - - ".*" +{{ toYaml .Values.global.proxy.proxyStatsMatcher.inclusionRegexps | indent 8 }} {{- end }} {{/* We take the mesh config above, defined with individual values.yaml, and merge with .Values.meshConfig */}} diff --git a/helm/core/values.yaml b/helm/core/values.yaml index d4fdff6eb..0c6ead3a5 100644 --- a/helm/core/values.yaml +++ b/helm/core/values.yaml @@ -199,6 +199,11 @@ global: # -- Controls if sidecar is injected at the front of the container list and blocks the start of the other containers until the proxy is ready holdApplicationUntilProxyStarts: false + # -- Proxy stats name regexps matcher for inclusion + proxyStatsMatcher: + inclusionRegexps: + - ".*" + proxy_init: # -- Base name for the proxy_init container, used to configure iptables. image: proxyv2 diff --git a/helm/higress/README.md b/helm/higress/README.md index 2cecaa91f..2f261d770 100644 --- a/helm/higress/README.md +++ b/helm/higress/README.md @@ -211,6 +211,7 @@ The command removes all the Kubernetes components associated with the chart and | global.proxy.includeOutboundPorts | string | `""` | | | global.proxy.logLevel | string | `"warning"` | Log level for proxy, applies to gateways and sidecars. Expected values are: trace|debug|info|warning|error|critical|off | | global.proxy.privileged | bool | `false` | If set to true, istio-proxy container will have privileged securityContext | +| global.proxy.proxyStatsMatcher | object | `{"inclusionRegexps":[".*"]}` | Proxy stats name regexps matcher for inclusion | | global.proxy.readinessFailureThreshold | int | `30` | The number of successive failed probes before indicating readiness failure. | | global.proxy.readinessInitialDelaySeconds | int | `1` | The initial delay for readiness probes in seconds. | | global.proxy.readinessPeriodSeconds | int | `2` | The period between readiness probes. |