(pillan) set ingressClassName to traefik

lsst-it · Dec 12, 2024 · 95f66d2 · 95f66d2
1 parent 9406ac9
commit 95f66d2
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 10 deletions.
diff --git a/fleet/lib/blackbox-exporter/fleet.yaml b/fleet/lib/blackbox-exporter/fleet.yaml
@@ -17,3 +17,9 @@ dependsOn:
   - selector:
       matchLabels:
         bundle: prometheus-operator-crds
+targetCustomizations:
+  - name: pillan
+    clusterName: pillan
+    helm:
+      valuesFiles:
+        - overlays/pillan/values.yaml
diff --git a/fleet/lib/blackbox-exporter/overlays/pillan/values.yaml b/fleet/lib/blackbox-exporter/overlays/pillan/values.yaml
@@ -0,0 +1,2 @@
+ingress:
+  className: traefik
diff --git a/fleet/lib/ccs-grafana/fleet.yaml b/fleet/lib/ccs-grafana/fleet.yaml
@@ -17,3 +17,9 @@ dependsOn:
   - selector:
       matchLabels:
         bundle: ccs-influxdb
+targetCustomizations:
+  - name: pillan
+    clusterName: pillan
+    helm:
+      valuesFiles:
+        - overlays/pillan/values.yaml
diff --git a/fleet/lib/ccs-grafana/overlays/pillan/values.yaml b/fleet/lib/ccs-grafana/overlays/pillan/values.yaml
@@ -0,0 +1,3 @@
+---
+ingress:
+  ingressClassName: traefik
diff --git a/fleet/lib/ccs-influxdb/fleet.yaml b/fleet/lib/ccs-influxdb/fleet.yaml
@@ -13,3 +13,9 @@ helm:
   waitForJobs: true
   valuesFiles:
     - values.yaml
+targetCustomizations:
+  - name: pillan
+    clusterName: pillan
+    helm:
+      valuesFiles:
+        - overlays/pillan/values.yaml
diff --git a/fleet/lib/ccs-influxdb/overlays/pillan/values.yaml b/fleet/lib/ccs-influxdb/overlays/pillan/values.yaml
@@ -0,0 +1,3 @@
+---
+ingress:
+  className: traefik
diff --git a/fleet/lib/kube-prometheus-stack/overlays/pillan/values.yaml b/fleet/lib/kube-prometheus-stack/overlays/pillan/values.yaml
@@ -1,5 +1,7 @@
 ---
 prometheus:
+  ingress:
+    ingressClassName: traefik
   prometheusSpec:
     configMaps:
       - sd-snmp-network
@@ -106,15 +108,15 @@ prometheus:
             target_label: instance
           - target_label: __address__
             replacement: prometheus-snmp-exporter.snmp-exporter:9116
+alertmanager:
+  ingress:
+    ingressClassName: traefik
 grafana:
   ingress:
     enabled: true
-    ingressClassName: nginx
+    ingressClassName: traefik
     annotations:
       cert-manager.io/cluster-issuer: letsencrypt
-      nginx.ingress.kubernetes.io/backend-protocol: HTTP
-      nginx.ingress.kubernetes.io/server-snippet: |
-        proxy_ssl_verify off;
     paths:
       - /
     pathType: Prefix

diff --git a/fleet/lib/mimir/overlays/pillan/values.yaml b/fleet/lib/mimir/overlays/pillan/values.yaml
@@ -8,3 +8,6 @@ mimir:
           endpoint: s3.${ .ClusterName }.${ .ClusterLabels.site }.lsst.org
     limits:
       compactor_blocks_retention_period: 180d
+gateway:
+  ingress:
+    ingressClassName: traefik
diff --git a/fleet/lib/rook-ceph-cluster/overlays/pillan/values.yaml b/fleet/lib/rook-ceph-cluster/overlays/pillan/values.yaml
@@ -1,4 +1,7 @@
 ---
+ingress:
+  dashboard:
+    ingressClassName: traefik
 cephClusterSpec:
   mon:
     count: 5

diff --git a/fleet/lib/rook-ceph-conf/charts/pillan/templates/cephobjectstore-lfa.yaml b/fleet/lib/rook-ceph-conf/charts/pillan/templates/cephobjectstore-lfa.yaml
@@ -46,9 +46,8 @@ metadata:
   namespace: rook-ceph
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    nginx.ingress.kubernetes.io/proxy-body-size: 1024m
 spec:
-  ingressClassName: nginx
+  ingressClassName: traefik
   tls:
     - hosts:
         - &host s3.pillan.tu.lsst.org
@@ -72,9 +71,8 @@ metadata:
   namespace: rook-ceph
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    nginx.ingress.kubernetes.io/proxy-body-size: 1024m
 spec:
-  ingressClassName: nginx
+  ingressClassName: traefik
   tls:
     - hosts:
         - s3.tu.lsst.org
@@ -98,9 +96,8 @@ metadata:
   namespace: rook-ceph
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt
-    nginx.ingress.kubernetes.io/proxy-body-size: 1024m
 spec:
-  ingressClassName: nginx
+  ingressClassName: traefik
   tls:
     - hosts:
         - s3.rubintv.tu.lsst.org

diff --git a/fleet/lib/snmp-exporter/fleet.yaml b/fleet/lib/snmp-exporter/fleet.yaml
@@ -20,3 +20,9 @@ dependsOn:
   - selector:
       matchLabels:
         bundle: prometheus-operator-crds
+targetCustomizations:
+  - name: pillan
+    clusterName: pillan
+    helm:
+      valuesFiles:
+        - overlays/pillan/values.yaml
diff --git a/fleet/lib/snmp-exporter/overlays/pillan/values.yaml b/fleet/lib/snmp-exporter/overlays/pillan/values.yaml
@@ -0,0 +1,3 @@
+---
+ingress:
+  className: traefik