Merge pull request #2355 from lsst-sqre/tickets/DM-40206

Redirect IDF ssotap to USDF; update sdm_schemas for new DP0.3
lsst-sqre · Jul 26, 2023 · 781eaa9 · 781eaa9
2 parents 9bf49d9 + dc1590b
commit 781eaa9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/applications/ssotap/README.md b/applications/ssotap/README.md
@@ -48,7 +48,7 @@ IVOA TAP service
 | tapSchema.affinity | object | `{}` | Affinity rules for the mock QServ pod |
 | tapSchema.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the TAP schema image |
 | tapSchema.image.repository | string | `"lsstsqre/tap-schema-mock"` | TAP schema image to ue. This must be overridden by each environment with the TAP schema for that environment. |
-| tapSchema.image.tag | string | `"2.0.2"` | Tag of TAP schema image |
+| tapSchema.image.tag | string | `"2.1"` | Tag of TAP schema image |
 | tapSchema.nodeSelector | object | `{}` | Node selection rules for the mock QServ pod |
 | tapSchema.podAnnotations | object | `{}` | Annotations for the mock QServ pod |
 | tapSchema.resources | object | `{}` | Resource limits and requests for the TAP schema database pod |

diff --git a/applications/ssotap/values-idfdev.yaml b/applications/ssotap/values-idfdev.yaml
@@ -20,6 +20,5 @@ pg:
     enabled: false
   database: "dp03_catalogs"
   # Redirect to interim cloud Postgres during USDF outage 6/25/23-7/4/23
-  # host: "usdf-pg-catalogs.slac.stanford.edu:5432"
-  host: 104.197.78.194:5432
+  host: "usdf-pg-catalogs.slac.stanford.edu:5432"
   username: "dp03"
diff --git a/applications/ssotap/values-idfint.yaml b/applications/ssotap/values-idfint.yaml
@@ -22,6 +22,5 @@ pg:
     enabled: false
   database: "dp03_catalogs"
   # Redirect to interim cloud Postgres during USDF outage 6/25/23-7/4/23
-  # host: "usdf-pg-catalogs.slac.stanford.edu:5432"
-  host: 104.197.78.194:5432
+  host: "usdf-pg-catalogs.slac.stanford.edu:5432"
   username: "dp03"
diff --git a/applications/ssotap/values-idfprod.yaml b/applications/ssotap/values-idfprod.yaml
@@ -22,8 +22,7 @@ pg:
     enabled: false
   database: "dp03_catalogs"
   # Redirect to interim cloud Postgres during USDF outage 6/25/23-7/4/23
-  # host: "usdf-pg-catalogs.slac.stanford.edu:5432"
-  host: 104.197.78.194:5432
+  host: "usdf-pg-catalogs.slac.stanford.edu:5432"
   username: "dp03"
 
 uws:

diff --git a/applications/ssotap/values.yaml b/applications/ssotap/values.yaml
@@ -130,7 +130,7 @@ tapSchema:
     pullPolicy: "IfNotPresent"
 
     # -- Tag of TAP schema image
-    tag: "2.0.2"
+    tag: "2.1"
 
   # -- Resource limits and requests for the TAP schema database pod
   resources: {}