feat: switch loki to simple scalable

bundles/k3d-standard/README.md

@@ -8,26 +8,76 @@ This bundle is used for demonstration, development, and testing of UDS Core. In
 - [MetalLB](https://metallb.universe.tf/) - Provides type: LoadBalancer for cluster resources and Istio Gateways
 - [HAProxy](https://www.haproxy.org/) - Utilizes k3d host port mapping to bind ports 80 and 443, facilitating local FQDN-based routing through ACLs to MetalLB load balancer backends for Istio Gateways serving *.uds.dev, keycloak.uds.dev, and *.admin.uds.dev.
 
-## Configuration
+## Available Overrides
+## Package: uds-k3d
+##### uds-dev-stack (minio)
+| Variable | Description | Path |
+|----------|-------------|------|
+| `BUCKETS` | Set Minio Buckets | buckets |
+| `SVCACCTS` | Minio Service Accounts | svcaccts |
+| `USERS` | Minio Users | users |
+| `POLICIES` | Minio policies | policies |
 
-### Minio
 
-You can customize the Minio setup at deploy time via your ```uds-config.yaml```.
+## Package: core
+##### loki (loki)
+| Variable | Description | Path |
+|----------|-------------|------|
+| `LOKI_CHUNKS_BUCKET` | The object storage bucket for Loki chunks | loki.storage.bucketNames.chunks |
+| `LOKI_RULER_BUCKET` | The object storage bucket for Loki ruler | loki.storage.bucketNames.ruler |
+| `LOKI_ADMIN_BUCKET` | The object storage bucket for Loki admin | loki.storage.bucketNames.admin |
+| `LOKI_S3_ENDPOINT` | The S3 endpoint | loki.storage.s3.endpoint |
+| `LOKI_S3_REGION` | The S3 region | loki.storage.s3.region |
+| `LOKI_S3_ACCESS_KEY_ID` | The S3 Access Key ID | loki.storage.s3.accessKeyId |
+| `LOKI_S3_SECRET_ACCESS_KEY` | The S3 Secret Access Key | loki.storage.s3.secretAccessKey |
 
-Example:
+##### istio-admin-gateway (uds-istio-config)
+| Variable | Description | Path |
+|----------|-------------|------|
+| `ADMIN_TLS_CERT` | The TLS cert for the admin gateway (must be base64 encoded) | tls.cert |
+| `ADMIN_TLS_KEY` | The TLS key for the admin gateway (must be base64 encoded) | tls.key |
+
+##### istio-tenant-gateway (uds-istio-config)
+| Variable | Description | Path |
+|----------|-------------|------|
+| `TENANT_TLS_CERT` | The TLS cert for the tenant gateway (must be base64 encoded) | tls.cert |
+| `TENANT_TLS_KEY` | The TLS key for the tenant gateway (must be base64 encoded) | tls.key |
+
+
+## Override Examples:
+
+### Minio Customization
+
+You can customize the Minio deployed with uds-k3d at deploy time via your ```uds-config.yaml```.
 
 ```yaml
 variables:
   uds-k3d-dev:
-    set:
-      buckets:
-        - name: "myfavoritebucket"
-          policy: "public"
-          purge: false
-      users:
-        - accessKey: console
-          secretKey: "console-secret"
-          policy: consoleAdmin
+    BUCKETS:
+      - name: "myfavoritebucket"
+        policy: "public"
+        purge: false
+    USERS:
+      - accessKey: console
+        secretKey: "console-secret"
+        policy: consoleAdmin
 ```
 
 For more details on how to customize the Minio deployment, please see [Configuring Minio](https://github.com/defenseunicorns/uds-k3d/blob/main/docs/MINIO.md).
+
+### Loki example using AWS S3
+By default Loki will be configured to use the uds-k3d built in Minio, but variables are exposed with this bundle to configure external object storage
+
+You can customize the Loki setup at deploy time via ```uds-config.yaml```
+
+```yaml
+variables:
+  core:
+    LOKI_CHUNKS_BUCKET: loki
+    LOKI_RULES_BUCKET: loki
+    LOKI_ADMIN_BUCKET: loki
+    LOKI_S3_ENDPOINT: loki.s3.us-east-1.amazonaws.com
+    LOKI_S3_REGION: us-east-1
+    LOKI_S3_ACCESS_KEY_ID: <ACCESS_KEY_ID>
+    LOKI_S3_SECRET_ACCESS_KEY: <SECRET_ACCESS_KEY>
+```

bundles/k3d-standard/uds-bundle.yaml

@@ -14,6 +14,12 @@ packages:
     overrides:
       uds-dev-stack:
         minio:
+          values:
+            - path: "users"
+              value:
+                - accessKey: logging
+                  secretKey: "logging-secret"
+                  policy: readwrite
           variables:
             - name: buckets
               description: "Set Minio Buckets"
@@ -39,6 +45,30 @@ packages:
     ref: 0.12.0
     # x-release-please-end
     overrides:
+      loki:
+        loki:
+          variables:
+            - name: LOKI_CHUNKS_BUCKET
+              description: "The object storage bucket for Loki chunks"
+              path: loki.storage.bucketNames.chunks
+            - name: LOKI_RULER_BUCKET
+              description: "The object storage bucket for Loki ruler"
+              path: loki.storage.bucketNames.ruler
+            - name: LOKI_ADMIN_BUCKET
+              description: "The object storage bucket for Loki admin"
+              path: loki.storage.bucketNames.admin
+            - name: LOKI_S3_ENDPOINT
+              description: "The S3 endpoint"
+              path: loki.storage.s3.endpoint
+            - name: LOKI_S3_REGION
+              description: "The S3 region"
+              path: loki.storage.s3.region
+            - name: LOKI_S3_ACCESS_KEY_ID
+              description: "The S3 Access Key ID"
+              path: loki.storage.s3.accessKeyId
+            - name: LOKI_S3_SECRET_ACCESS_KEY
+              path: loki.storage.s3.secretAccessKey
+              description: "The S3 Secret Access Key"
       istio-admin-gateway:
         uds-istio-config:
           variables:

bundles/k3d-test/uds-bundle.yaml

@@ -0,0 +1,25 @@
+kind: UDSBundle
+metadata:
+  name: k3d-core-test
+  description: A UDS bundle for deploying uds-k3d-dev for CI/test
+  version: test
+
+packages:
+  - name: uds-k3d-dev
+    repository: ghcr.io/defenseunicorns/packages/uds-k3d
+    # renovate: datasource=github-tags depName=defenseunicorns/uds-k3d versioning=semver
+    ref: 0.3.1
+    overrides:
+      uds-dev-stack:
+        minio:
+          values:
+            - path: "users"
+              value:
+                - accessKey: logging
+                  secretKey: "logging-secret"
+                  policy: readwrite
+
+  - name: init
+    repository: ghcr.io/defenseunicorns/packages/init
+    # renovate: datasource=github-tags depName=defenseunicorns/zarf versioning=semver
+    ref: v0.32.2

src/loki/chart/templates/peerauthentication/loki-simple-scalable.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.scalable }}
+{{- if .Capabilities.APIVersions.Has "security.istio.io/v1beta1" }}
 apiVersion: "security.istio.io/v1beta1"
 kind: PeerAuthentication
 metadata:

src/loki/values/values.yaml

@@ -7,7 +7,17 @@ clusterLabelOverride: null
 
 loki:
   storage:
-    type: "filesystem"
+    bucketNames:
+      chunks: test
+      ruler: test
+      admin: test
+    type: s3
+    s3:
+      endpoint: http://minio.uds-dev-stack.svc.cluster.local:9000
+      secretAccessKey: logging-secret
+      accessKeyId: logging
+      s3ForcePathStyle: true
+      insecure: false
   commonConfig:
     replication_factor: 1
   # Should authentication be enabled
@@ -50,27 +60,18 @@ test:
   enabled: false
 # Configuration for the write pod(s)
 write:
-  resources:
-    limits:
-      cpu: 300m
-      memory: 2Gi
-    requests:
-      cpu: 300m
-      memory: 2Gi
+  # Remove default anti-affinity since this is a 1-replica setup
+  affinity: ""
+
 # Configuration for the read pod(s)
 read:
-  # -- Resource requests and limits for the read
-  resources:
-    limits:
-      cpu: 300m
-      memory: 2Gi
-    requests:
-      cpu: 300m
-      memory: 2Gi
+  # Remove default anti-affinity since this is a 1-replica setup
+  affinity: ""
+
 # Configuration for the single binary node(s)
 singleBinary:
   # -- Number of replicas for the single binary
-  replicas: 1
+  replicas: 0
   # -- Resource requests and limits for the single binary
   resources:
     limits:
@@ -120,3 +121,7 @@ gateway:
   enabled: true
   # Remove default anti-affinity since this is a 1-replica setup
   affinity: ""
+
+backend:
+  # Remove default anti-affinity since this is a 1-replica setup
+  affinity: ""

src/loki/zarf.yaml

@@ -21,7 +21,7 @@ components:
 
   - name: loki
     required: true
-    description: "Install Loki using Chainguard images"
+    description: "Install Loki using registry1 images"
     only:
       flavor: "registry1"
     import:

tasks/create.yaml

@@ -31,6 +31,12 @@ tasks:
       - description: "Create the UDS Core Istio Only Bundle"
         cmd: "uds create bundles/k3d-istio --confirm --no-progress --architecture=${ZARF_ARCHITECTURE}"
 
+  - name: k3d-test-bundle
+    description: "Create the test Bundle"
+    actions:
+      - description: "Create the test Bundle"
+        cmd: "uds create bundles/k3d-test --confirm --no-progress --architecture=${ZARF_ARCHITECTURE}"
+
   - name: single-package
     description: "Create a single Zarf Package, must set UDS_PKG environment variable"
     actions:

tasks/deploy.yaml

@@ -28,6 +28,11 @@ tasks:
       - description: "Deploy the requested Zarf Package (must set UDS_PKG environment variable)"
         cmd: uds zarf package deploy build/zarf-package-uds-core-${UDS_PKG}-${UDS_ARCH}.tar.zst --confirm
 
+  - name: k3d-test-bundle
+    actions:
+      - description: "Deploy the UDS Test Bundle"
+        cmd: uds deploy bundles/k3d-test/uds-bundle-k3d-core-test-${UDS_ARCH}-test.tar.zst --confirm --no-progress
+
   - name: latest-package-release
     actions:
       - description: "Get latest tag version from OCI"

tasks/test.yaml

@@ -7,8 +7,9 @@ tasks:
   - name: single-package
     description: "Build and test a single package, must set UDS_PKG environment variable"
     actions:
+      - task: create:k3d-test-bundle
+      - task: deploy:k3d-test-bundle
       - task: create:single-package
-      - task: setup:k3d-test-cluster
       - task: deploy:single-package
 
       - description: "Validate the package"
@@ -37,7 +38,8 @@ tasks:
   - name: uds-core-upgrade
     description: "Test an upgrade from the latest released UDS Core package to current branch"
     actions:
-      - task: setup:k3d-test-cluster
+      - task: create:k3d-test-bundle
+      - task: deploy:k3d-test-bundle
       - task: deploy:latest-package-release
       - task: create:standard-package
       - task: deploy:standard-package