Revert "[lis] Revert migration of ingress until DNS has propagated." (#7912)

* Revert "wip: revert lis until DNS is migrated (#7906)"

This reverts commit a5c916b.

* feat: migrate N ingresses

Author: agoose77

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

@@ -27,20 +27,20 @@ grafana:
       hosts:
       - grafana.uk.2i2c.cloud
 
-# nginx-ingress:
-#   enabled: true
-#   controller:
-#     ingressClass:
-#       # Claim the `nginx` ingress class
-#       create: true
-# 
-# ingress-nginx:
-#   controller:
-#     # Turn off this controller
-#     replicaCount: 0
-#     # Let go of the `nginx` ingress class
-#     ingressClassResource:
-#       enabled: false
-# 
-# clusterEntrypoint:
-#   targetController: nginx-ingress
+nginx-ingress:
+  enabled: true
+  controller:
+    ingressClass:
+      # Claim the `nginx` ingress class
+      create: true
+
+ingress-nginx:
+  controller:
+    # Turn off this controller
+    replicaCount: 0
+    # Let go of the `nginx` ingress class
+    ingressClassResource:
+      enabled: false
+
+clusterEntrypoint:
+  targetController: nginx-ingress

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

@@ -56,3 +56,22 @@ grafana:
       - grafana.pilot.2i2c.cloud
   plugins:
   - grafana-bigquery-datasource
+
+nginx-ingress:
+  enabled: true
+  controller:
+    ingressClass:
+      # Claim the `nginx` ingress class
+      create: true
+
+ingress-nginx:
+  controller:
+    # Turn off this controller
+    replicaCount: 0
+    # Let go of the `nginx` ingress class
+    ingressClassResource:
+      enabled: false
+
+clusterEntrypoint:
+  targetController: nginx-ingress
+

config/clusters/aimatx-2i2c-hub/support.values.yaml

@@ -34,6 +34,23 @@ grafana:
       hosts:
       - grafana.aimatx.2i2c.cloud
 
+nginx-ingress:
+  enabled: true
+  controller:
+    ingressClass:
+      # Claim the `nginx` ingress class
+      create: true
+
+ingress-nginx:
+  controller:
+    # Turn off this controller
+    replicaCount: 0
+    # Let go of the `nginx` ingress class
+    ingressClassResource:
+      enabled: false
+
+clusterEntrypoint:
+  targetController: nginx-ingress
 
 cluster-autoscaler:
   enabled: true

config/clusters/berkeley-geojupyter/support.values.yaml

@@ -1,8 +1,6 @@
 prometheusIngressAuthSecret:
   enabled: true
 
-
-
 prometheus:
   server:
     persistentVolume:
@@ -31,6 +29,24 @@ grafana:
       hosts:
       - grafana.berkeley-geojupyter.2i2c.cloud
 
+nginx-ingress:
+  enabled: true
+  controller:
+    ingressClass:
+      # Claim the `nginx` ingress class
+      create: true
+
+ingress-nginx:
+  controller:
+    # Turn off this controller
+    replicaCount: 0
+    # Let go of the `nginx` ingress class
+    ingressClassResource:
+      enabled: false
+
+clusterEntrypoint:
+  targetController: nginx-ingress
+
 cluster-autoscaler:
   enabled: true
   autoDiscovery:

config/clusters/hhmi/support.values.yaml

@@ -26,3 +26,21 @@ grafana:
     - secretName: grafana-tls
       hosts:
       - grafana.hhmi.2i2c.cloud
+
+nginx-ingress:
+  enabled: true
+  controller:
+    ingressClass:
+      # Claim the `nginx` ingress class
+      create: true
+
+ingress-nginx:
+  controller:
+    # Turn off this controller
+    replicaCount: 0
+    # Let go of the `nginx` ingress class
+    ingressClassResource:
+      enabled: false
+
+clusterEntrypoint:
+  targetController: nginx-ingress

config/clusters/jupyter-health/support.values.yaml

@@ -27,6 +27,24 @@ grafana:
       hosts:
       - grafana.jupyter-health.2i2c.cloud
 
+nginx-ingress:
+  enabled: true
+  controller:
+    ingressClass:
+      # Claim the `nginx` ingress class
+      create: true
+
+ingress-nginx:
+  controller:
+    # Turn off this controller
+    replicaCount: 0
+    # Let go of the `nginx` ingress class
+    ingressClassResource:
+      enabled: false
+
+clusterEntrypoint:
+  targetController: nginx-ingress
+
 cluster-autoscaler:
   enabled: true
   autoDiscovery:

config/clusters/leap/support.values.yaml

@@ -33,3 +33,22 @@ grafana:
     - secretName: grafana-tls
       hosts:
       - grafana.leap.2i2c.cloud
+
+nginx-ingress:
+  enabled: true
+  controller:
+    ingressClass:
+      # Claim the `nginx` ingress class
+      create: true
+
+ingress-nginx:
+  controller:
+    # Turn off this controller
+    replicaCount: 0
+    # Let go of the `nginx` ingress class
+    ingressClassResource:
+      enabled: false
+
+clusterEntrypoint:
+  targetController: nginx-ingress
+

config/clusters/opensci/support.values.yaml

@@ -32,6 +32,24 @@ grafana:
       hosts:
       - grafana.opensci.2i2c.cloud
 
+nginx-ingress:
+  enabled: true
+  controller:
+    ingressClass:
+      # Claim the `nginx` ingress class
+      create: true
+
+ingress-nginx:
+  controller:
+    # Turn off this controller
+    replicaCount: 0
+    # Let go of the `nginx` ingress class
+    ingressClassResource:
+      enabled: false
+
+clusterEntrypoint:
+  targetController: nginx-ingress
+
 calico:
   enabled: true
 

config/clusters/victor/support.values.yaml

@@ -33,6 +33,24 @@ prometheus:
         hosts:
         - prometheus.victor.2i2c.cloud
 
+nginx-ingress:
+  enabled: true
+  controller:
+    ingressClass:
+      # Claim the `nginx` ingress class
+      create: true
+
+ingress-nginx:
+  controller:
+    # Turn off this controller
+    replicaCount: 0
+    # Let go of the `nginx` ingress class
+    ingressClassResource:
+      enabled: false
+
+clusterEntrypoint:
+  targetController: nginx-ingress
+
 redirects:
   rules:
   - from: victor.2i2c.cloud