-16

zlay/deploy/collectiondir-servicemonitor.yaml

reviewed

··· 1 1 - apiVersion: monitoring.coreos.com/v1 2 2 - kind: ServiceMonitor 3 3 - metadata: 4 4 - name: collectiondir 5 5 - namespace: monitoring 6 6 - spec: 7 7 - selector: 8 8 - matchLabels: 9 9 - app.kubernetes.io/name: collectiondir 10 10 - namespaceSelector: 11 11 - matchNames: 12 12 - - zlay 13 13 - endpoints: 14 14 - - port: http 15 15 - path: /metrics 16 16 - interval: 30s

-70

zlay/deploy/collectiondir-values.yaml

reviewed

··· 1 1 - # bjw-s/app-template helm values for the collectiondir shadow service 2 2 - # schema: https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template 3 3 - 4 4 - controllers: 5 5 - collectiondir: 6 6 - containers: 7 7 - main: 8 8 - image: 9 9 - repository: atcr.io/zzstoatzz.io/zlay 10 10 - tag: latest # overridden by `kubectl set image` at deploy time 11 11 - pullPolicy: IfNotPresent 12 12 - command: ["/usr/local/bin/collectiondir"] 13 13 - env: 14 14 - LISTEN_PORT: "2510" 15 15 - RELAY_URL: "zlay" 16 16 - RELAY_PORT: "3000" 17 17 - RELAY_TLS: "false" 18 18 - COLLECTION_INDEX_DIR: /data/collection-index 19 19 - MALLOC_ARENA_MAX: "2" 20 20 - MALLOC_TRIM_THRESHOLD_: "131072" 21 21 - RELAY_ADMIN_PASSWORD: 22 22 - valueFrom: 23 23 - secretKeyRef: 24 24 - name: zlay-secret 25 25 - key: RELAY_ADMIN_PASSWORD 26 26 - probes: 27 27 - liveness: 28 28 - enabled: true 29 29 - custom: true 30 30 - spec: 31 31 - httpGet: 32 32 - path: /_healthz 33 33 - port: 2510 34 34 - initialDelaySeconds: 10 35 35 - periodSeconds: 30 36 36 - timeoutSeconds: 5 37 37 - failureThreshold: 5 38 38 - readiness: 39 39 - enabled: true 40 40 - custom: true 41 41 - spec: 42 42 - httpGet: 43 43 - path: /_health 44 44 - port: 2510 45 45 - initialDelaySeconds: 5 46 46 - periodSeconds: 15 47 47 - timeoutSeconds: 5 48 48 - failureThreshold: 3 49 49 - resources: 50 50 - requests: 51 51 - memory: 256Mi 52 52 - cpu: 200m 53 53 - limits: 54 54 - memory: 2Gi 55 55 - 56 56 - service: 57 57 - collectiondir: 58 58 - controller: collectiondir 59 59 - ports: 60 60 - http: 61 61 - port: 2510 62 62 - metrics: 63 63 - port: 2510 # metrics served on same port at /metrics 64 64 - 65 65 - persistence: 66 66 - data: 67 67 - enabled: true 68 68 - type: persistentVolumeClaim 69 69 - accessMode: ReadWriteOnce 70 70 - size: 10Gi

+1 -26

zlay/justfile

reviewed

··· 170 170 ctr -n k8s.io images import /tmp/zlay.tar 171 171 rm -f /tmp/zlay.tar 172 172 173 173 - echo "==> updating zlay deployment image" 173 173 + echo "==> updating deployment image" 174 174 kubectl set image deployment/zlay -n zlay main="${IMAGE}" 175 175 kubectl rollout status deployment/zlay -n zlay --timeout=120s 176 176 - 177 177 - # update collectiondir if it exists 178 178 - if kubectl get deployment/collectiondir -n zlay &>/dev/null; then 179 179 - echo "==> updating collectiondir deployment image" 180 180 - kubectl set image deployment/collectiondir -n zlay main="${IMAGE}" 181 181 - kubectl rollout status deployment/collectiondir -n zlay --timeout=120s 182 182 - fi 183 176 184 177 echo "==> deployed ${IMAGE}" 185 178 DEPLOY ··· 214 207 215 208 echo "==> deployed ${IMAGE} (GPA enabled — SIGTERM to get leak report)" 216 209 DEPLOY 217 217 - 218 218 - # --- collectiondir --- 219 219 - 220 220 - # deploy collectiondir shadow service to the zlay cluster 221 221 - deploy-collectiondir: 222 222 - #!/usr/bin/env bash 223 223 - set -euo pipefail 224 224 - echo "==> installing collectiondir" 225 225 - helm upgrade --install collectiondir bjw-s/app-template \ 226 226 - --namespace zlay \ 227 227 - --values deploy/collectiondir-values.yaml \ 228 228 - --wait --timeout 5m 229 229 - kubectl apply -f deploy/collectiondir-servicemonitor.yaml 230 230 - echo "==> collectiondir deployed" 231 231 - 232 232 - # tail collectiondir logs 233 233 - logs-collectiondir: 234 234 - kubectl logs -n zlay deploy/collectiondir -f 235 210 236 211 # --- status --- 237 212