Enable setting output limit for TAP capabilities per environment

Author: stvoutsin

applications/tap/README.md

@@ -12,6 +12,8 @@ IVOA TAP service
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | cadc-tap.config.backend | string | `"qserv"` | What type of backend? |
+| cadc-tap.config.outputLimit | string | `"3221225472"` | 3GB byte limit for Qserv |
+| cadc-tap.config.outputLimitUnit | string | `"byte"` |  |
 | cadc-tap.config.sentryEnabled | bool | `false` | Whether Sentry is enabled in this environment |
 | cadc-tap.config.serviceName | string | `"tap"` | Name of the service from Gafaelfawr's perspective |
 | cadc-tap.config.vaultSecretName | string | `"tap"` | Vault secret name: the final key in the vault path |

applications/tap/values-idfdev.yaml

@@ -1,5 +1,9 @@
 cadc-tap:
   config:
+    qserv:
+      image:
+        tag: "tickets-DM-54497"
+        pullPolicy: "Always"
     kafka:
       enabled: true
 

applications/tap/values.yaml

@@ -16,6 +16,10 @@ cadc-tap:
     # -- Whether Sentry is enabled in this environment
     sentryEnabled: false
 
+    # -- 3GB byte limit for Qserv
+    outputLimit: "3221225472"
+    outputLimitUnit: "byte"
+
   serviceAccount:
     # -- Name of the Kubernetes `ServiceAccount`, used for CloudSQL access
     name: "tap"

charts/cadc-tap/README.md

@@ -42,6 +42,9 @@ IVOA TAP service
 | config.kafka.topics.jobDelete | string | `"lsst.tap.job-delete"` | Job Delete topic |
 | config.kafka.topics.jobRun | string | `"lsst.tap.job-run"` | Job Run topic |
 | config.kafka.topics.jobStatus | string | `"lsst.tap.job-status"` | Job Status topic |
+| config.maxRec | string | `""` | Maximum row limit (MAXREC) enforced server-side. Leave empty to use the default (100000000). |
+| config.outputLimit | string | `""` | Output limit value for TAP queries advertised in capabilities. Leave empty to use the default (100000000). |
+| config.outputLimitUnit | string | `""` | Unit for the output limit: "byte" or "row". Leave empty to use the default ("row"). |
 | config.pg.database | string | None, must be set if backend is `pg` | Database to connect to |
 | 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 |

charts/cadc-tap/templates/tap-deployment.yaml

@@ -182,6 +182,15 @@ spec:
                 -Dkafka.status.topic={{ .Values.config.kafka.topics.jobStatus }}
                 -Dkafka.delete.topic={{ .Values.config.kafka.topics.jobDelete }}
                 {{- end }}
+                {{- if .Values.config.outputLimit }}
+                -Dtap.outputLimit={{ .Values.config.outputLimit }}
+                {{- end }}
+                {{- if .Values.config.outputLimitUnit }}
+                -Dtap.outputLimitUnit={{ .Values.config.outputLimitUnit }}
+                {{- end }}
+                {{- if .Values.config.maxRec }}
+                -Dtap.maxRec={{ .Values.config.maxRec }}
+                {{- end }}
                 -Dbase_url={{ .Values.global.baseUrl }}
                 -Dpath_prefix=/api/{{ .Values.ingress.path }}
                 -Dca.nrc.cadc.util.PropertiesReader.dir=/config/

charts/cadc-tap/values.yaml

@@ -183,6 +183,18 @@ config:
     # -- Whether kafka is enabled
     enabled: false
 
+  # -- Output limit value for TAP queries advertised in capabilities.
+  # Leave empty to use the default (100000000).
+  outputLimit: ""
+
+  # -- Unit for the output limit: "byte" or "row".
+  # Leave empty to use the default ("row").
+  outputLimitUnit: ""
+
+  # -- Maximum row limit (MAXREC) enforced server-side.
+  # Leave empty to use the default (100000000).
+  maxRec: ""
+
   # -- Rules for renaming Columns
   urlRewrite: