Merge pull request #965 from lsst-it/IT-6351_assign_ipaddresspool_loki_kueyen

(kueyen) Add loki-pre for external secrets. Improve loki values

Author: gseriche

fleet/lib/loki-pre/fleet.yaml

@@ -0,0 +1,26 @@
+---
+defaultNamespace: loki
+labels:
+  bundle: &name loki-pre
+namespaceLabels:
+  lsst.io/discover: "true"
+helm:
+  releaseName: *name
+  takeOwnership: true
+  timeoutSeconds: 300
+  waitForJobs: false
+dependsOn:
+  - selector:
+      matchLabels:
+        bundle: external-secrets
+targetCustomizations:
+  - name: kueyen
+    clusterSelector:
+      matchExpressions:
+        - key: management.cattle.io/cluster-display-name
+          operator: In
+          values:
+            - kueyen
+    yaml:
+      overlays:
+        - kueyen

fleet/lib/loki-pre/overlays/kueyen/externalsecret-loki-s3.yaml

@@ -0,0 +1,18 @@
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: loki-s3
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: onepassword
+  data:
+    - secretKey: AWS_ACCESS_KEY_ID
+      remoteRef:
+        key: &item loki
+        property: AWS_ACCESS_KEY_ID
+    - secretKey: AWS_SECRET_ACCESS_KEY
+      remoteRef:
+        key: *item
+        property: AWS_SECRET_ACCESS_KEY

fleet/lib/loki/fleet.yaml

@@ -14,6 +14,10 @@ helm:
   waitForJobs: true
   valuesFiles:
     - values.yaml
+dependsOn:
+  - selector:
+      matchLabels:
+        bundle: loki-pre
 
 targetCustomizations:
   - name: kueyen

fleet/lib/loki/values.yaml

@@ -52,6 +52,15 @@ gateway:
       nginx.ingress.kubernetes.io/client-body-buffer-size: 10m
       nginx.ingress.kubernetes.io/proxy-read-timeout: "60"
       nginx.ingress.kubernetes.io/proxy-send-timeout: "60"
+    hosts:
+      - host: loki.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
+        paths:
+          - path: /
+            pathType: Prefix
+    tls:
+      - secretName: tls-loki-ingress
+        hosts:
+          - loki.${ get .ClusterLabels "management.cattle.io/cluster-display-name" }.${ .ClusterLabels.site }.lsst.org
 
 ruler:
   enabled: false

fleet/s/dev/c/kueyen/loki-pre

@@ -0,0 +1 @@
+../../../../lib/loki-pre