diff --git a/helm/core/templates/configmap.yaml b/helm/core/templates/configmap.yaml index a5991981a..abb3b34ed 100644 --- a/helm/core/templates/configmap.yaml +++ b/helm/core/templates/configmap.yaml @@ -9,9 +9,7 @@ accessLogFile: "/dev/stdout" {{- end }} 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 enableAutoMtls: false enablePrometheusMerge: false @@ -99,7 +97,7 @@ metadata: name: higress-config namespace: {{ .Release.Namespace }} labels: - {{- include "gateway.labels" . | nindent 4 }} + {{- include "gateway.labels" . | nindent 4 }} data: higress: |- {{- $existingConfig := lookup "v1" "ConfigMap" .Release.Namespace "higress-config" }} @@ -126,7 +124,7 @@ data: {{- else }} networks: {} {{- end }} - + mesh: |- {{- if .Values.meshConfig }} {{ $mesh | toYaml | indent 4 }} diff --git a/helm/core/values.yaml b/helm/core/values.yaml index 5e605c037..07a2d283a 100644 --- a/helm/core/values.yaml +++ b/helm/core/values.yaml @@ -581,8 +581,7 @@ controller: # -- Labels to apply to the pod podLabels: {} - podSecurityContext: - {} + podSecurityContext: {} # fsGroup: 2000 ports: @@ -709,13 +708,13 @@ tracing: enable: false sampling: 100 timeout: 500 - skywalking: - # access_token: "" - service: "" - port: 11800 + # skywalking: + # access_token: "" + # service: "" + # port: 11800 # zipkin: - # service: "" - # port: 9411 + # service: "" + # port: 9411 # -- Downstream config settings downstream: @@ -787,7 +786,7 @@ pluginServer: # Plugin-server Service configuration service: - port: 80 # Container target port (usually fixed) + port: 80 # Container target port (usually fixed) resources: requests: @@ -795,4 +794,4 @@ pluginServer: memory: 128Mi limits: cpu: 500m - memory: 256Mi \ No newline at end of file + memory: 256Mi diff --git a/helm/higress/README.md b/helm/higress/README.md index cbc25c398..9418e2d24 100644 --- a/helm/higress/README.md +++ b/helm/higress/README.md @@ -306,7 +306,5 @@ The command removes all the Kubernetes components associated with the chart and | revision | string | `""` | | | tracing.enable | bool | `false` | | | tracing.sampling | int | `100` | | -| tracing.skywalking.port | int | `11800` | | -| tracing.skywalking.service | string | `""` | | | tracing.timeout | int | `500` | | | upstream | object | `{"connectionBufferLimits":10485760,"idleTimeout":10}` | Upstream config settings | \ No newline at end of file