Merge pull request #4187 from lsst-sqre/u/afausti/fixup-sasquatch-ing…

…ress Fix Sasquatch ingresses
lsst-sqre · Feb 11, 2025 · ea58172 · ea58172
2 parents 95c3cc9 + c6c9dc0
commit ea58172
Show file tree

Hide file tree

Showing 13 changed files with 94 additions and 15 deletions.
diff --git a/applications/sasquatch/README.md b/applications/sasquatch/README.md
@@ -29,12 +29,16 @@ Rubin Observatory's telemetry service
 | chronograf.ingress.className | string | `"nginx"` | Ingress class to use |
 | chronograf.ingress.enabled | bool | `false` | Whether to enable the Chronograf ingress |
 | chronograf.ingress.hostname | string | None, must be set if the ingress is enabled | Hostname of the ingress |
-| chronograf.ingress.path | string | `"/chronograf(/\|$)"` | Path for the ingress |
+| chronograf.ingress.path | string | `"/chronograf"` | Path for the ingress |
 | chronograf.ingress.tls | bool | `false` | Whether to obtain TLS certificates for the ingress hostname |
 | chronograf.persistence.enabled | bool | `true` | Whether to enable persistence for Chronograf data |
 | chronograf.persistence.size | string | `"100Gi"` | Size of data store to request, if enabled |
 | chronograf.resources | object | See `values.yaml` | Kubernetes resource requests and limits for Chronograf |
 | chronograf.updateStrategy.type | string | `"Recreate"` | Deployment strategy, use recreate with persistence enabled |
+| customInfluxDBIngress.annotations | object | See `values.yaml` | Annotations to add to the ingress |
+| customInfluxDBIngress.enabled | bool | `false` | Whether to enable the custom ingress for InfluxDB OSS |
+| customInfluxDBIngress.hostname | string | None, must be set if the ingress is enabled | Hostname of the ingress |
+| customInfluxDBIngress.path | string | `"/influxdb(/\|$)(.*)"` | Path for the ingress |
 | influxdb-enterprise.enabled | bool | `false` | Whether to use influxdb-enterprise |
 | influxdb.config.continuous_queries.enabled | bool | `false` | Whether continuous queries are enabled |
 | influxdb.config.coordinator.log-queries-after | string | `"15s"` | Maximum duration a query can run before InfluxDB logs it as a slow query |

diff --git a/applications/sasquatch/charts/rest-proxy/templates/ingress.yaml b/applications/sasquatch/charts/rest-proxy/templates/ingress.yaml
@@ -18,7 +18,7 @@ spec:
       http:
         paths:
           - path: {{ $ingressPath }}
-            pathType: Prefix
+            pathType: ImplementationSpecific
             backend:
               service:
                 name: {{ $fullName }}

diff --git a/applications/sasquatch/charts/strimzi-kafka/templates/schema-registry-ingress.yaml b/applications/sasquatch/charts/strimzi-kafka/templates/schema-registry-ingress.yaml
@@ -16,7 +16,7 @@ spec:
       http:
         paths:
           - path: {{ .Values.registry.ingress.path }}
-            pathType: Prefix
+            pathType: ImplementationSpecific
             backend:
               service:
                 name: sasquatch-schema-registry

diff --git a/applications/sasquatch/templates/influxdb-ingress.yaml b/applications/sasquatch/templates/influxdb-ingress.yaml
@@ -0,0 +1,26 @@
+{{- if .Values.customInfluxDBIngress.enabled }}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: sasquatch-influxdb
+  labels:
+    app.kubernetes.io/instance: sasquatch
+    app.kubernetes.io/name: influxdb
+{{- if .Values.customInfluxDBIngress.annotations }}
+  annotations:
+{{ toYaml .Values.customInfluxDBIngress.annotations | indent 4 }}
+{{- end }}
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: {{ .Values.customInfluxDBIngress.hostname | quote }}
+      http:
+        paths:
+          - path: {{ .Values.customInfluxDBIngress.path }}
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: sasquatch-influxdb
+                port:
+                  number: 8086
+{{- end }}
diff --git a/applications/sasquatch/values-base.yaml b/applications/sasquatch/values-base.yaml
@@ -135,11 +135,11 @@ strimzi-kafka:
         effect: "NoSchedule"
 
 influxdb:
-  persistence:
-    storageClass: rook-ceph-block
   ingress:
-    enabled: true
+    enabled: false
     hostname: base-lsp.lsst.codes
+  persistence:
+    storageClass: rook-ceph-block
   resources:
     requests:
       memory: 16Gi
@@ -148,6 +148,10 @@ influxdb:
       memory: 16Gi
       cpu: 8
 
+customInfluxDBIngress:
+  enabled: true
+  hostname: base-lsp.lsst.codes
+
 telegraf-kafka-consumer:
   enabled: true
   kafkaConsumers:

diff --git a/applications/sasquatch/values-idfdev.yaml b/applications/sasquatch/values-idfdev.yaml
@@ -54,7 +54,7 @@ strimzi-kafka:
 
 influxdb:
   ingress:
-    enabled: true
+    enabled: false
     hostname: data-dev.lsst.cloud
   resources:
     requests:
