jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-05-26 21:57:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(helm): comment tracing.skywalking (#2514)

Browse Source 
Signed-off-by: Xijun Dai <daixijun1990@gmail.com>
Co-authored-by: Se7en <chengzw258@163.com>
This commit is contained in:
Xijun Dai
2025-07-01 22:09:33 +08:00
committed by GitHub
parent 41a1455874
commit 73ba9238bd
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
helm/core/templates/configmap.yaml
View File

@@ -9,9 +9,7 @@
accessLogFile: "/dev/stdout" accessLogFile: "/dev/stdout"
{{- end }} {{- end }}
ingressControllerMode: "OFF" ingressControllerMode: "OFF"
accessLogFormat: '{"ai_log":"%FILTER_STATE(wasm.ai_log:PLAIN)%","authority":"%REQ(X-ENVOY-ORIGINAL-HOST?:AUTHORITY)%","bytes_received":"%BYTES_RECEIVED%","bytes_sent":"%BYTES_SENT%","downstream_local_address":"%DOWNSTREAM_LOCAL_ADDRESS%","downstream_remote_address":"%DOWNSTREAM_REMOTE_ADDRESS%","duration":"%DURATION%","istio_policy_status":"%DYNAMIC_METADATA(istio.mixer:status)%","method":"%REQ(:METHOD)%","path":"%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%","protocol":"%PROTOCOL%","request_id":"%REQ(X-REQUEST-ID)%","requested_server_name":"%REQUESTED_SERVER_NAME%","response_code":"%RESPONSE_CODE%","response_flags":"%RESPONSE_FLAGS%","route_name":"%ROUTE_NAME%","start_time":"%START_TIME%","trace_id":"%REQ(X-B3-TRACEID)%","upstream_cluster":"%UPSTREAM_CLUSTER%","upstream_host":"%UPSTREAM_HOST%","upstream_local_address":"%UPSTREAM_LOCAL_ADDRESS%","upstream_service_time":"%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%","upstream_transport_failure_reason":"%UPSTREAM_TRANSPORT_FAILURE_REASON%","user_agent":"%REQ(USER-AGENT)%","x_forwarded_for":"%REQ(X-FORWARDED-FOR)%","response_code_details":"%RESPONSE_CODE_DETAILS%"} accessLogFormat: '{"ai_log":"%FILTER_STATE(wasm.ai_log:PLAIN)%","authority":"%REQ(X-ENVOY-ORIGINAL-HOST?:AUTHORITY)%","bytes_received":"%BYTES_RECEIVED%","bytes_sent":"%BYTES_SENT%","downstream_local_address":"%DOWNSTREAM_LOCAL_ADDRESS%","downstream_remote_address":"%DOWNSTREAM_REMOTE_ADDRESS%","duration":"%DURATION%","istio_policy_status":"%DYNAMIC_METADATA(istio.mixer:status)%","method":"%REQ(:METHOD)%","path":"%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%","protocol":"%PROTOCOL%","request_id":"%REQ(X-REQUEST-ID)%","requested_server_name":"%REQUESTED_SERVER_NAME%","response_code":"%RESPONSE_CODE%","response_flags":"%RESPONSE_FLAGS%","route_name":"%ROUTE_NAME%","start_time":"%START_TIME%","trace_id":"%REQ(X-B3-TRACEID)%","upstream_cluster":"%UPSTREAM_CLUSTER%","upstream_host":"%UPSTREAM_HOST%","upstream_local_address":"%UPSTREAM_LOCAL_ADDRESS%","upstream_service_time":"%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%","upstream_transport_failure_reason":"%UPSTREAM_TRANSPORT_FAILURE_REASON%","user_agent":"%REQ(USER-AGENT)%","x_forwarded_for":"%REQ(X-FORWARDED-FOR)%","response_code_details":"%RESPONSE_CODE_DETAILS%"}'
'
dnsRefreshRate: 200s dnsRefreshRate: 200s
enableAutoMtls: false enableAutoMtls: false
enablePrometheusMerge: false enablePrometheusMerge: false
@@ -99,7 +97,7 @@ metadata:
name: higress-config name: higress-config
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: labels:
{{- include "gateway.labels" . | nindent 4 }} {{- include "gateway.labels" . | nindent 4 }}
data: data:
higress: |- higress: |-
{{- $existingConfig := lookup "v1" "ConfigMap" .Release.Namespace "higress-config" }} {{- $existingConfig := lookup "v1" "ConfigMap" .Release.Namespace "higress-config" }}
@@ -126,7 +124,7 @@ data:
{{- else }} {{- else }}
networks: {} networks: {}
{{- end }} {{- end }}
mesh: |- mesh: |-
{{- if .Values.meshConfig }} {{- if .Values.meshConfig }}
{{ $mesh | toYaml | indent 4 }} {{ $mesh | toYaml | indent 4 }}

19
helm/core/values.yaml
View File

@@ -581,8 +581,7 @@ controller:
# -- Labels to apply to the pod # -- Labels to apply to the pod
podLabels: {} podLabels: {}
podSecurityContext: podSecurityContext: {}
{}
# fsGroup: 2000 # fsGroup: 2000
ports: ports:
@@ -709,13 +708,13 @@ tracing:
enable: false enable: false
sampling: 100 sampling: 100
timeout: 500 timeout: 500
skywalking: # skywalking:
# access_token: "" # access_token: ""
service: "" # service: ""
port: 11800 # port: 11800
# zipkin: # zipkin:
# service: "" # service: ""
# port: 9411 # port: 9411
# -- Downstream config settings # -- Downstream config settings
downstream: downstream:
@@ -787,7 +786,7 @@ pluginServer:
# Plugin-server Service configuration # Plugin-server Service configuration
service: service:
port: 80 # Container target port (usually fixed) port: 80 # Container target port (usually fixed)
resources: resources:
requests: requests:
@@ -795,4 +794,4 @@ pluginServer:
memory: 128Mi memory: 128Mi
limits: limits:
cpu: 500m cpu: 500m
memory: 256Mi memory: 256Mi

2
helm/higress/README.md
View File

@@ -306,7 +306,5 @@ The command removes all the Kubernetes components associated with the chart and
| revision | string | `""` | | | revision | string | `""` | |
| tracing.enable | bool | `false` | | | tracing.enable | bool | `false` | |
| tracing.sampling | int | `100` | | | tracing.sampling | int | `100` | |
| tracing.skywalking.port | int | `11800` | |
| tracing.skywalking.service | string | `""` | |
| tracing.timeout | int | `500` | | | tracing.timeout | int | `500` | |
| upstream | object | `{"connectionBufferLimits":10485760,"idleTimeout":10}` | Upstream config settings | | upstream | object | `{"connectionBufferLimits":10485760,"idleTimeout":10}` | Upstream config settings |