Merge pull request #3541 from lsst-sqre/u/stvoutsin/downgrades

Downgraded TAP and SSOTAP images
lsst-sqre · Jul 18, 2024 · 989ba96 · 989ba96
2 parents 7c5b32a + c7897d6
commit 989ba96
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 69 deletions.
diff --git a/applications/ssotap/values-idfdev.yaml b/applications/ssotap/values-idfdev.yaml
@@ -2,9 +2,3 @@ cadc-tap:
   tapSchema:
     image:
       repository: "lsstsqre/tap-schema-idfdev-sso"
-
-  cloudsql:
-    enabled: true
-    instanceConnectionName: "science-platform-dev-7696:us-central1:science-platform-dev-e9e11de2"
-    serviceAccount: "[email protected]"
-    database: "ssotap"
diff --git a/applications/ssotap/values-idfint.yaml b/applications/ssotap/values-idfint.yaml
@@ -2,9 +2,3 @@ cadc-tap:
   tapSchema:
     image:
       repository: "lsstsqre/tap-schema-idfint-sso"
-
-  cloudsql:
-    enabled: true
-    instanceConnectionName: "science-platform-int-dc5d:us-central1:science-platform-int-8f439af2"
-    serviceAccount: "[email protected]"
-    database: "ssotap"
diff --git a/applications/ssotap/values-idfprod.yaml b/applications/ssotap/values-idfprod.yaml
@@ -2,9 +2,3 @@ cadc-tap:
   tapSchema:
     image:
       repository: "lsstsqre/tap-schema-idfprod-sso"
-
-  cloudsql:
-    enabled: true
-    instanceConnectionName: "science-platform-stable-6994:us-central1:science-platform-stable-0c29612b"
-    serviceAccount: "[email protected]"
-    database: "ssotap"
diff --git a/applications/tap/values-idfdev.yaml b/applications/tap/values-idfdev.yaml
@@ -7,9 +7,3 @@ cadc-tap:
     qserv:
       host: "10.140.1.211:4040"
       # Change to 134.79.23.209:4040 to point to USDF qserv
-
-  cloudsql:
-    enabled: true
-    instanceConnectionName: "science-platform-dev-7696:us-central1:science-platform-dev-e9e11de2"
-    serviceAccount: "[email protected]"
-    database: "tap"
diff --git a/applications/tap/values-idfint.yaml b/applications/tap/values-idfint.yaml
@@ -6,10 +6,4 @@ cadc-tap:
   config:
     qserv:
       host: "134.79.23.227:4040"
-      jdbcParams: "?enabledTLSProtocols=TLSv1.3"
-
-  cloudsql:
-    enabled: true
-    instanceConnectionName: "science-platform-int-dc5d:us-central1:science-platform-int-8f439af2"
-    serviceAccount: "[email protected]"
-    database: "tap"
+      jdbcParams: "?enabledTLSProtocols=TLSv1.2"
diff --git a/applications/tap/values-idfprod.yaml b/applications/tap/values-idfprod.yaml
@@ -6,9 +6,3 @@ cadc-tap:
   config:
     qserv:
       host: "10.140.1.211:4040"
-
-  cloudsql:
-    enabled: true
-    instanceConnectionName: "science-platform-stable-6994:us-central1:science-platform-stable-0c29612b"
-    serviceAccount: "[email protected]"
-    database: "tap"
diff --git a/charts/cadc-tap/README.md b/charts/cadc-tap/README.md
@@ -31,12 +31,12 @@ IVOA TAP service
 | config.pg.host | string | None, must be set if backend is `pg` | Host to connect to |
 | config.pg.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the TAP image |
 | config.pg.image.repository | string | `"ghcr.io/lsst-sqre/tap-postgres-service"` | TAP image to use |
-| config.pg.image.tag | string | `"1.17.3"` | Tag of TAP image to use |
+| config.pg.image.tag | string | `"1.16.0"` | Tag of TAP image to use |
 | config.pg.username | string | None, must be set if backend is `pg` | Username to connect with |
 | config.qserv.host | string | `"mock-db:3306"` (the mock QServ) | QServ hostname:port to connect to |
 | config.qserv.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the TAP image |
 | config.qserv.image.repository | string | `"ghcr.io/lsst-sqre/lsst-tap-service"` | TAP image to use |
-| config.qserv.image.tag | string | `"2.3.1"` | Tag of TAP image to use |
+| config.qserv.image.tag | string | `"2.2.0"` | Tag of TAP image to use |
 | config.qserv.jdbcParams | string | `""` | Extra JDBC connection parameters |
 | config.tapSchemaAddress | string | `"cadc-tap-schema-db:3306"` | Address to a MySQL database containing TAP schema data |
 | config.vaultSecretName | string | `""` | Vault secret name, this is appended to the global path to find the vault secrets associated with this deployment. |
