Skip to content

Commit 4142e21

Browse files
committed
modular annotations on the api ingress
1 parent 38b7915 commit 4142e21

File tree

5 files changed

+27
-1
lines changed

5 files changed

+27
-1
lines changed

examples/api-ct-dev-values.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ db:
99
# API Config
1010
api:
1111
hostname: dev.calltelemetry.com
12+
# Example of API ingress annotations
13+
ingress:
14+
annotations: {}
15+
haproxy.org/load-balance: "roundrobin"
1216

1317
# Admin configuration
1418
admin:
@@ -21,6 +25,11 @@ admin:
2125
- name: ssh
2226
port: 3022
2327
hostname: dev.calltelemetry.com
28+
# Example of overriding default ingress annotations
29+
ingress:
30+
annotations:
31+
haproxy.org/load-balance: "roundrobin"
32+
# Add any additional annotations as needed
2433

2534

2635
# SFTP Configuration

examples/api-ct-prod-values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ db:
99
# API Config
1010
api:
1111
hostname: prod.calltelemetry.com
12+
# Example of API ingress annotations
13+
ingress:
14+
annotations: {}
15+
haproxy.org/load-balance: "roundrobin"
1216

1317
# Admin configuration
1418
admin:
@@ -21,6 +25,9 @@ admin:
2125
- name: ssh
2226
port: 3022
2327
hostname: prod.calltelemetry.com
28+
ingress:
29+
annotations:
30+
haproxy.org/load-balance: "roundrobin"
2431

2532

2633
# SFTP Configuration

helm/charts/api/templates/ingress/admin-ingress.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ metadata:
44
name: admin-ingress
55
namespace: {{ .Release.Namespace }}
66
annotations:
7-
haproxy.org/load-balance: "roundrobin"
7+
{{- with .Values.admin.ingress.annotations }}
8+
{{- toYaml . | nindent 4 }}
9+
{{- end }}
810
spec:
911
ingressClassName: {{ .Values.ingressClassName }}
1012
rules:

helm/charts/api/templates/ingress/api-ingress.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ metadata:
44
name: api-ingress
55
namespace: {{ .Release.Namespace }}
66
annotations:
7+
{{- with .Values.api.ingress.annotations }}
8+
{{- toYaml . | nindent 4 }}
9+
{{- end }}
710
spec:
811
ingressClassName: {{ .Values.ingressClassName }}
912
rules:

helm/charts/api/values.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ api:
1919
- name: curri-api
2020
port: 4080
2121
hostname: dev.calltelemetry.com
22+
ingress:
23+
annotations: {}
2224

2325
admin:
2426
image: calltelemetry/web
@@ -36,6 +38,9 @@ admin:
3638
port: 3022
3739
hostname: dev.calltelemetry.com
3840
api_worker: false
41+
ingress:
42+
annotations:
43+
haproxy.org/load-balance: "roundrobin"
3944

4045
sftp:
4146
enabled: true

0 commit comments

Comments
 (0)