Skip to content

feat(ingress-controller): support annotations on the webhook configuration #1004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahmedgabers wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −1
Open

feat(ingress-controller): support annotations on the webhook configuration #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/apisix-ingress-controller/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ keywords:
- nginx
- crd
type: application
version: 1.3.0
version: 1.3.1
appVersion: 2.2.0
sources:
- https://github.com/apache/apisix-helm-chart
Expand Down
1 change: 1 addition & 0 deletions charts/apisix-ingress-controller/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ The same for container level, you need to set:
| serviceMonitor.namespace | string | `"monitoring"` | @param serviceMonitor.namespace Namespace in which to create the ServiceMonitor |
| webhook.certificate.provided | bool | `false` | Set to true if you want to provide your own certificate |
| webhook.enabled | bool | `true` | Enable or disable admission webhook |
| webhook.annotations | object | `{}` | Annotations for the ValidatingWebhookConfiguration, e.g. `cert-manager.io/inject-ca-from: <namespace>/<certificate>` so cert-manager's cainjector maintains the webhook caBundle. |
| webhook.failurePolicy | string | `"Ignore"` | Failure policy for the webhook (Fail or Ignore) |
| webhook.port | int | `9443` | The port for the webhook server to listen on |
| webhook.timeoutSeconds | int | `10` | Timeout in seconds for the webhook |
4 changes: 4 additions & 0 deletions charts/apisix-ingress-controller/templates/webhook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration
metadata:
name: {{ include "apisix-ingress-controller-manager.name.fullname" . }}-webhook
{{- with .Values.webhook.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "apisix-ingress-controller-manager.labels" . | nindent 4 }}
webhooks:
Expand Down
4 changes: 4 additions & 0 deletions charts/apisix-ingress-controller/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ config:
webhook:
# -- Enable or disable admission webhook
enabled: true
# -- Annotations for the ValidatingWebhookConfiguration, e.g.
# `cert-manager.io/inject-ca-from: <namespace>/<certificate>` so
# cert-manager's cainjector maintains the webhook caBundle.
annotations: {}
# -- The port for the webhook server to listen on
port: 9443
# -- Failure policy for the webhook (Fail or Ignore)
Expand Down