Merge pull request lsst-sqre#3943 from lsst-sqre/tickets/DM-47837

DM-47837: Fix Gafaelfawr service name for ssotap and livetap
lsst-uk · Dec 2, 2024 · 904d440 · 904d440
2 parents ffe5eef + ddc3521
commit 904d440
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/applications/livetap/README.md b/applications/livetap/README.md
@@ -15,7 +15,7 @@ IVOA TAP service
 | cadc-tap.config.pg.database | string | `"lsstdb1"` | Postgres database to connect to |
 | cadc-tap.config.pg.host | string | `"mock-pg:5432"` (the mock pg) | Postgres hostname:port to connect to |
 | cadc-tap.config.pg.username | string | `"rubin"` | Postgres username to use to connect |
-| cadc-tap.config.service | string | `"livetap"` | Name of the service from Gafaelfawr's perspective |
+| cadc-tap.config.serviceName | string | `"livetap"` | Name of the service from Gafaelfawr's perspective |
 | cadc-tap.config.vaultSecretName | string | `"livetap"` | Vault secret name: the final key in the vault path |
 | cadc-tap.ingress.path | string | `"live"` | Ingress path that should be routed to this service |
 | global.baseUrl | string | Set by Argo CD | Base URL for the environment |

diff --git a/applications/livetap/values.yaml b/applications/livetap/values.yaml
@@ -8,7 +8,7 @@ cadc-tap:
     backend: "pg"
 
     # -- Name of the service from Gafaelfawr's perspective
-    service: "livetap"
+    serviceName: "livetap"
 
     pg:
       # -- Postgres hostname:port to connect to

diff --git a/applications/ssotap/README.md b/applications/ssotap/README.md
@@ -15,7 +15,7 @@ IVOA TAP service for Solar System Objects
 | cadc-tap.config.pg.database | string | `"dp03_catalogs"` | Postgres database to connect to |
 | cadc-tap.config.pg.host | string | `"usdf-pg-catalogs.slac.stanford.edu:5432"` | Postgres hostname:port to connect to |
 | cadc-tap.config.pg.username | string | `"dp03"` | Postgres username to use to connect |
-| cadc-tap.config.service | string | `"ssotap"` | Name of the service from Gafaelfawr's perspective |
+| cadc-tap.config.serviceName | string | `"ssotap"` | Name of the service from Gafaelfawr's perspective |
 | cadc-tap.config.vaultSecretName | string | `"ssotap"` | Vault secret name: the final key in the vault path |
 | cadc-tap.ingress.path | string | `"ssotap"` | Ingress path that should be routed to this service |
 | cadc-tap.serviceAccount.name | string | `"ssotap"` | Name of the Kubernetes `ServiceAccount`, used for CloudSQL access |

diff --git a/applications/ssotap/values.yaml b/applications/ssotap/values.yaml
@@ -8,7 +8,7 @@ cadc-tap:
     backend: "pg"
 
     # -- Name of the service from Gafaelfawr's perspective
-    service: "ssotap"
+    serviceName: "ssotap"
 
     pg:
       # -- Postgres hostname:port to connect to