@@ -77,7 +77,7 @@ IVOA TAP service
 | uws.affinity | object | `{}` | Affinity rules for the UWS database pod |
 | uws.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the UWS database image |
 | uws.image.repository | string | `"ghcr.io/lsst-sqre/lsst-tap-uws-db"` | UWS database image to use |
-| uws.image.tag | string | `"2.3.1"` | Tag of UWS database image to use |
+| uws.image.tag | string | `"2.2.0"` | Tag of UWS database image to use |
 | uws.nodeSelector | object | `{}` | Node selection rules for the UWS database pod |
 | uws.podAnnotations | object | `{}` | Annotations for the UWS databse pod |
 | uws.resources | object | See `values.yaml` | Resource limits and requests for the UWS database pod |

diff --git a/charts/cadc-tap/templates/configmap.yaml b/charts/cadc-tap/templates/configmap.yaml
diff --git a/charts/cadc-tap/templates/tap-deployment.yaml b/charts/cadc-tap/templates/tap-deployment.yaml
@@ -82,20 +82,23 @@ spec:
                 -Dtap.password=$TAP_DB_PASSWORD
                 -Dtap.url=jdbc:postgresql://{{ .Values.config.pg.host }}/{{ .Values.config.pg.database }}
                 -Dtap.maxActive=100
+                -Dca.nrc.cadc.auth.Authenticator=ca.nrc.cadc.sample.AuthenticatorImpl
                 {{- end }}
                 {{- if eq .Values.config.backend "qserv" }}
                 -Dqservuser.username=qsmaster
                 -Dqservuser.password=
                 -Dqservuser.driverClassName=com.mysql.cj.jdbc.Driver
                 -Dqservuser.url=jdbc:mysql://{{ .Values.config.qserv.host }}/{{ .Values.config.qserv.jdbcParams }}
                 -Dqservuser.maxActive=100
+                -Dca.nrc.cadc.auth.Authenticator=org.opencadc.tap.impl.AuthenticatorImpl
                 {{- end }}
+                -Dca.nrc.cadc.reg.client.RegistryClient.local=true
                 -Dgafaelfawr_url={{ .Values.global.baseUrl }}/auth/api/v1/user-info
                 -Dgcs_bucket={{ .Values.config.gcsBucket }}
                 -Dgcs_bucket_url={{ .Values.config.gcsBucketUrl }}
                 -Dgcs_bucket_type={{ .Values.config.gcsBucketType }}
                 -Dbase_url={{ .Values.global.baseUrl }}
-                -Dca.nrc.cadc.util.PropertiesReader.dir=/config/
+                -Dca.nrc.cadc.util.PropertiesReader.dir=/etc/creds/
                 -Xmx{{ .Values.config.jvmMaxHeapSize }}
             {{- if eq .Values.config.backend "pg" }}
             - name: "TAP_DB_PASSWORD"
@@ -139,8 +142,6 @@ spec:
               readOnly: true
             - name: "tmp"
               mountPath: "/tmp"
-            - name: "config-volume"
-              mountPath: "/config"
           livenessProbe:
             failureThreshold: 3
             httpGet:
@@ -157,9 +158,6 @@ spec:
             secretName: "cadc-tap"
         - name: "tmp"
           emptyDir: {}
-        - name: "config-volume"
-          configMap:
-            name: "cadc-tap-config"
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/cadc-tap/values.yaml b/charts/cadc-tap/values.yaml
@@ -71,7 +71,7 @@ config:
       pullPolicy: "IfNotPresent"
 
       # -- Tag of TAP image to use
-      tag: "1.17.3"
+      tag: "1.16.0"
 
   qserv:
     # -- QServ hostname:port to connect to
@@ -89,7 +89,7 @@ config:
       pullPolicy: "IfNotPresent"
 
       # -- Tag of TAP image to use
-      tag: "2.3.1"
+      tag: "2.2.0"
 
   # -- Address to a MySQL database containing TAP schema data
   tapSchemaAddress: "cadc-tap-schema-db:3306"
@@ -191,7 +191,7 @@ uws:
     pullPolicy: "IfNotPresent"
 
     # -- Tag of UWS database image to use
-    tag: "2.3.1"
+    tag: "2.2.0"
 
   # -- Resource limits and requests for the UWS database pod
   # @default -- See `values.yaml`