Skip to content

Commit 8924dcb

Browse files
authored
Merge pull request #43 from Kuadrant/add-allowed-routes
Add gateway.listeners.allowedRoutes.namespaces.from field
2 parents ed0b6d9 + 5062849 commit 8924dcb

File tree

6 files changed

+15
-4
lines changed

6 files changed

+15
-4
lines changed

METRICS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ gatewayapi_gateway_deleted{namespace="<NAMESPACE>",name="<GATEWAY>"} 1690879977
3939
Per [Listener](https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io%2fv1beta1.Listener) information, Gauge
4040

4141
```promql
42-
gatewayapi_gateway_listener_info{namespace="<NAMESPACE>",name="<GATEWAY>",listener_name="<LISTENER_NAME>",port="<PORT>",protocol="<PROTOCOL>",hostname="<HOSTNAME>","tls_mode"="<Passthrough|Terminate>"} 1
42+
gatewayapi_gateway_listener_info{namespace="<NAMESPACE>",name="<GATEWAY>",listener_name="<LISTENER_NAME>",port="<PORT>",protocol="<PROTOCOL>",hostname="<HOSTNAME>","tls_mode"="<Passthrough|Terminate>","allowed_routes_namespaces_from"="<Same|All|Selector>"} 1
4343
```
4444

4545
### gatewayapi_gateway_status

config/default/custom-resource-state.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ spec:
5353
protocol: ["protocol"]
5454
hostname: ["hostname"]
5555
tls_mode: ["tls","mode"]
56+
allowed_routes_namespaces_from: ["allowedRoutes", "namespaces", "from"]
5657
- name: "status"
5758
help: "status condition"
5859
each:

config/examples/dashboards/gateways.json

+3
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,7 @@
350350
"port",
351351
"protocol",
352352
"tls_mode",
353+
"allowed_routes_namespaces_from",
353354
"Value"
354355
]
355356
}
@@ -363,6 +364,7 @@
363364
},
364365
"indexByName": {
365366
"Value": 9,
367+
"allowed_routes_namespaces_from": 10,
366368
"customresource_kind": 0,
367369
"customresource_version": 1,
368370
"hostname": 5,
@@ -375,6 +377,7 @@
375377
},
376378
"renameByName": {
377379
"Value": "",
380+
"allowed_routes_namespaces_from": "Allowed Routes NS",
378381
"customresource_kind": "Kind",
379382
"customresource_version": "Version",
380383
"hostname": "Hostname",

config/examples/dashboards/gateways.yaml

+1-1
Large diffs are not rendered by default.

config/examples/kube-prometheus/bundle.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1038,6 +1038,7 @@ data:
10381038
protocol: ["protocol"]
10391039
hostname: ["hostname"]
10401040
tls_mode: ["tls","mode"]
1041+
allowed_routes_namespaces_from: ["allowedRoutes", "namespaces", "from"]
10411042
- name: "status"
10421043
help: "status condition"
10431044
each:
@@ -38672,6 +38673,7 @@ data:
3867238673
"port",
3867338674
"protocol",
3867438675
"tls_mode",
38676+
"allowed_routes_namespaces_from",
3867538677
"Value"
3867638678
]
3867738679
}
@@ -38685,6 +38687,7 @@ data:
3868538687
},
3868638688
"indexByName": {
3868738689
"Value": 9,
38690+
"allowed_routes_namespaces_from": 10,
3868838691
"customresource_kind": 0,
3868938692
"customresource_version": 1,
3869038693
"hostname": 5,
@@ -38697,6 +38700,7 @@ data:
3869738700
},
3869838701
"renameByName": {
3869938702
"Value": "",
38703+
"allowed_routes_namespaces_from": "Allowed Routes NS",
3870038704
"customresource_kind": "Kind",
3870138705
"customresource_version": "Version",
3870238706
"hostname": "Hostname",
@@ -39706,7 +39710,7 @@ data:
3970639710
}
3970739711
kind: ConfigMap
3970839712
metadata:
39709-
name: grafana-gateways-6465t79fc4
39713+
name: grafana-gateways-dh56k7246b
3971039714
namespace: monitoring
3971139715

3971239716
---
@@ -44585,7 +44589,7 @@ spec:
4458544589
name: grafana-gatewayclasses
4458644590
- configMap:
4458744591
defaultMode: 420
44588-
name: grafana-gateways-6465t79fc4
44592+
name: grafana-gateways-dh56k7246b
4458944593
name: grafana-gateways
4459044594
- configMap:
4459144595
defaultMode: 420

src/dashboards/gateways.jsonnet

+3
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ gwapi.dashboard('Gateways', 'gatewayapigateways', [
8989
'port',
9090
'protocol',
9191
'tls_mode',
92+
'allowed_routes_namespaces_from',
9293
'Value',
9394
],
9495
},
@@ -109,6 +110,7 @@ gwapi.dashboard('Gateways', 'gatewayapigateways', [
109110
port: 6,
110111
protocol: 7,
111112
tls_mode: 8,
113+
allowed_routes_namespaces_from: 10
112114
},
113115
renameByName: {
114116
Value: '',
@@ -122,6 +124,7 @@ gwapi.dashboard('Gateways', 'gatewayapigateways', [
122124
prometheus: '',
123125
protocol: 'Protocol',
124126
tls_mode: 'TLS Mode',
127+
allowed_routes_namespaces_from: 'Allowed Routes NS'
125128
},
126129
}),
127130
]),

0 commit comments

Comments
 (0)