Skip to content

Commit f3c2748

Browse files
thiagomedinathiagomedina
authored
Merge branch 'main' into 7306/docs/add-envoy-cluster-jsonpatch-example
2 parents 7fe4617 + d5edf79 commit f3c2748

90 files changed

Lines changed: 6376 additions & 921 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/v1alpha1/envoyproxy_types.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,11 @@ type EnvoyProxyProvider struct {
523523

524524
// ShutdownConfig defines configuration for graceful envoy shutdown process.
525525
type ShutdownConfig struct {
526+
// HealthCheckFailureDelay defines the delay before failing health checks during the graceful drain process.
527+
// If unspecified, defaults to 0 seconds.
528+
//
529+
// +optional
530+
HealthCheckFailureDelay *gwapiv1.Duration `json:"healthCheckFailureDelay,omitempty"`
526531
// DrainTimeout defines the graceful drain timeout. This should be less than the pod's terminationGracePeriodSeconds.
527532
// If unspecified, defaults to 60 seconds.
528533
//

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/gateway-addons-helm/Chart.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ dependencies:
1010
version: 0.56.0
1111
- name: alloy
1212
repository: https://grafana.github.io/helm-charts
13-
version: 1.11.0
13+
version: 1.11.1
1414
- name: loki
1515
repository: https://grafana.github.io/helm-charts
16-
version: 7.2.0
16+
version: 7.3.0
1717
- name: tempo
1818
repository: https://grafana.github.io/helm-charts
1919
version: 1.3.1
2020
- name: opentelemetry-collector
2121
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
22-
version: 0.166.0
23-
digest: sha256:6abf7ce0a96aee5751d45cd3093bb67947a6a6124bbbf3c1572b986ae769be69
24-
generated: "2026-08-05T04:13:42.356458624Z"
22+
version: 0.169.0
23+
digest: sha256:c9a6262b07c86646959ca64157f28728c2f54908d0393f8da301d153bada236a
24+
generated: "2026-08-12T04:19:03.606130429Z"

‎charts/gateway-addons-helm/Chart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ dependencies:
3939
condition: fluent-bit.enabled
4040
- name: alloy
4141
repository: https://grafana.github.io/helm-charts
42-
version: 1.11.0
42+
version: 1.11.1
4343
condition: alloy.enabled
4444
- name: loki
45-
version: 7.2.0
45+
version: 7.3.0
4646
repository: https://grafana.github.io/helm-charts
4747
condition: loki.enabled
4848
- name: tempo
@@ -51,5 +51,5 @@ dependencies:
5151
condition: tempo.enabled
5252
- name: opentelemetry-collector
5353
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
54-
version: 0.166.0
54+
version: 0.169.0
5555
condition: opentelemetry-collector.enabled

‎charts/gateway-addons-helm/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ An Add-ons Helm chart for Envoy Gateway
2222
| Repository | Name | Version |
2323
|------------|------|---------|
2424
| https://fluent.github.io/helm-charts | fluent-bit | 0.56.0 |
25-
| https://grafana.github.io/helm-charts | alloy | 1.11.0 |
25+
| https://grafana.github.io/helm-charts | alloy | 1.11.1 |
2626
| https://grafana.github.io/helm-charts | grafana | 10.5.15 |
27-
| https://grafana.github.io/helm-charts | loki | 7.2.0 |
27+
| https://grafana.github.io/helm-charts | loki | 7.3.0 |
2828
| https://grafana.github.io/helm-charts | tempo | 1.3.1 |
29-
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.166.0 |
29+
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.169.0 |
3030
| https://prometheus-community.github.io/helm-charts | prometheus | 29.10.1 |
3131

3232
## Usage
@@ -172,7 +172,7 @@ helm uninstall eg-addons -n monitoring
172172
| opentelemetry-collector.enabled | bool | `false` | |
173173
| opentelemetry-collector.fullnameOverride | string | `"otel-collector"` | |
174174
| opentelemetry-collector.image.repository | string | `"otel/opentelemetry-collector-contrib"` | |
175-
| opentelemetry-collector.image.tag | string | `"0.157.0"` | |
175+
| opentelemetry-collector.image.tag | string | `"0.158.0"` | |
176176
| opentelemetry-collector.mode | string | `"deployment"` | |
177177
| opentelemetry-collector.ports.datadog.containerPort | int | `8126` | |
178178
| opentelemetry-collector.ports.datadog.enabled | bool | `true` | |

‎charts/gateway-addons-helm/dashboards/envoy-proxy-global.json‎

Lines changed: 144 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2886,6 +2886,149 @@
28862886
],
28872887
"title": "Unhealthy Endpoints",
28882888
"type": "timeseries"
2889+
},
2890+
{
2891+
"collapsed": false,
2892+
"gridPos": {
2893+
"h": 1,
2894+
"w": 24,
2895+
"x": 0,
2896+
"y": 59
2897+
},
2898+
"id": 44,
2899+
"panels": [],
2900+
"title": "TLS Certificates",
2901+
"type": "row"
2902+
},
2903+
{
2904+
"datasource": {
2905+
"uid": "$datasource"
2906+
},
2907+
"fieldConfig": {
2908+
"defaults": {
2909+
"color": {
2910+
"mode": "thresholds"
2911+
},
2912+
"custom": {
2913+
"cellOptions": {
2914+
"type": "auto"
2915+
},
2916+
"filterable": false,
2917+
"inspect": false
2918+
},
2919+
"decimals": 0,
2920+
"mappings": [],
2921+
"thresholds": {
2922+
"mode": "absolute",
2923+
"steps": [
2924+
{
2925+
"color": "red",
2926+
"value": 0
2927+
},
2928+
{
2929+
"color": "yellow",
2930+
"value": 7
2931+
},
2932+
{
2933+
"color": "green",
2934+
"value": 30
2935+
}
2936+
]
2937+
},
2938+
"unit": "none"
2939+
},
2940+
"overrides": [
2941+
{
2942+
"matcher": {
2943+
"id": "byName",
2944+
"options": "TTL (days)"
2945+
},
2946+
"properties": [
2947+
{
2948+
"id": "custom.cellOptions",
2949+
"value": {
2950+
"type": "color-background"
2951+
}
2952+
},
2953+
{
2954+
"id": "custom.width",
2955+
"value": 200
2956+
}
2957+
]
2958+
}
2959+
]
2960+
},
2961+
"gridPos": {
2962+
"h": 8,
2963+
"w": 24,
2964+
"x": 0,
2965+
"y": 60
2966+
},
2967+
"id": 45,
2968+
"options": {
2969+
"cellHeight": "sm",
2970+
"footer": {
2971+
"countRows": false,
2972+
"fields": "",
2973+
"reducer": [
2974+
"sum"
2975+
],
2976+
"show": false
2977+
},
2978+
"showHeader": true,
2979+
"sortBy": [
2980+
{
2981+
"desc": false,
2982+
"displayName": "TTL (days)"
2983+
}
2984+
]
2985+
},
2986+
"pluginVersion": "10.0.2",
2987+
"targets": [
2988+
{
2989+
"datasource": {
2990+
"uid": "$datasource"
2991+
},
2992+
"editorMode": "code",
2993+
"expr": "min by (envoy_tls_certificate) ((envoy_listener_ssl_certificate_expiration_unix_time_seconds{namespace=~\"$Namespace\"} - time()) / 86400)",
2994+
"format": "table",
2995+
"instant": true,
2996+
"legendFormat": "__auto",
2997+
"range": false,
2998+
"refId": "A"
2999+
}
3000+
],
3001+
"title": "TLS Certificate Expiry",
3002+
"transformations": [
3003+
{
3004+
"id": "organize",
3005+
"options": {
3006+
"excludeByName": {
3007+
"Time": true,
3008+
"__name__": true,
3009+
"instance": true,
3010+
"job": true,
3011+
"pod": true,
3012+
"endpoint": true,
3013+
"namespace": true,
3014+
"container": true,
3015+
"service": true,
3016+
"node": true,
3017+
"envoy_listener_address": true,
3018+
"prometheus": true
3019+
},
3020+
"indexByName": {
3021+
"envoy_tls_certificate": 0,
3022+
"Value": 99
3023+
},
3024+
"renameByName": {
3025+
"Value": "TTL (days)",
3026+
"envoy_tls_certificate": "Certificate"
3027+
}
3028+
}
3029+
}
3030+
],
3031+
"type": "table"
28893032
}
28903033
],
28913034
"refresh": "10s",
@@ -2979,4 +3122,4 @@
29793122
"uid": "heHhNSFf6Na8vIZWRs8H",
29803123
"version": 1,
29813124
"weekStart": ""
2982-
}
3125+
}

