Skip to content

make webhook path configurable #240

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
drodowic wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −2
Open

make webhook path configurable #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45c59bd
make webhook path configurable
drodowic Aug 16, 2024
bf8076e
add new spec to the crd
drodowic Aug 20, 2024
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
3 changes: 3 additions & 0 deletions config/crd/bases/eda.ansible.com_edas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2761,6 +2761,9 @@ spec:
ingress_class_name:
description: The name of ingress class to use instead of the cluster default.
type: string
webhook_ingress_path:
description: The ingress path used to reach the webhook service
type: string
loadbalancer_protocol:
description: Protocol to use for the loadbalancer
type: string
Expand Down
6 changes: 6 additions & 0 deletions config/manifests/bases/eda-server-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,12 @@ spec:
- urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:io.kubernetes:Secret
- urn:alm:descriptor:com.tectonic.ui:fieldDependency:ingress_type:Ingress
- displayName: Webhook Ingress Path
path: webhook_ingress_path
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- urn:alm:descriptor:com.tectonic.ui:text
- urn:alm:descriptor:com.tectonic.ui:fieldDependency:ingress_type:Ingress
- displayName: LoadBalancer Protocol
path: loadbalancer_protocol
x-descriptors:
Expand Down
1 change: 1 addition & 0 deletions roles/eda/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ ingress_class_name: ''
ingress_path: '/'
ingress_path_type: 'Prefix'
ingress_api_version: 'networking.k8s.io/v1'
webhook_ingress_path: '/'
# Add annotations to the service account. Specify as literal block. E.g.:
# service_account_annotations: |
# eks.amazonaws.com/role-arn: arn:aws:iam::<ACCOUNT_ID>:role/<IAM_ROLE_NAME>
Expand Down
2 changes: 1 addition & 1 deletion roles/eda/templates/eda-ui.ingress.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
name: '{{ ansible_operator_meta.name }}-ui'
port:
number: 80
- path: '/'
- path: '{{ webhook_ingress_path }}'
pathType: '{{ ingress_path_type }}'
backend:
service:
Expand Down
2 changes: 1 addition & 1 deletion roles/eda/templates/eda-webhook.ingress.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
rules:
- http:
paths:
- path: '/'
- path: '{{ webhook_ingress_path }}'
pathType: '{{ ingress_path_type }}'
backend:
service:
Expand Down