From 95f66d23f34c33d033bfd29ccdf5d8b1812c4ca4 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Mon, 9 Dec 2024 14:41:41 -0700 Subject: [PATCH] (pillan) set ingressClassName to traefik --- fleet/lib/blackbox-exporter/fleet.yaml | 6 ++++++ .../lib/blackbox-exporter/overlays/pillan/values.yaml | 2 ++ fleet/lib/ccs-grafana/fleet.yaml | 6 ++++++ fleet/lib/ccs-grafana/overlays/pillan/values.yaml | 3 +++ fleet/lib/ccs-influxdb/fleet.yaml | 6 ++++++ fleet/lib/ccs-influxdb/overlays/pillan/values.yaml | 3 +++ .../kube-prometheus-stack/overlays/pillan/values.yaml | 10 ++++++---- fleet/lib/mimir/overlays/pillan/values.yaml | 3 +++ .../lib/rook-ceph-cluster/overlays/pillan/values.yaml | 3 +++ .../charts/pillan/templates/cephobjectstore-lfa.yaml | 9 +++------ fleet/lib/snmp-exporter/fleet.yaml | 6 ++++++ fleet/lib/snmp-exporter/overlays/pillan/values.yaml | 3 +++ 12 files changed, 50 insertions(+), 10 deletions(-) create mode 100644 fleet/lib/blackbox-exporter/overlays/pillan/values.yaml create mode 100644 fleet/lib/ccs-grafana/overlays/pillan/values.yaml create mode 100644 fleet/lib/ccs-influxdb/overlays/pillan/values.yaml create mode 100644 fleet/lib/snmp-exporter/overlays/pillan/values.yaml diff --git a/fleet/lib/blackbox-exporter/fleet.yaml b/fleet/lib/blackbox-exporter/fleet.yaml index 334931760..c4b891c4e 100644 --- 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 new file mode 100644 index 000000000..097816d69 --- /dev/null +++ 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 index 3641adb90..2160004d4 100644 --- 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 new file mode 100644 index 000000000..73c5d5cf5 --- /dev/null +++ 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 index 31bab9509..d1aa84769 100644 --- 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 new file mode 100644 index 000000000..df8238b0a --- /dev/null +++ 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 index e856e6edb..bf9087659 100644 --- 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 index 82190ee2f..00704f147 100644 --- 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 index 7ca31d292..cc82d116a 100644 --- 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 index 79405a8e4..f58c1e2e0 100644 --- 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 index af12fc901..b34261b49 100644 --- 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 new file mode 100644 index 000000000..df8238b0a --- /dev/null +++ b/fleet/lib/snmp-exporter/overlays/pillan/values.yaml @@ -0,0 +1,3 @@ +--- +ingress: + className: traefik