Merge pull request #2854 from lsst-sqre/tickets/DM-42357

DM-42357: Use the new postgres users in dev prompt processing

applications/prompt-proto-service-hsc/README.md

@@ -22,6 +22,7 @@ Prompt Proto Service is an event driven service for processing camera images. Th
 | prompt-proto-service.imageNotifications.kafkaClusterAddress | string | None, must be set | Hostname and port of the Kafka provider |
 | prompt-proto-service.imageNotifications.topic | string | None, must be set | Topic where raw image arrival notifications appear |
 | prompt-proto-service.instrument.calibRepo | string | None, must be set | URI to the shared repo used for calibrations, templates, and pipeline outputs. If `registry.centralRepoFile` is set, this URI points to a local redirect instead of the central repo itself. |
+| prompt-proto-service.instrument.calibRepoPguser | string | None, must be set | Postgres username to access the shared butler repo for calibrations, templates, and pipeline outputs. If `registry.centralRepoFile` is set, a local redirect is used and its config may override this config. |
 | prompt-proto-service.instrument.name | string | `"HSC"` | The "short" name of the instrument |
 | prompt-proto-service.instrument.pipelines | string | None, must be set | Machine-readable string describing which pipeline(s) should be run for which visits. Notation is complex and still in flux; see [the source code](https://github.com/lsst-dm/prompt_processing/blob/main/python/activator/config.py) for examples. |
 | prompt-proto-service.instrument.skymap | string | `"hsc_rings_v1"` | Skymap to use with the instrument |

applications/prompt-proto-service-hsc/values-usdfdev-prompt-processing.yaml

@@ -13,6 +13,7 @@ prompt-proto-service:
   instrument:
     pipelines: (survey="SURVEY")=[${PROMPT_PROCESSING_DIR}/pipelines/HSC/ApPipe.yaml]
     calibRepo: s3://rubin:rubin-pp-users/central_repo/
+    calibRepoPguser: hsc_prompt
 
   s3:
     imageBucket: rubin:rubin-pp

applications/prompt-proto-service-hsc/values.yaml

@@ -32,6 +32,10 @@ prompt-proto-service:
     # If `registry.centralRepoFile` is set, this URI points to a local redirect instead of the central repo itself.
     # @default -- None, must be set
     calibRepo: ""
+    # -- Postgres username to access the shared butler repo for calibrations, templates, and pipeline outputs.
+    # If `registry.centralRepoFile` is set, a local redirect is used and its config may override this config.
+    # @default -- None, must be set
+    calibRepoPguser: ""
 
   s3:
     # -- Bucket containing the incoming raw images

applications/prompt-proto-service-latiss/README.md

@@ -22,6 +22,7 @@ Prompt Proto Service is an event driven service for processing camera images. Th
 | prompt-proto-service.imageNotifications.kafkaClusterAddress | string | None, must be set | Hostname and port of the Kafka provider |
 | prompt-proto-service.imageNotifications.topic | string | None, must be set | Topic where raw image arrival notifications appear |
 | prompt-proto-service.instrument.calibRepo | string | None, must be set | URI to the shared repo used for calibrations, templates, and pipeline outputs. If `registry.centralRepoFile` is set, this URI points to a local redirect instead of the central repo itself. |
+| prompt-proto-service.instrument.calibRepoPguser | string | None, must be set | Postgres username to access the shared butler repo for calibrations, templates, and pipeline outputs. If `registry.centralRepoFile` is set, a local redirect is used and its config may override this config. |
 | prompt-proto-service.instrument.name | string | `"LATISS"` | The "short" name of the instrument |
 | prompt-proto-service.instrument.pipelines | string | None, must be set | Machine-readable string describing which pipeline(s) should be run for which visits. Notation is complex and still in flux; see [the source code](https://github.com/lsst-dm/prompt_processing/blob/main/python/activator/config.py) for examples. |
 | prompt-proto-service.instrument.skymap | string | `"latiss_v1"` | Skymap to use with the instrument |

applications/prompt-proto-service-latiss/values-usdfdev-prompt-processing.yaml

@@ -14,11 +14,13 @@ prompt-proto-service:
     pipelines: >-
       (survey="SURVEY")=[${PROMPT_PROCESSING_DIR}/pipelines/LATISS/ApPipe.yaml,
       ${PROMPT_PROCESSING_DIR}/pipelines/LATISS/Isr.yaml]
-    calibRepo: s3://rubin-pp-users/central_repo/
+    calibRepo: s3://rubin:rubin-pp-users/central_repo/
+    calibRepoPguser: latiss_prompt
 
   s3:
-    imageBucket: rubin-pp
+    imageBucket: rubin:rubin-pp
     endpointUrl: https://s3dfrgw.slac.stanford.edu
+    disableBucketValidation: '1'
 
   imageNotifications:
     kafkaClusterAddress: prompt-processing-kafka-bootstrap.kafka:9092

applications/prompt-proto-service-latiss/values-usdfprod-prompt-processing.yaml

@@ -26,6 +26,7 @@ prompt-proto-service:
       (survey="spec_pole_with_rotation")=[]
       (survey="")=[]
     calibRepo: s3://rubin-summit-users
+    calibRepoPguser: rubin
 
   s3:
     imageBucket: rubin-summit

applications/prompt-proto-service-latiss/values.yaml

@@ -33,6 +33,10 @@ prompt-proto-service:
     # If `registry.centralRepoFile` is set, this URI points to a local redirect instead of the central repo itself.
     # @default -- None, must be set
     calibRepo: ""
+    # -- Postgres username to access the shared butler repo for calibrations, templates, and pipeline outputs.
+    # If `registry.centralRepoFile` is set, a local redirect is used and its config may override this config.
+    # @default -- None, must be set
+    calibRepoPguser: ""
 
   s3:
     # -- Bucket containing the incoming raw images

applications/prompt-proto-service-lsstcam/README.md

@@ -22,6 +22,7 @@ Prompt Proto Service is an event driven service for processing camera images. Th
 | prompt-proto-service.imageNotifications.kafkaClusterAddress | string | None, must be set | Hostname and port of the Kafka provider |
 | prompt-proto-service.imageNotifications.topic | string | None, must be set | Topic where raw image arrival notifications appear |
 | prompt-proto-service.instrument.calibRepo | string | None, must be set | URI to the shared repo used for calibrations, templates, and pipeline outputs. If `registry.centralRepoFile` is set, this URI points to a local redirect instead of the central repo itself. |
+| prompt-proto-service.instrument.calibRepoPguser | string | None, must be set | Postgres username to access the shared butler repo for calibrations, templates, and pipeline outputs. If `registry.centralRepoFile` is set, a local redirect is used and its config may override this config. |
 | prompt-proto-service.instrument.name | string | `""` | The "short" name of the instrument |
 | prompt-proto-service.instrument.pipelines | string | None, must be set | Machine-readable string describing which pipeline(s) should be run for which visits. Notation is complex and still in flux; see [the source code](https://github.com/lsst-dm/prompt_processing/blob/main/python/activator/config.py) for examples. |
 | prompt-proto-service.instrument.skymap | string | `""` | Skymap to use with the instrument |

applications/prompt-proto-service-lsstcam/values-usdfdev-prompt-processing.yaml

@@ -12,6 +12,7 @@ prompt-proto-service:
 
   instrument:
     calibRepo: s3://rubin-summit-users/
+    calibRepoPguser: rubin
 
   s3:
     imageBucket: rubin:rubin-pp

applications/prompt-proto-service-lsstcam/values.yaml

@@ -32,6 +32,10 @@ prompt-proto-service:
     # If `registry.centralRepoFile` is set, this URI points to a local redirect instead of the central repo itself.
     # @default -- None, must be set
     calibRepo: ""
+    # -- Postgres username to access the shared butler repo for calibrations, templates, and pipeline outputs.
+    # If `registry.centralRepoFile` is set, a local redirect is used and its config may override this config.
+    # @default -- None, must be set
+    calibRepoPguser: ""
 
   s3:
     # -- Bucket containing the incoming raw images

applications/prompt-proto-service-lsstcomcam/README.md

@@ -21,6 +21,7 @@ Prompt Proto Service is an event driven service for processing camera images. Th
 | prompt-proto-service.imageNotifications.kafkaClusterAddress | string | None, must be set | Hostname and port of the Kafka provider |
 | prompt-proto-service.imageNotifications.topic | string | None, must be set | Topic where raw image arrival notifications appear |
 | prompt-proto-service.instrument.calibRepo | string | None, must be set | URI to the shared repo used for calibrations, templates, and pipeline outputs. If `registry.centralRepoFile` is set, this URI points to a local redirect instead of the central repo itself. |
+| prompt-proto-service.instrument.calibRepoPguser | string | None, must be set | Postgres username to access the shared butler repo for calibrations, templates, and pipeline outputs. If `registry.centralRepoFile` is set, a local redirect is used and its config may override this config. |
 | prompt-proto-service.instrument.name | string | `""` | The "short" name of the instrument |
 | prompt-proto-service.instrument.pipelines | string | None, must be set | Machine-readable string describing which pipeline(s) should be run for which visits. Notation is complex and still in flux; see [the source code](https://github.com/lsst-dm/prompt_processing/blob/main/python/activator/config.py) for examples. |
 | prompt-proto-service.instrument.skymap | string | `""` | Skymap to use with the instrument |

applications/prompt-proto-service-lsstcomcam/values-usdfdev-prompt-processing.yaml

@@ -12,6 +12,7 @@ prompt-proto-service:
 
   instrument:
     calibRepo: s3://rubin-summit-users/
+    calibRepoPguser: rubin
 
   s3:
     imageBucket: rubin:rubin-pp

applications/prompt-proto-service-lsstcomcam/values.yaml

@@ -32,6 +32,10 @@ prompt-proto-service:
     # If `registry.centralRepoFile` is set, this URI points to a local redirect instead of the central repo itself.
     # @default -- None, must be set
     calibRepo: ""
+    # -- Postgres username to access the shared butler repo for calibrations, templates, and pipeline outputs.
+    # If `registry.centralRepoFile` is set, a local redirect is used and its config may override this config.
+    # @default -- None, must be set
+    calibRepoPguser: ""
 
   s3:
     # -- Bucket containing the incoming raw images

charts/prompt-proto-service/templates/prompt-proto-service.yaml

@@ -54,7 +54,7 @@ spec:
         - name: IMAGE_TIMEOUT
           value: {{ .Values.imageNotifications.imageTimeout | quote }}
         - name: PGUSER
-          value: rubin
+          value: {{ .Values.instrument.calibRepoPguser }}
         - name: CALIB_REPO
           value: {{ .Values.instrument.calibRepo }}
         - name: LSST_DISABLE_BUCKET_VALIDATION