diff --git a/applications/sasquatch-backpack/Chart.yaml b/applications/sasquatch-backpack/Chart.yaml index 465d5e69de..9c207c083d 100644 --- a/applications/sasquatch-backpack/Chart.yaml +++ b/applications/sasquatch-backpack/Chart.yaml @@ -1,9 +1,14 @@ apiVersion: v2 -appVersion: 0.1.0 -home: https://sasquatch-backpack.lsst.io/ -description: Collection of APIs that feed into Sasquatch +appVersion: 0.3.0 +home: "https://sasquatch-backpack.lsst.io/" +description: "Collection of APIs that feed into Sasquatch" name: sasquatch-backpack sources: -- https://github.com/lsst-sqre/sasquatch-backpack +- "https://github.com/lsst-sqre/sasquatch-backpack" type: application version: 1.0.0 +dependencies: +- redis: + name: "redis" + version: 1.0.14 + repository: "https://lsst-sqre.github.io/charts/" diff --git a/applications/sasquatch-backpack/README.md b/applications/sasquatch-backpack/README.md index 307b579295..2c6a2d412c 100644 --- a/applications/sasquatch-backpack/README.md +++ b/applications/sasquatch-backpack/README.md @@ -13,6 +13,7 @@ Collection of APIs that feed into Sasquatch | Key | Type | Default | Description | |-----|------|---------|-------------| | affinity | object | `{}` | Affinity rules for the sasquatch-backpack deployment pod | +| config.backpackRedisUrl | string | `"redis://sasquatch-backpack-redis.sasquatch-backpack:6379/0"` | Backpack Redis URL | | config.logLevel | string | `"INFO"` | Logging level | | config.logProfile | string | `"production"` | Logging profile (`production` for JSON, `development` for human-friendly) | | config.pathPrefix | string | `"/sasquatch-backpack"` | URL path prefix | diff --git a/applications/sasquatch-backpack/templates/_helpers.tpl b/applications/sasquatch-backpack/templates/_helpers.tpl index d0df04c2ec..e0a15cc41d 100644 --- a/applications/sasquatch-backpack/templates/_helpers.tpl +++ b/applications/sasquatch-backpack/templates/_helpers.tpl @@ -24,3 +24,4 @@ Selector labels app.kubernetes.io/name: "sasquatch-backpack" app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} + diff --git a/applications/sasquatch-backpack/templates/configmap.yaml b/applications/sasquatch-backpack/templates/configmap.yaml index dd221d2560..bb7e00ff6c 100644 --- a/applications/sasquatch-backpack/templates/configmap.yaml +++ b/applications/sasquatch-backpack/templates/configmap.yaml @@ -9,3 +9,4 @@ data: SASQUATCH_BACKPACK_PATH_PREFIX: {{ .Values.config.pathPrefix | quote }} SASQUATCH_BACKPACK_PROFILE: {{ .Values.config.logProfile | quote }} SASQUATCH_REST_PROXY_URL: {{ .Values.config.sasquatchRestProxyUrl | quote }} + BACKPACK_REDIS_URL: {{ .Values.config.backpackRedisUrl | quote }} diff --git a/applications/sasquatch-backpack/templates/cronjob.yaml b/applications/sasquatch-backpack/templates/cronjob.yaml index 5acd074215..16a3afa6f4 100644 --- a/applications/sasquatch-backpack/templates/cronjob.yaml +++ b/applications/sasquatch-backpack/templates/cronjob.yaml @@ -7,6 +7,9 @@ spec: jobTemplate: spec: template: + metadata: + labels: + sasquatch-backpack-redis-client: 'true' spec: containers: - name: sasquatch-backpack @@ -18,6 +21,7 @@ spec: - -d - "10" - "0" + - "--post" envFrom: - configMapRef: name: sasquatch-backpack diff --git a/applications/sasquatch-backpack/values-idfint.yaml b/applications/sasquatch-backpack/values-idfint.yaml index c52c2df4a4..25fd28f44c 100644 --- a/applications/sasquatch-backpack/values-idfint.yaml +++ b/applications/sasquatch-backpack/values-idfint.yaml @@ -1,2 +1,43 @@ config: - sasquatchRestProxyUrl: https://data-int.lsst.cloud/sasquatch-rest-proxy + sasquatchRestProxyUrl: "https://data-int.lsst.cloud/sasquatch-rest-proxy" + +redis: + persistence: + # -- Whether to persist Redis storage. Setting this to false will use + # `emptyDir` which is not recommend in a production environment. + enabled: true + + # -- Amount of persistent storage to request + size: "1Gi" + + # -- Class of storage to request + storageClass: "standard" + + # -- Access mode of storage to request + accessMode: "ReadWriteOnce" + + # -- Use an existing PVC, not dynamic provisioning. If this is set, the + # size, storageClass, and accessMode settings are ignored. + volumeClaimName: "" + + # -- Resource limits and requests for the Redis pod + # @default -- See `values.yaml` + resources: + limits: + cpu: "1" + memory: "40Mi" + requests: + cpu: "50m" + memory: "15Mi" + + # -- Pod annotations for the Redis pod + podAnnotations: {} + + # -- Node selection rules for the Redis pod + nodeSelector: {} + + # -- Tolerations for the Redis pod + tolerations: [] + + # -- Affinity rules for the Redis pod + affinity: {} diff --git a/applications/sasquatch-backpack/values.yaml b/applications/sasquatch-backpack/values.yaml index c01f4c90b3..786fe4f081 100644 --- a/applications/sasquatch-backpack/values.yaml +++ b/applications/sasquatch-backpack/values.yaml @@ -29,6 +29,9 @@ config: # -- Sasquatch REST Proxy URL sasquatchRestProxyUrl: "" + # -- Backpack Redis URL + backpackRedisUrl: "redis://sasquatch-backpack-redis.sasquatch-backpack:6379/0" + ingress: # -- Additional annotations for the ingress rule annotations: {}