‎charts/gateway-addons-helm/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ opentelemetry-collector:
940940
mode: deployment
941941
image:
942942
repository: "otel/opentelemetry-collector-contrib"
943-
tag: "0.157.0"
943+
tag: "0.158.0"
944944
config:
945945
exporters:
946946
prometheus:

‎charts/gateway-crds-helm/templates/generated/gateway.envoyproxy.io_envoyproxies.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11360,6 +11360,12 @@ spec:
1136011360
If unspecified, defaults to 60 seconds.
1136111361
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
1136211362
type: string
11363+
healthCheckFailureDelay:
11364+
description: |-
11365+
HealthCheckFailureDelay defines the delay before failing health checks during the graceful drain process.
11366+
If unspecified, defaults to 0 seconds.
11367+
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
11368+
type: string
1136311369
minDrainDuration:
1136411370
description: |-
1136511371
MinDrainDuration defines the minimum drain duration allowing time for endpoint deprogramming to complete.

‎charts/gateway-helm/charts/crds/crds/generated/gateway.envoyproxy.io_envoyproxies.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11359,6 +11359,12 @@ spec:
1135911359
If unspecified, defaults to 60 seconds.
1136011360
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
1136111361
type: string
11362+
healthCheckFailureDelay:
11363+
description: |-
11364+
HealthCheckFailureDelay defines the delay before failing health checks during the graceful drain process.
11365+
If unspecified, defaults to 0 seconds.
11366+
pattern: ^([0-9]{1,5}(h|m|s|ms)){1,4}$
11367+
type: string
1136211368
minDrainDuration:
1136311369
description: |-
1136411370
MinDrainDuration defines the minimum drain duration allowing time for endpoint deprogramming to complete.

‎charts/gateway-helm/templates/envoy-gateway-poddisruptionbudget.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ spec:
1111
{{- if .Values.podDisruptionBudget.maxUnavailable }}
1212
maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
1313
{{- end }}
14+
{{- if .Values.podDisruptionBudget.unhealthyPodEvictionPolicy }}
15+
unhealthyPodEvictionPolicy: {{ .Values.podDisruptionBudget.unhealthyPodEvictionPolicy }}
16+
{{- end }}
1417
selector:
1518
matchLabels:
1619
control-plane: envoy-gateway

0 commit comments

Comments
 (0)