@@ -64,6 +64,10 @@ influxdb:
       memory: 16Gi
       cpu: 2
 
+customInfluxDBIngress:
+  enabled: true
+  hostname: data-dev.lsst.cloud
+
 influxdb-enterprise:
   enabled: true
   license:

diff --git a/applications/sasquatch/values-idfint.yaml b/applications/sasquatch/values-idfint.yaml
@@ -63,7 +63,7 @@ strimzi-kafka:
 
 influxdb:
   ingress:
-    enabled: true
+    enabled: false
     hostname: data-int.lsst.cloud
   resources:
     requests:
@@ -73,6 +73,10 @@ influxdb:
       memory: 16Gi
       cpu: 2
 
+customInfluxDBIngress:
+  enabled: true
+  hostname: data-int.lsst.cloud
+
 telegraf-kafka-consumer:
   enabled: true
   kafkaConsumers:

diff --git a/applications/sasquatch/values-idfprod.yaml b/applications/sasquatch/values-idfprod.yaml
@@ -45,7 +45,7 @@ strimzi-kafka:
 
 influxdb:
   ingress:
-    enabled: true
+    enabled: false
     hostname: data.lsst.cloud
   resources:
     requests:
@@ -55,6 +55,10 @@ influxdb:
       memory: 8Gi
       cpu: 1
 
+customInfluxDBIngress:
+  enabled: true
+  hostname: data.lsst.cloud
+
 telegraf-kafka-consumer:
   enabled: true
   kafkaConsumers:

diff --git a/applications/sasquatch/values-summit.yaml b/applications/sasquatch/values-summit.yaml
@@ -121,7 +121,7 @@ influxdb:
     storageClass: rook-ceph-block
     size: 5Ti
   ingress:
-    enabled: true
+    enabled: false
     hostname: summit-lsp.lsst.codes
   resources:
     requests:
@@ -131,6 +131,10 @@ influxdb:
       memory: 128Gi
       cpu: 16
 
+customInfluxDBIngress:
+  enabled: true
+  hostname: summit-lsp.lsst.codes
+
 influxdb-enterprise:
   enabled: true
   license:

diff --git a/applications/sasquatch/values-tucson-teststand.yaml b/applications/sasquatch/values-tucson-teststand.yaml
@@ -74,9 +74,13 @@ influxdb:
   persistence:
     storageClass: rook-ceph-block
   ingress:
-    enabled: true
+    enabled: false
     hostname: tucson-teststand.lsst.codes
 
+customInfluxDBIngress:
+  enabled: true
+  hostname: tucson-teststand.lsst.codes
+
 telegraf-kafka-consumer:
   enabled: true
   kafkaConsumers:

diff --git a/applications/sasquatch/values-usdfdev.yaml b/applications/sasquatch/values-usdfdev.yaml
@@ -31,12 +31,16 @@ strimzi-kafka:
 
 influxdb:
   ingress:
-    enabled: true
+    enabled: false
     hostname: usdf-rsp-dev.slac.stanford.edu
   persistence:
     enabled: true
     size: 15Ti
 
+customInfluxDBIngress:
+  enabled: true
+  hostname: usdf-rsp-dev.slac.stanford.edu
+
 kafka-connect-manager:
   influxdbSink:
     # Based on the kafka producers configuration for the BTS

diff --git a/applications/sasquatch/values-usdfint.yaml b/applications/sasquatch/values-usdfint.yaml
@@ -27,12 +27,16 @@ strimzi-kafka:
 
 influxdb:
   ingress:
-    enabled: true
+    enabled: false
     hostname: usdf-rsp-int.slac.stanford.edu
   persistence:
     enabled: true
     size: 15Ti
 
+customInfluxDBIngress:
+  enabled: true
+  hostname: usdf-rsp-int.slac.stanford.edu
+
 kafka-connect-manager:
   influxdbSink:
     # Based on the kafka producers configuration for the BTS

diff --git a/applications/sasquatch/values.yaml b/applications/sasquatch/values.yaml
@@ -160,6 +160,23 @@ influxdb:
       memory: 96Gi
       cpu: 8
 
+customInfluxDBIngress:
+  # -- Whether to enable the custom ingress for InfluxDB OSS
+  enabled: false
+
+  # -- Hostname of the ingress
+  # @default -- None, must be set if the ingress is enabled
+  hostname: ""
+
+  # -- Annotations to add to the ingress
+  # @default -- See `values.yaml`
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /$2
+
+  # -- Path for the ingress
+  # @default -- `"/influxdb(/\|$)(.*)"`
+  path: "/influxdb(/|$)(.*)"
+
 influxdb-enterprise:
   # -- Whether to use influxdb-enterprise
   enabled: false
@@ -215,8 +232,8 @@ chronograf:
     className: "nginx"
 
     # -- Path for the ingress
-    # @default -- `"/chronograf(/\|$)"`
-    path: "/chronograf(/|$)"
+    # @default -- `"/chronograf"`
+    path: "/chronograf"
 
   # -- Additional environment variables for Chronograf
   # @default -- See `values.yaml`