[[DM-40192] Changes to chart for on prem S3 @ USDF

Be explicit about the S3_ENDPOINT_URL which we need
to be because we're not using AWS.  Be explicit about
the PGUSER so butler can figure out which address
to contact in the PGPASSFILE.

applications/datalinker/README.md

@@ -15,6 +15,9 @@ IVOA DataLink-based service and data discovery
 | autoscaling.maxReplicas | int | `100` | Maximum number of datalinker deployment pods |
 | autoscaling.minReplicas | int | `1` | Minimum number of datalinker deployment pods |
 | autoscaling.targetCPUUtilizationPercentage | int | `80` | Target CPU utilization of datalinker deployment pods |
+| config.pgUser | string | `"rubin"` | User to use from the PGPASSFILE rubin is the default |
+| config.s3EndpointUrl | string | `"https://storage.googleapis.com"` | S3 Endpoint URL |
+| config.storageBackend | string | `"GCS"` | Storage backend to use: either GCS or S3 GCS is the default |
 | config.tapMetadataUrl | string | `"https://github.com/lsst/sdm_schemas/releases/download/1.2.0/datalink-columns.zip"` | URL containing TAP schema metadata used to construct queries |
 | fullnameOverride | string | `""` | Override the full name for resources (includes the release name) |
 | global.baseUrl | string | Set by Argo CD | Base URL for the environment |

applications/datalinker/templates/deployment.yaml

@@ -60,10 +60,14 @@ spec:
               value: "/tmp/secrets/aws-credentials.ini"
             - name: "DAF_BUTLER_REPOSITORY_INDEX"
               value: {{ .Values.global.butlerRepositoryIndex | quote }}
+            - name: "PGUSER"
+              value: {{ .Values.config.pgUser }}
             - name: "PGPASSFILE"
               value: "/tmp/secrets/postgres-credentials.txt"
+            - name: "STORAGE_BACKEND"
+              value: {{ .Values.config.storageBackend }}
             - name: "S3_ENDPOINT_URL"
-              value: "https://storage.googleapis.com"
+              value: {{ .Values.config.s3EndpointUrl }}
             - name: "GOOGLE_APPLICATION_CREDENTIALS"
               value: "/tmp/secrets/butler-gcs-idf-creds.json"
           ports:

applications/datalinker/values-usdfdev.yaml

@@ -0,0 +1,4 @@
+config:
+  # -- USDF uses an on prem S3 storage backend
+  storageBackend: "S3"
+  s3EndpointUrl: "https://s3dfrgw.slac.stanford.edu"

applications/datalinker/values-usdfprod.yaml

@@ -0,0 +1,4 @@
+config:
+  # -- USDF uses an on prem S3 storage backend
+  storageBackend: "S3"
+  s3EndpointUrl: "https://s3dfrgw.slac.stanford.edu"

applications/datalinker/values.yaml

@@ -43,6 +43,17 @@ config:
   # -- URL containing TAP schema metadata used to construct queries
   tapMetadataUrl: "https://github.com/lsst/sdm_schemas/releases/download/1.2.0/datalink-columns.zip"
 
+  # -- Storage backend to use: either GCS or S3
+  # GCS is the default
+  storageBackend: "GCS"
+
+  # -- User to use from the PGPASSFILE
+  # rubin is the default
+  pgUser: "rubin"
+
+  # -- S3 Endpoint URL
+  s3EndpointUrl: "https://storage.googleapis.com"
+
 # -- Annotations for the datalinker deployment pod
 podAnnotations: {}