From 99efb38d6edaec6b8b5240d63fb89e8b00a1d31d Mon Sep 17 00:00:00 2001
From: William O'Mullane <womullan@lsst.org>
Date: Tue, 2 Apr 2024 11:49:04 -0700
Subject: [PATCH 1/2]  Set APP version 1.0.0 and set S3_ENDPOINT in usdfPROD

---
 applications/consdb/Chart.yaml                | 2 +-
 applications/consdb/README.md                 | 1 +
 applications/consdb/templates/deployment.yaml | 2 ++
 applications/consdb/values-usdfprod.yaml      | 1 +
 applications/consdb/values.yaml               | 2 ++
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/applications/consdb/Chart.yaml b/applications/consdb/Chart.yaml
index 1e3c3b4856..221f24b5ff 100644
--- a/applications/consdb/Chart.yaml
+++ b/applications/consdb/Chart.yaml
@@ -3,7 +3,7 @@ name: consdb-hinfo
 version: 1.0.0
 description: Consolidated Database of Image Metadata
 type: application
-appVersion: tickets-dm-37511
+appVersion: 1.0.0
 home: consdb.lsst.io
 sources:
   - https://github.com/lsst-dm/consdb
diff --git a/applications/consdb/README.md b/applications/consdb/README.md
index 91e351d853..45647cbb6a 100644
--- a/applications/consdb/README.md
+++ b/applications/consdb/README.md
@@ -33,6 +33,7 @@ Consolidated Database of Image Metadata
 | kafka.username | string | `"consdb"` | Username for SASL_PLAIN authentication |
 | lfa.access_key | string | `""` | Access key for LFA bucket |
 | lfa.bucket_prefix | string | `""` | Prefix for LFA bucket (e.g. for Ceph tenant specification) |
+| lfa.s3EndpointUrl | string | `""` | url |
 | nodeSelector | object | `{}` | Node selection rules for the consdb deployment pod |
 | podAnnotations | object | `{}` | Annotations for the consdb deployment pod |
 | replicaCount | int | `1` | Number of consdb deployment pods to start |
diff --git a/applications/consdb/templates/deployment.yaml b/applications/consdb/templates/deployment.yaml
index 0b15927a09..a2aadd5090 100644
--- a/applications/consdb/templates/deployment.yaml
+++ b/applications/consdb/templates/deployment.yaml
@@ -54,6 +54,8 @@ spec:
                   key: "lfa-password"
             - name: "BUCKET_PREFIX"
               value: "{{ .Values.lfa.bucket_prefix }}"
+            - name: "S3_ENDPOINT_URL"
+              value: "{{ .Values.lfa.s3EndpointUrl }}"
             - name: "KAFKA_BOOTSTRAP"
               value: "{{ .Values.kafka.bootstrap }}"
             - name: "KAFKA_USERNAME"
diff --git a/applications/consdb/values-usdfprod.yaml b/applications/consdb/values-usdfprod.yaml
index 8150fedc73..a0ac4b7f57 100644
--- a/applications/consdb/values-usdfprod.yaml
+++ b/applications/consdb/values-usdfprod.yaml
@@ -8,3 +8,4 @@ db:
 lfa:
   access_key: "61JOIKO0VN83YFNC3UUZ"
   bucket_prefix: "rubin:"
+  s3EndpointUrl: "https://s3dfrgw.slac.stanford.edu"
diff --git a/applications/consdb/values.yaml b/applications/consdb/values.yaml
index 0f0bba6fe6..50fa836d66 100644
--- a/applications/consdb/values.yaml
+++ b/applications/consdb/values.yaml
@@ -37,6 +37,8 @@ lfa:
   access_key: ""
   # -- Prefix for LFA bucket (e.g. for Ceph tenant specification)
   bucket_prefix: ""
+  # -- url
+  s3EndpointUrl: ""
 
 ingress:
   # -- Additional annotations for the ingress rule

From fcf762f865973f766af7739c8419f2a65729a859 Mon Sep 17 00:00:00 2001
From: Kian-Tat Lim <ktl@slac.stanford.edu>
Date: Tue, 2 Apr 2024 16:11:39 -0700
Subject: [PATCH 2/2] Add endpoint URL to base.

---
 applications/consdb/values-base.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/consdb/values-base.yaml b/applications/consdb/values-base.yaml
index 094e2d30b5..88baac072e 100644
--- a/applications/consdb/values-base.yaml
+++ b/applications/consdb/values-base.yaml
@@ -4,3 +4,4 @@ db:
   database: "butler"
 lfa:
   access_key: "AL6Y4J5ZYTWRHV04BTC5"
+  s3EndpointUrl: "https://s3.ls.lsst.org"