Skip to content

Commit

Permalink
fix(observability): add annotation to make observability while runnin…
Browse files Browse the repository at this point in the history
…g CNI work

Signed-off-by: slonka <slonka@users.noreply.github.com>
  • Loading branch information
slonka committed Nov 13, 2023
1 parent c06cc52 commit 492b72a
Show file tree
Hide file tree
Showing 20 changed files with 129 additions and 123 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11993,6 +11993,7 @@ spec:
checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/secret: 281444758252a4bdd272546732dfb8e2be87be71b795d2aadc3726e3524f63e3
traffic.kuma.io/exclude-outbound-ports-for-uids: tcp:80,443:472;udp:53:472 # needed when running kuma CNI
spec:
serviceAccountName: grafana
securityContext:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11993,6 +11993,7 @@ spec:
checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/secret: 281444758252a4bdd272546732dfb8e2be87be71b795d2aadc3726e3524f63e3
traffic.kuma.io/exclude-outbound-ports-for-uids: tcp:80,443:472;udp:53:472 # needed when running kuma CNI
spec:
serviceAccountName: grafana
securityContext:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11993,6 +11993,7 @@ spec:
checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/secret: 281444758252a4bdd272546732dfb8e2be87be71b795d2aadc3726e3524f63e3
traffic.kuma.io/exclude-outbound-ports-for-uids: tcp:80,443:472;udp:53:472 # needed when running kuma CNI
spec:
serviceAccountName: grafana
securityContext:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11440,6 +11440,7 @@ spec:
checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/secret: 281444758252a4bdd272546732dfb8e2be87be71b795d2aadc3726e3524f63e3
traffic.kuma.io/exclude-outbound-ports-for-uids: tcp:80,443:472;udp:53:472 # needed when running kuma CNI
spec:
serviceAccountName: grafana
securityContext:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11993,6 +11993,7 @@ spec:
checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/secret: 281444758252a4bdd272546732dfb8e2be87be71b795d2aadc3726e3524f63e3
traffic.kuma.io/exclude-outbound-ports-for-uids: tcp:80,443:472;udp:53:472 # needed when running kuma CNI
spec:
serviceAccountName: grafana
securityContext:
Expand Down
1 change: 1 addition & 0 deletions app/kumactl/data/install/k8s/metrics/grafana/grafana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ spec:
checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/secret: 281444758252a4bdd272546732dfb8e2be87be71b795d2aadc3726e3524f63e3
traffic.kuma.io/exclude-outbound-ports-for-uids: tcp:80,443:472;udp:53:472 # needed when running kuma CNI
spec:
serviceAccountName: grafana
securityContext:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"items": [],
"total": 0
"items": [],
"total": 0
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"items": [
{
"mesh": "default",
"name": "dp-1",
"type": "Dataplane"
}
],
"total": 1
"items": [
{
"mesh": "default",
"name": "dp-1",
"type": "Dataplane"
}
],
"total": 1
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"items": [
{
"mesh": "default",
"name": "dp-1",
"type": "Dataplane"
}
],
"total": 1
"items": [
{
"mesh": "default",
"name": "dp-1",
"type": "Dataplane"
}
],
"total": 1
}
26 changes: 13 additions & 13 deletions pkg/api-server/testdata/inspect/meshgateway_dataplanes.golden.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"items": [
{
"mesh": "default",
"name": "dp-1",
"type": "Dataplane"
},
{
"mesh": "default",
"name": "dp-2",
"type": "Dataplane"
}
],
"total": 2
"items": [
{
"mesh": "default",
"name": "dp-1",
"type": "Dataplane"
},
{
"mesh": "default",
"name": "dp-2",
"type": "Dataplane"
}
],
"total": 2
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"items": [
{
"mesh": "default",
"name": "dp-3",
"type": "Dataplane"
}
],
"total": 1
"items": [
{
"mesh": "default",
"name": "dp-3",
"type": "Dataplane"
}
],
"total": 1
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"items": [],
"total": 0
"items": [],
"total": 0
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"items": [
{
"mesh": "default",
"name": "dp-1",
"type": "Dataplane"
}
],
"total": 1
"items": [
{
"mesh": "default",
"name": "dp-1",
"type": "Dataplane"
}
],
"total": 1
}
16 changes: 8 additions & 8 deletions pkg/api-server/testdata/inspect/meshtimeouthttproute.golden.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"items": [
{
"mesh": "default",
"name": "the-dp",
"type": "Dataplane"
}
],
"total": 1
"items": [
{
"mesh": "default",
"name": "the-dp",
"type": "Dataplane"
}
],
"total": 1
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"items": [
{
"mesh": "default",
"name": "the-dp",
"type": "Dataplane"
}
],
"total": 1
"items": [
{
"mesh": "default",
"name": "the-dp",
"type": "Dataplane"
}
],
"total": 1
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"items": [
{
"mesh": "default",
"name": "dp-2",
"type": "Dataplane"
}
],
"total": 2
"items": [
{
"mesh": "default",
"name": "dp-2",
"type": "Dataplane"
}
],
"total": 2
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "/std-errors",
"status": 404,
"title": "Could not retrieve policy",
"detail": "Not found",
"details": "Not found"
"type": "/std-errors",
"status": 404,
"title": "Could not retrieve policy",
"detail": "Not found",
"details": "Not found"
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"items": [
{
"mesh": "default",
"name": "dp-1",
"type": "Dataplane"
},
{
"mesh": "default",
"name": "dp-2",
"type": "Dataplane"
}
],
"total": 2
"items": [
{
"mesh": "default",
"name": "dp-1",
"type": "Dataplane"
},
{
"mesh": "default",
"name": "dp-2",
"type": "Dataplane"
}
],
"total": 2
}
36 changes: 18 additions & 18 deletions pkg/api-server/testdata/inspect/retry_dataplanes.golden.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"items": [
{
"mesh": "default",
"name": "dp-1",
"type": "Dataplane"
},
{
"mesh": "default",
"name": "dp-2",
"type": "Dataplane"
},
{
"mesh": "default",
"name": "dp-3",
"type": "Dataplane"
}
],
"total": 3
"items": [
{
"mesh": "default",
"name": "dp-1",
"type": "Dataplane"
},
{
"mesh": "default",
"name": "dp-2",
"type": "Dataplane"
},
{
"mesh": "default",
"name": "dp-3",
"type": "Dataplane"
}
],
"total": 3
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
items:
- creationTime: "0001-01-01T00:00:00Z"
mesh: default
modificationTime: "0001-01-01T00:00:00Z"
name: mt1
spec:
- creationTime: "0001-01-01T00:00:00Z"
mesh: default
modificationTime: "0001-01-01T00:00:00Z"
name: mt1
spec:
targetRef:
kind: MeshHTTPRoute
name: route-1
to:
- default:
http:
requestTimeout: 2s
targetRef:
kind: MeshHTTPRoute
name: route-1
to:
- default:
http:
requestTimeout: 2s
targetRef:
kind: Mesh
type: MeshTimeout
kind: Mesh
type: MeshTimeout
next: null
total: 0

0 comments on commit 492b72a

Please sign in to comment.