Skip to content

Commit fa81478

Browse files
authored
Merge pull request #4136 from heliapb/feat/allow_config_timeout
[rollout-operator] feat: allow config of `timeoutSeconds` in rollout operator
2 parents c4a5838 + a733588 commit fa81478

6 files changed

Lines changed: 8 additions & 3 deletions

File tree

charts/rollout-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: rollout-operator
33
description: "Grafana rollout-operator"
44
type: application
5-
version: 0.44.0
5+
version: 0.45.0
66
appVersion: v0.35.0
77
home: https://github.com/grafana/rollout-operator
88
kubeVersion: ^1.10.0-0

charts/rollout-operator/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r
44

55
# rollout-operator
66

7-
![Version: 0.44.0](https://img.shields.io/badge/Version-0.44.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.35.0](https://img.shields.io/badge/AppVersion-v0.35.0-informational?style=flat-square)
7+
![Version: 0.45.0](https://img.shields.io/badge/Version-0.45.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.35.0](https://img.shields.io/badge/AppVersion-v0.35.0-informational?style=flat-square)
88

99
Grafana rollout-operator
1010

@@ -89,3 +89,4 @@ Manually applying these CRDs is only required if upgrading from a chart <= v0.32
8989
| webhooks.failurePolicy | string | `"Fail"` | Validating and mutating webhook failure policy. `Ignore` or `Fail`. |
9090
| webhooks.objectSelector | object | `{}` | objectSelector to filter which objects the webhooks apply to. |
9191
| webhooks.selfSignedCertSecretName | string | `"certificate"` | Secret resource name for the TLS certificate to be used with the webhooks |
92+
| webhooks.timeoutSeconds | int | `10` | Timeout in seconds for the prepare-downscale mutating webhook. Must be between 1 and 30. |

charts/rollout-operator/templates/pod-eviction-webhook.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,6 @@ webhooks:
4646
{{- toYaml . | nindent 6 }}
4747
{{- end }}
4848
sideEffects: None
49+
timeoutSeconds: {{.Values.webhooks.timeoutSeconds}}
4950
failurePolicy: {{.Values.webhooks.failurePolicy}}
5051
{{- end -}}

charts/rollout-operator/templates/prepare-downscale-webhook.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ webhooks:
4848
{{- end }}
4949
sideEffects: NoneOnDryRun
5050
matchPolicy: Equivalent
51-
timeoutSeconds: 10
51+
timeoutSeconds: {{.Values.webhooks.timeoutSeconds}}
5252
failurePolicy: {{.Values.webhooks.failurePolicy}}
5353
{{- end -}}

charts/rollout-operator/templates/zone-aware-pod-disruption-budget-validating-webhook.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,6 @@ webhooks:
4646
{{- toYaml . | nindent 6 }}
4747
{{- end }}
4848
sideEffects: None
49+
timeoutSeconds: {{.Values.webhooks.timeoutSeconds}}
4950
failurePolicy: {{.Values.webhooks.failurePolicy}}
5051
{{- end -}}

charts/rollout-operator/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ webhooks:
108108
# -- Enable the rollout-operator webhooks. See https://github.com/grafana/rollout-operator/#webhooks.
109109
# Note that the webhooks require custom resource definitions. If upgrading, manually apply the files in the `crds` directory.
110110
enabled: true
111+
# -- Timeout in seconds for the prepare-downscale mutating webhook. Must be between 1 and 30.
112+
timeoutSeconds: 10
111113
# -- Validating and mutating webhook failure policy. `Ignore` or `Fail`.
112114
failurePolicy: "Fail"
113115
# -- Secret resource name for the TLS certificate to be used with the webhooks

0 commit comments

Comments
 (0)