Merge pull request #3159 from lsst-sqre/tickets/DM-43463a

Set APP version 1.0.0 and set S3_ENDPOINT in usdf_prod
lsst-sqre · Apr 2, 2024 · f48aaa5 · f48aaa5
2 parents d68aef6 + fcf762f
commit f48aaa5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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-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"
diff --git 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
@@ -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