Remove GafaelfawrIngress for influxdb2

applications/gafaelfawr/values-roundtable-dev.yaml

@@ -58,4 +58,3 @@ ingress:
   additionalHosts:
     - "git-lfs-dev.lsst.cloud"
     - "git-lfs-dev-rw.lsst.cloud"
-    - "monitoring-dev.lsst.cloud"

applications/monitoring/README.md

@@ -36,12 +36,11 @@ Monitoring suite: InfluxDB2, Chronograf, telegraf
 | influxdb2.adminUser.organization | string | `"square"` | InfluxDB internal organization |
 | influxdb2.adminUser.retention_policy | string | `"30d"` | How long to keep data |
 | influxdb2.adminUser.user | string | `"admin"` | User name |
-| influxdb2.ingress | object | disable, use our own GafaelfawrIngress | InfluxDB2 ingress configuration. |
+| influxdb2.ingress | object | disabled, must be enabled and configured at each site | InfluxDB2 ingress configuration. |
 | influxdb2.livenessProbe.failureThreshold | int | `10` | Number of checks to conclude whether InfluxDB has died |
 | influxdb2.livenessProbe.periodSeconds | int | `10` | Period between checks for whether InfluxDB is still alive |
 | influxdb2.resources | object | See `values.yaml` | Resource limits and requests for the InfluxDB server instance |
 | influxdb2.startupProbe.enabled | bool | `true` | Whether to enable a startup probe |
 | influxdb2.startupProbe.failureThreshold | int | `60` | Number of checks to conclude whether InfluxDB won't start.  High to allow up to 10 minutes for startup, because checking many shards can be slow. |
 | influxdb2.startupProbe.initialDelaySeconds | int | `30` | How long to wait before checking the first time |
 | influxdb2.startupProbe.periodSeconds | int | `10` | Period between checking whether InfluxDB has started |
-| ingress.annotations | object | empty | Additional annotations to add to the ingress |

applications/monitoring/values-roundtable-dev.yaml

@@ -7,6 +7,9 @@ config:
 influxdb2:
   enabled: true
   # -- Schedule onto the kafka pool
+  ingress:
+    enabled: true
+    hostname: "monitoring-dev.lsst.cloud"
   tolerations:
   - key: "dedicated"
     operator: "Equal"

applications/monitoring/values-roundtable-prod.yaml

@@ -3,6 +3,9 @@ config:
   influxdbOrg: "square"
 influxdb2:
   enabled: true
+  ingress:
+    enabled: true
+    hostname: "monitoring.lsst.cloud"
   # -- Schedule onto the kafka pool
   tolerations:
   - key: "dedicated"

applications/monitoring/values.yaml

@@ -24,11 +24,14 @@ influxdb2:
     existingSecret: monitoring
 
   # -- InfluxDB2 ingress configuration.
-  # @default -- disable, use our own GafaelfawrIngress
+  # @default -- disabled, must be enabled and configured at each site
   ingress:
-    # Instead of the provided ingress, we will instead define our own
-    # ingress to route to influxdb2 (and chronograf, if enabled) and use it.
     enabled: false
+    tls: true
+    secretName: "tls-influxdb2"
+    hostname: ""
+    className: "nginx"
+    path: "/"
 
   startupProbe:
     # -- Whether to enable a startup probe
@@ -153,11 +156,6 @@ cronjob:
     # -- taskmaker schedule
     taskmaker: "6-59/15 * * * *"
 
-ingress:
-  # -- Additional annotations to add to the ingress
-  # @default -- empty
-  annotations: {}
-
 global:
   # -- services enabled in this RSP instance
   # @default -- Set by Argo CD