Skip to content

Commit dc2187c

Browse files
authored
Merge pull request #333 from lsst-it/IT-5176/ingress-nginx-4.10.0
(fleet/ingress-nginx{-lhn}) bump chart to v4.10.0
2 parents ad74b86 + ffbbce9 commit dc2187c

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

fleet/lib/ingress-nginx-lhn/fleet.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,29 @@ helm:
66
chart: ingress-nginx
77
releaseName: *name
88
repo: https://kubernetes.github.io/ingress-nginx
9-
version: v4.5.2
9+
version: v4.10.0
1010
values:
1111
controller:
1212
kind: DaemonSet
13+
allowSnippetAnnotations: true
1314
ingressClass: nginx-lhn
1415
ingressClassResource:
1516
name: nginx-lhn
17+
metrics:
18+
enabled: true
19+
serviceMonitor:
20+
enabled: true
21+
additionalLabels:
22+
lsst.io/monitor: "true"
23+
# TODO: handle error: cannot unmarshal rule from spec This error happens
24+
# due to the fact that the PrometheusRules from the nginx-ingress
25+
# chart seem to be uncompatible with the new CRD's from the prometheus
26+
# operator being deployed. It would be good to have these deployed as
27+
# well but currently we're temporary disabling them.
28+
prometheusRule:
29+
enabled: false
30+
additionalLabels:
31+
lsst.io/rule: "true"
1632
rbac:
1733
create: true
1834
waitForJobs: true

fleet/lib/ingress-nginx/fleet.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ helm:
88
chart: *name
99
releaseName: *name
1010
repo: https://kubernetes.github.io/ingress-nginx
11-
version: v4.5.2
11+
version: v4.10.0
1212
values:
1313
controller:
1414
kind: DaemonSet
15+
allowSnippetAnnotations: true
1516
metrics:
1617
enabled: true
1718
serviceMonitor:

0 commit comments

Comments
 (0)