diff --git a/build/install-istio-with-kind.sh b/build/install-istio-with-kind.sh index aabc05261..ec6cfbbf1 100755 --- a/build/install-istio-with-kind.sh +++ b/build/install-istio-with-kind.sh @@ -7,7 +7,7 @@ set -x GOARCH=$(go env GOARCH) GOOS=$(go env GOOS) KIND_VERSION=0.11.1 -ISTIO_VERSION=1.9.9 +ISTIO_VERSION=1.19.4 # Download and install kind curl -L https://github.com/kubernetes-sigs/kind/releases/download/v${KIND_VERSION}/kind-${GOOS}-${GOARCH} --output kind && chmod +x kind && sudo mv kind /usr/local/bin/ diff --git a/test/bats/istio-cm-patch.yaml b/test/bats/istio-cm-patch.yaml index 7f0fff365..5c40a5906 100644 --- a/test/bats/istio-cm-patch.yaml +++ b/test/bats/istio-cm-patch.yaml @@ -12,7 +12,23 @@ data: tracing: zipkin: address: zipkin.istio-system:9411 + defaultProviders: + metrics: + - prometheus enablePrometheusMerge: true + extensionProviders: + - envoyOtelAls: + port: 4317 + service: opentelemetry-collector.istio-system.svc.cluster.local + name: otel + - name: skywalking + skywalking: + port: 11800 + service: tracing.istio-system.svc.cluster.local + - name: otel-tracing + opentelemetry: + port: 4317 + service: opentelemetry-collector.otel-collector.svc.cluster.local rootNamespace: istio-system trustDomain: cluster.local meshNetworks: 'networks: {}' \ No newline at end of file