diff --git a/Makefile.core.mk b/Makefile.core.mk index 9184e3fa9e..6a93c5b874 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -187,8 +187,8 @@ install: pre-install cd helm/higress; helm dependency build helm install higress helm/higress -n higress-system --create-namespace --set 'global.local=true' -ENVOY_LATEST_IMAGE_TAG ?= 2.0.3 -ISTIO_LATEST_IMAGE_TAG ?= 3f5da17d5ac809abbd88df38dcdb0ab84ed314e9 +ENVOY_LATEST_IMAGE_TAG ?= 958467a353d411ae3f06e03b096bfd342cddb2c6 +ISTIO_LATEST_IMAGE_TAG ?= 958467a353d411ae3f06e03b096bfd342cddb2c6 install-dev: pre-install helm install higress helm/core -n higress-system --create-namespace --set 'controller.tag=$(TAG)' --set 'gateway.replicas=1' --set 'pilot.tag=$(ISTIO_LATEST_IMAGE_TAG)' --set 'gateway.tag=$(ENVOY_LATEST_IMAGE_TAG)' --set 'global.local=true' diff --git a/helm/core/templates/controller-deployment.yaml b/helm/core/templates/controller-deployment.yaml index ff30b856fe..84a7411435 100644 --- a/helm/core/templates/controller-deployment.yaml +++ b/helm/core/templates/controller-deployment.yaml @@ -136,6 +136,8 @@ spec: periodSeconds: 3 timeoutSeconds: 5 env: + - name: PILOT_ENABLE_LDS_CACHE + valvue: "{{ .Values.global.enableLDSCache }}" - name: PILOT_ENABLE_QUIC_LISTENERS value: "true" - name: VALIDATION_WEBHOOK_CONFIG_NAME diff --git a/helm/core/values.yaml b/helm/core/values.yaml index 5377d206c6..936ec62fbb 100644 --- a/helm/core/values.yaml +++ b/helm/core/values.yaml @@ -3,7 +3,8 @@ global: enableH3: false enableIPv6: false enableProxyProtocol: false - liteMetrics: true + enableLDSCache: true + liteMetrics: false xdsMaxRecvMsgSize: "104857600" defaultUpstreamConcurrencyThreshold: 10000 enableSRDS: true diff --git a/helm/higress/README.md b/helm/higress/README.md index b1283d59cc..fa6980494b 100644 --- a/helm/higress/README.md +++ b/helm/higress/README.md @@ -162,6 +162,7 @@ The command removes all the Kubernetes components associated with the chart and | global.enableH3 | bool | `false` | | | global.enableIPv6 | bool | `false` | | | global.enableIstioAPI | bool | `true` | If true, Higress Controller will monitor istio resources as well | +| global.enableLDSCache | bool | `true` | | | global.enableProxyProtocol | bool | `false` | | | global.enableSRDS | bool | `true` | | | global.enableStatus | bool | `true` | If true, Higress Controller will update the status field of Ingress resources. When migrating from Nginx Ingress, in order to avoid status field of Ingress objects being overwritten, this parameter needs to be set to false, so Higress won't write the entry IP to the status field of the corresponding Ingress object. | @@ -175,7 +176,7 @@ The command removes all the Kubernetes components associated with the chart and | global.istiod | object | `{"enableAnalysis":false}` | Enabled by default in master for maximising testing. | | global.jwtPolicy | string | `"third-party-jwt"` | Configure the policy for validating JWT. Currently, two options are supported: "third-party-jwt" and "first-party-jwt". | | global.kind | bool | `false` | | -| global.liteMetrics | bool | `true` | | +| global.liteMetrics | bool | `false` | | | global.local | bool | `false` | When deploying to a local cluster (e.g.: kind cluster), set this to true. | | global.logAsJson | bool | `false` | | | global.logging | object | `{"level":"default:info"}` | Comma-separated minimum per-scope logging level of messages to output, in the form of :,: The control plane has different scopes depending on component, but can configure default log level across all components If empty, default scope and level will be used as configured in code | diff --git a/istio/istio b/istio/istio index c4646b03e6..81a46c581f 160000 --- a/istio/istio +++ b/istio/istio @@ -1 +1 @@ -Subproject commit c4646b03e6b30598bf89664ae7036586314f77a5 +Subproject commit 81a46c581f6b9a82ddf3786bb0bd6fdb75050744