Merge pull request #2284 from lsst-sqre/u/rra/tap-image

Change TAP schema database pod configuration

applications/livetap/README.md

@@ -45,9 +45,14 @@ IVOA TAP service
 | podAnnotations | object | `{}` | Annotations for the Gafaelfawr frontend pod |
 | replicaCount | int | `1` | Number of pods to start |
 | resources | object | `{}` | Resource limits and requests for the Gafaelfawr frontend pod |
-| tap_schema.image.repository | object | `{}` |  |
-| tap_schema.image.tag | string | `"2.0.2"` |  |
-| tap_schema.resources | object | `{}` |  |
+| 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.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 |
+| tapSchema.tolerations | list | `[]` | Tolerations for the mock QServ pod |
 | tolerations | list | `[]` | Tolerations for the Gafaelfawr frontend pod |
 | uws.affinity | object | `{}` | Affinity rules for the UWS database pod |
 | uws.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the UWS database image |

applications/livetap/templates/tap-schema-db-deployment.yaml

@@ -11,7 +11,7 @@ spec:
       {{- include "cadc-tap.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with .Values.tapSchema.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -31,26 +31,26 @@ spec:
               value: "TAP_SCHEMA"
             - name: MYSQL_ROOT_HOST
               value: "%"
-          image: "{{ .Values.tap_schema.image.repository }}:{{ .Values.tap_schema.image.tag}}"
-          imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
+          image: "{{ .Values.tapSchema.image.repository }}:{{ .Values.tapSchema.image.tag}}"
+          imagePullPolicy: {{ .Values.tapSchema.image.pullPolicy | quote }}
           ports:
             - containerPort: 3306
               protocol: "TCP"
-          {{- with .Values.tap_schema.resources }}
+          {{- with .Values.tapSchema.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
       imagePullSecrets:
         - name: "pull-secret"
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.tapSchema.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
+      {{- with .Values.tapSchema.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.tapSchema.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}

applications/livetap/values-minikube.yaml

@@ -1,3 +1,7 @@
+tapSchema:
+  image:
+    repository: "lsstsqre/tap-schema-usdf-prod-livetap"
+
 config:
   gcsBucket: "async-results.lsst.codes"
   gcsBucketUrl: "http://async-results.lsst.codes"

applications/livetap/values-usdfdev.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-usdf-dev-livetap"
 

applications/livetap/values-usdfprod.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-usdf-prod-livetap"
 

applications/livetap/values.yaml

@@ -120,12 +120,33 @@ pg:
     # -- Affinity rules for the mock postgres pod
     affinity: {}
 
-tap_schema:
+tapSchema:
   image:
-    repository: {}
+    # -- TAP schema image to ue. This must be overridden by each environment
+    # with the TAP schema for that environment.
+    repository: "lsstsqre/tap-schema-mock"
+
+    # -- Pull policy for the TAP schema image
+    pullPolicy: "IfNotPresent"
+
+    # -- Tag of TAP schema image
     tag: "2.0.2"
+
+  # -- Resource limits and requests for the TAP schema database pod
   resources: {}
 
+  # -- Annotations for the mock QServ pod
+  podAnnotations: {}
+
+  # -- Node selection rules for the mock QServ pod
+  nodeSelector: {}
+
+  # -- Tolerations for the mock QServ pod
+  tolerations: []
+
+  # -- Affinity rules for the mock QServ pod
+  affinity: {}
+
 uws:
   image:
     # -- UWS database image to use

applications/ssotap/README.md

@@ -45,9 +45,14 @@ IVOA TAP service
 | podAnnotations | object | `{}` | Annotations for the Gafaelfawr frontend pod |
 | replicaCount | int | `1` | Number of pods to start |
 | resources | object | `{}` | Resource limits and requests for the Gafaelfawr frontend pod |
-| tap_schema.image.repository | object | `{}` |  |
-| tap_schema.image.tag | string | `"2.0.1"` |  |
-| tap_schema.resources | object | `{}` |  |
+| 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.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 |
+| tapSchema.tolerations | list | `[]` | Tolerations for the mock QServ pod |
 | tolerations | list | `[]` | Tolerations for the Gafaelfawr frontend pod |
 | uws.affinity | object | `{}` | Affinity rules for the UWS database pod |
 | uws.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the UWS database image |

applications/ssotap/templates/tap-schema-db-deployment.yaml

@@ -11,7 +11,7 @@ spec:
       {{- include "cadc-tap.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with .Values.tapSchema.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -31,26 +31,26 @@ spec:
               value: "TAP_SCHEMA"
             - name: MYSQL_ROOT_HOST
               value: "%"
-          image: "{{ .Values.tap_schema.image.repository }}:{{ .Values.tap_schema.image.tag}}"
-          imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
+          image: "{{ .Values.tapSchema.image.repository }}:{{ .Values.tapSchema.image.tag}}"
+          imagePullPolicy: {{ .Values.tapSchema.image.pullPolicy | quote }}
           ports:
             - containerPort: 3306
               protocol: "TCP"
-          {{- with .Values.tap_schema.resources }}
+          {{- with .Values.tapSchema.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
       imagePullSecrets:
         - name: "pull-secret"
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.tapSchema.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
+      {{- with .Values.tapSchema.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.tapSchema.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}

applications/ssotap/values-idfdev.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-idfdev-sso"
 

applications/ssotap/values-idfint.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-idfint-sso"
 

applications/ssotap/values-idfprod.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-idfprod-sso"
 

applications/ssotap/values-minikube.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-idfprod-sso"
 

applications/ssotap/values-usdfdev.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-usdf-dev-sso"
 

applications/ssotap/values-usdfprod.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-usdf-prod-sso"
 

applications/ssotap/values.yaml

@@ -120,12 +120,33 @@ pg:
     # -- Affinity rules for the mock postgres pod
     affinity: {}
 
-tap_schema:
+tapSchema:
   image:
-    repository: {}
-    tag: "2.0.1"
+    # -- TAP schema image to ue. This must be overridden by each environment
+    # with the TAP schema for that environment.
+    repository: "lsstsqre/tap-schema-mock"
+
+    # -- Pull policy for the TAP schema image
+    pullPolicy: "IfNotPresent"
+
+    # -- Tag of TAP schema image
+    tag: "2.0.2"
+
+  # -- Resource limits and requests for the TAP schema database pod
   resources: {}
 
+  # -- Annotations for the mock QServ pod
+  podAnnotations: {}
+
+  # -- Node selection rules for the mock QServ pod
+  nodeSelector: {}
+
+  # -- Tolerations for the mock QServ pod
+  tolerations: []
+
+  # -- Affinity rules for the mock QServ pod
+  affinity: {}
+
 uws:
   image:
     # -- UWS database image to use

applications/tap/README.md

@@ -43,9 +43,14 @@ IVOA TAP service
 | qserv.mock.tolerations | list | `[]` | Tolerations for the mock QServ pod |
 | replicaCount | int | `1` | Number of pods to start |
 | resources | object | `{}` | Resource limits and requests for the Gafaelfawr frontend pod |
-| tap_schema.image.repository | object | `{}` |  |
-| tap_schema.image.tag | string | `"2.0.1"` |  |
-| tap_schema.resources | object | `{}` |  |
+| 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.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 |
+| tapSchema.tolerations | list | `[]` | Tolerations for the mock QServ pod |
 | tolerations | list | `[]` | Tolerations for the Gafaelfawr frontend pod |
 | uws.affinity | object | `{}` | Affinity rules for the UWS database pod |
 | uws.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the UWS database image |

applications/tap/templates/tap-schema-db-deployment.yaml

@@ -11,7 +11,7 @@ spec:
       {{- include "cadc-tap.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
+      {{- with .Values.tapSchema.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -31,26 +31,26 @@ spec:
               value: "TAP_SCHEMA"
             - name: MYSQL_ROOT_HOST
               value: "%"
-          image: "{{ .Values.tap_schema.image.repository }}:{{ .Values.tap_schema.image.tag}}"
-          imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
+          image: "{{ .Values.tapSchema.image.repository }}:{{ .Values.tapSchema.image.tag}}"
+          imagePullPolicy: {{ .Values.tapSchema.image.pullPolicy | quote }}
           ports:
             - containerPort: 3306
               protocol: "TCP"
-          {{- with .Values.tap_schema.resources }}
+          {{- with .Values.tapSchema.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}
       imagePullSecrets:
         - name: "pull-secret"
-      {{- with .Values.nodeSelector }}
+      {{- with .Values.tapSchema.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
+      {{- with .Values.tapSchema.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.tapSchema.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}

applications/tap/values-ccin2p3.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-idfprod-tap"
 

applications/tap/values-idfdev.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-idfdev-tap"
 

applications/tap/values-idfint.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-idfint-tap"
 

applications/tap/values-idfprod.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-idfprod-tap"
 

applications/tap/values-minikube.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-idfprod-tap"
 

applications/tap/values-roe.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-idfprod-tap"
 

applications/tap/values-usdfdev.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-usdf-dev-tap"
 

applications/tap/values-usdfprod.yaml

@@ -1,4 +1,4 @@
-tap_schema:
+tapSchema:
   image:
     repository: "lsstsqre/tap-schema-usdf-prod-tap"
 

applications/tap/values.yaml

@@ -114,12 +114,33 @@ qserv:
     # -- Affinity rules for the mock QServ pod
     affinity: {}
 
-tap_schema:
+tapSchema:
   image:
-    repository: {}
-    tag: "2.0.1"
+    # -- TAP schema image to ue. This must be overridden by each environment
+    # with the TAP schema for that environment.
+    repository: "lsstsqre/tap-schema-mock"
+
+    # -- Pull policy for the TAP schema image
+    pullPolicy: "IfNotPresent"
+
+    # -- Tag of TAP schema image
+    tag: "2.0.2"
+
+  # -- Resource limits and requests for the TAP schema database pod
   resources: {}
 
+  # -- Annotations for the mock QServ pod
+  podAnnotations: {}
+
+  # -- Node selection rules for the mock QServ pod
+  nodeSelector: {}
+
+  # -- Tolerations for the mock QServ pod
+  tolerations: []
+
+  # -- Affinity rules for the mock QServ pod
+  affinity: {}
+
 uws:
   image:
     # -- UWS database image to use