fix: Exclude metric scraping from Istio interception

kyma-project · Mar 1, 2024 · 1cd0ebc · 1cd0ebc
1 parent 463d3b4
commit 1cd0ebc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/internal/resources/otelcollector/agent.go b/internal/resources/otelcollector/agent.go
@@ -130,9 +130,9 @@ func makeIstioTLSPodAnnotations(istioCertPath string) map[string]string {
 proxyMetadata:
   OUTPUT_CERTS: %s
 `, istioCertPath),
-		"sidecar.istio.io/userVolumeMount":              fmt.Sprintf(`[{"name": "%s", "mountPath": "%s"}]`, istioCertVolumeName, istioCertPath),
-		"traffic.sidecar.istio.io/includeOutboundPorts": strconv.Itoa(ports.OTLPGRPC),
-		"traffic.sidecar.istio.io/excludeInboundPorts":  strconv.Itoa(ports.Metrics),
-		"traffic.sidecar.istio.io/excludeOutboundPorts": strconv.Itoa(ports.IstioEnvoy),
+		"sidecar.istio.io/userVolumeMount":                 fmt.Sprintf(`[{"name": "%s", "mountPath": "%s"}]`, istioCertVolumeName, istioCertPath),
+		"traffic.sidecar.istio.io/includeOutboundPorts":    strconv.Itoa(ports.OTLPGRPC),
+		"traffic.sidecar.istio.io/excludeInboundPorts":     strconv.Itoa(ports.Metrics),
+		"traffic.sidecar.istio.io/includeOutboundIPRanges": "",
 	}
 }
diff --git a/internal/resources/otelcollector/agent_test.go b/internal/resources/otelcollector/agent_test.go
@@ -76,7 +76,7 @@ func TestApplyAgentResources(t *testing.T) {
 		require.Equal(t, "", podAnnotations["traffic.sidecar.istio.io/includeInboundPorts"])
 		require.Equal(t, "4317", podAnnotations["traffic.sidecar.istio.io/includeOutboundPorts"])
 		require.Equal(t, "8888", podAnnotations["traffic.sidecar.istio.io/excludeInboundPorts"])
-		require.Equal(t, "15090", podAnnotations["traffic.sidecar.istio.io/excludeOutboundPorts"])
+		require.Equal(t, "", podAnnotations["traffic.sidecar.istio.io/includeOutboundIPRanges"])
 
 		//collector container
 		require.Len(t, ds.Spec.Template.Spec.Containers, 1)