Skip to content

Commit f22878c

Browse files
authored
feat: first round of ingress upgrades (#7904)
1 parent a6bd8b7 commit f22878c

File tree

7 files changed

+126
-2
lines changed

7 files changed

+126
-2
lines changed

config/clusters/2i2c-uk/support.values.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,21 @@ grafana:
2626
- secretName: grafana-tls
2727
hosts:
2828
- grafana.uk.2i2c.cloud
29+
30+
nginx-ingress:
31+
enabled: true
32+
controller:
33+
ingressClass:
34+
# Claim the `nginx` ingress class
35+
create: true
36+
37+
ingress-nginx:
38+
controller:
39+
# Turn off this controller
40+
replicaCount: 0
41+
# Let go of the `nginx` ingress class
42+
ingressClassResource:
43+
enabled: false
44+
45+
clusterEntrypoint:
46+
targetController: nginx-ingress

config/clusters/awi-ciroh/support.values.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,24 @@ grafana:
1616
hosts:
1717
- grafana.ciroh.awi.2i2c.cloud
1818

19+
nginx-ingress:
20+
enabled: true
21+
controller:
22+
ingressClass:
23+
# Claim the `nginx` ingress class
24+
create: true
25+
26+
ingress-nginx:
27+
controller:
28+
# Turn off this controller
29+
replicaCount: 0
30+
# Let go of the `nginx` ingress class
31+
ingressClassResource:
32+
enabled: false
33+
34+
clusterEntrypoint:
35+
targetController: nginx-ingress
36+
1937
prometheus:
2038
server:
2139
ingress:

config/clusters/bnext-bio/support.values.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,25 @@ grafana:
3232
hosts:
3333
- grafana.bnext-bio.2i2c.cloud
3434

35+
36+
nginx-ingress:
37+
enabled: true
38+
controller:
39+
ingressClass:
40+
# Claim the `nginx` ingress class
41+
create: true
42+
43+
ingress-nginx:
44+
controller:
45+
# Turn off this controller
46+
replicaCount: 0
47+
# Let go of the `nginx` ingress class
48+
ingressClassResource:
49+
enabled: false
50+
51+
clusterEntrypoint:
52+
targetController: nginx-ingress
53+
3554
cluster-autoscaler:
3655
enabled: true
3756
autoDiscovery:

config/clusters/nasa-ghg-hub/support.values.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,23 @@ prometheus:
3333
hosts:
3434
- prometheus.nasa-ghg.2i2c.cloud
3535

36+
nginx-ingress:
37+
enabled: true
38+
controller:
39+
ingressClass:
40+
# Claim the `nginx` ingress class
41+
create: true
42+
43+
ingress-nginx:
44+
controller:
45+
# Turn off this controller
46+
replicaCount: 0
47+
# Let go of the `nginx` ingress class
48+
ingressClassResource:
49+
enabled: false
50+
51+
clusterEntrypoint:
52+
targetController: nginx-ingress
53+
3654
calico:
3755
enabled: true

config/clusters/reflective/support.values.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,24 @@ grafana:
2626
hosts:
2727
- grafana.reflective.2i2c.cloud
2828

29+
nginx-ingress:
30+
enabled: true
31+
controller:
32+
ingressClass:
33+
# Claim the `nginx` ingress class
34+
create: true
35+
36+
ingress-nginx:
37+
controller:
38+
# Turn off this controller
39+
replicaCount: 0
40+
# Let go of the `nginx` ingress class
41+
ingressClassResource:
42+
enabled: false
43+
44+
clusterEntrypoint:
45+
targetController: nginx-ingress
46+
2947
cluster-autoscaler:
3048
enabled: true
3149
autoDiscovery:

config/clusters/temple/support.values.yaml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
prometheusIngressAuthSecret:
22
enabled: true
33

4-
5-
64
prometheus:
75
server:
86
persistentVolume:
@@ -31,6 +29,24 @@ grafana:
3129
hosts:
3230
- grafana.temple.2i2c.cloud
3331

32+
nginx-ingress:
33+
enabled: true
34+
controller:
35+
ingressClass:
36+
# Claim the `nginx` ingress class
37+
create: true
38+
39+
ingress-nginx:
40+
controller:
41+
# Turn off this controller
42+
replicaCount: 0
43+
# Let go of the `nginx` ingress class
44+
ingressClassResource:
45+
enabled: false
46+
47+
clusterEntrypoint:
48+
targetController: nginx-ingress
49+
3450
cluster-autoscaler:
3551
enabled: true
3652
autoDiscovery:

config/clusters/ucmerced/support.values.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,23 @@ grafana:
3434
hosts:
3535
- grafana.ucmerced.2i2c.cloud
3636

37+
nginx-ingress:
38+
enabled: true
39+
controller:
40+
ingressClass:
41+
# Claim the `nginx` ingress class
42+
create: true
43+
44+
ingress-nginx:
45+
controller:
46+
# Turn off this controller
47+
replicaCount: 0
48+
# Let go of the `nginx` ingress class
49+
ingressClassResource:
50+
enabled: false
51+
52+
clusterEntrypoint:
53+
targetController: nginx-ingress
3754

3855
cluster-autoscaler:
3956
enabled: true

0 commit comments

Comments
 (0)