diff --git a/applications/cm-service/Chart.yaml b/applications/cm-service/Chart.yaml index f6174a96f1..bf2d4f0e15 100644 --- a/applications/cm-service/Chart.yaml +++ b/applications/cm-service/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 0.1.2 +appVersion: 0.2.0 description: Campaign Management for Rubin Data Release Production name: cm-service sources: -- https://github.com/lsst-dm/cm-service + - https://github.com/lsst-dm/cm-service type: application version: 1.0.0 diff --git a/applications/cm-service/README.md b/applications/cm-service/README.md index 9f720ea79d..6bbabe5e83 100644 --- a/applications/cm-service/README.md +++ b/applications/cm-service/README.md @@ -10,14 +10,21 @@ Campaign Management for Rubin Data Release Production | Key | Type | Default | Description | |-----|------|---------|-------------| -| config.databaseEcho | bool | `false` | Whether to echo SQLAlchemy generated SQL to the log | +| config.db.echo | bool | `false` | Whether to echo SQLAlchemy generated SQL to the log | +| config.db.hostname | string | `""` | Name of the database host | +| config.db.name | string | `"cmservice"` | Name of the database to use for the application | +| config.db.port | int | `5432` | Port number of the database host | +| config.db.username | string | `"cmservice"` | Name of the database user to use for the application | | config.logLevel | string | `"INFO"` | Logging level (`DEBUG`, `INFO`, `WARNING`, `ERROR`, or `CRITICAL`) | | config.logProfile | string | `"production"` | Logging profile (`production` for JSON, `development` for human-friendly) | | config.outputVolume.storage | string | `"1Gi"` | Minimum storage requested in service output area PVC | | config.outputVolume.storageClassName | string | `nil` | If specified, name of storage class requested in service output area PVC | | config.outputVolume.subPath | string | `nil` | If specified, sub-path within bound PV to be mounted at service output area | -| config.pathPrefix | string | `"/cm-service/v1"` | URL path prefix | +| config.pathPrefix | string | `"/cm-service"` | URL path prefix | | frontend.affinity | object | `{}` | Affinity rules for the frontend pods | +| frontend.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the frontend image | +| frontend.image.repository | string | `"ghcr.io/lsst-dm/cm-service"` | Image to use for frontend containers | +| frontend.image.tag | string | The appVersion of the chart | Tag of frontend image to use | | frontend.nodeSelector | object | `{}` | Node selector rules for the frontend pods | | frontend.podAnnotations | object | `{}` | Annotations for the frontend pods | | frontend.replicaCount | int | `1` | Number of frontend pods to start | @@ -30,6 +37,7 @@ Campaign Management for Rubin Data Release Production | image.repository | string | `"ghcr.io/lsst-dm/cm-service"` | Image to use for frontend containers | | image.tag | string | The appVersion of the chart | Tag of frontend image to use | | ingress.annotations | object | `{}` | Additional annotations for the frontend ingress rule | +| internalDB | bool | `false` | Whether to use the internal (phalanx) database | | worker.affinity | object | `{}` | Affinity rules for the worker pods | | worker.htcondor.config.contents | string | `nil` | If specified, contents of htcondor config file to be injected into worker containers | | worker.htcondor.config.mountPath | string | `nil` | If specified, location for htcondor config file to be injected into worker containers | @@ -39,7 +47,7 @@ Campaign Management for Rubin Data Release Production | worker.htcondor.scheddAddress.contents | string | `nil` | If specified, location for htcondor schedd address file to be injected into worker pods | | worker.htcondor.scheddAddress.mountPath | string | `nil` | If specified, contents of htcondor schedd address file to be injected into worker pods | | worker.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the worker image | -| worker.image.repository | string | `"ghcr.io/lsst-dm/cm-service-worker"` | Image to use for worker containers | +| worker.image.repository | string | `"ghcr.io/lsst-dm/cm-worker"` | Image to use for worker containers | | worker.image.tag | string | The appVersion of the chart | Tag of worker image to use | | worker.nodeSelector | object | `{}` | Node selection rules for the worker pods | | worker.podAnnotations | object | `{}` | Annotations for the worker pods | diff --git a/applications/cm-service/secrets.yaml b/applications/cm-service/secrets.yaml index 681ae4c8a3..41e88eb185 100644 --- a/applications/cm-service/secrets.yaml +++ b/applications/cm-service/secrets.yaml @@ -1,8 +1,8 @@ -postgres-password: - description: >- - Password used to authenticate cm-service to its internal cnpg Postgres - server, deployed as part of the same Argo CD application. This secret can be - changed at any time, but the cm-service deployments will then have to be - restarted to pick up the new value. - generate: - type: password +# the database password has been generated in the postgres application; copy +# the secret from there if `internalDB` is set. +internalDatabasePassword: + description: "Password for the internal phalanx postgres database" + if: internalDB + copy: + application: postgres + key: cmservice_password diff --git a/applications/cm-service/templates/_helpers.tpl b/applications/cm-service/templates/_helpers.tpl index 8cffc8107c..1eac425372 100644 --- a/applications/cm-service/templates/_helpers.tpl +++ b/applications/cm-service/templates/_helpers.tpl @@ -1,16 +1,16 @@ {{/* Create chart name and version as used by the chart label. */}} -{{- define "cm-service.chart" -}} +{{- define "application.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "cm-service.labels" -}} -helm.sh/chart: {{ include "cm-service.chart" . }} -{{ include "cm-service.selectorLabels" . }} +{{- define "application.labels" -}} +helm.sh/chart: {{ include "application.chart" . }} +{{ include "application.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -20,7 +20,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "cm-service.selectorLabels" -}} -app.kubernetes.io/name: "cm-service" +{{- define "application.selectorLabels" -}} +app.kubernetes.io/name: {{ .Chart.Name }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} diff --git a/applications/cm-service/templates/deployment.yaml b/applications/cm-service/templates/api-deployment.yaml similarity index 66% rename from applications/cm-service/templates/deployment.yaml rename to applications/cm-service/templates/api-deployment.yaml index bfe3b38d8a..9bb7cb2c32 100644 --- a/applications/cm-service/templates/deployment.yaml +++ b/applications/cm-service/templates/api-deployment.yaml @@ -1,14 +1,14 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "cm-service" + name: {{ .Chart.Name }}-server labels: - {{- include "cm-service.labels" . | nindent 4 }} + {{- include "application.labels" . | nindent 4 }} spec: replicas: {{ .Values.frontend.replicaCount }} selector: matchLabels: - {{- include "cm-service.selectorLabels" . | nindent 6 }} + {{- include "application.selectorLabels" . | nindent 6 }} app.kubernetes.io/component: "frontend" template: metadata: @@ -17,7 +17,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "cm-service.selectorLabels" . | nindent 8 }} + {{- include "application.selectorLabels" . | nindent 8 }} app.kubernetes.io/component: "frontend" spec: {{- with .Values.frontend.affinity }} @@ -26,23 +26,16 @@ spec: {{- end }} automountServiceAccountToken: false containers: - - name: "cm-service" + - name: {{ .Chart.Name }} + envFrom: + - configMapRef: + name: {{ .Chart.Name }}-env env: - - name: CM_DATABASE_PASSWORD + - name: DB__PASSWORD valueFrom: secretKeyRef: - name: postgres-secret - key: password - - name: CM_URL_PREFIX - value: {{ .Values.config.pathPrefix | quote }} - - name: CM_DATABASE_URL - value: "postgresql://cm-service@cm-service-pg-rw/cm-service" - - name: CM_DATABASE_ECHO - value: {{ .Values.config.databaseEcho | quote }} - - name: CM_LOG_PROFILE - value: {{ .Values.config.logProfile | quote }} - - name: CM_LOG_LEVEL - value: {{ .Values.config.logLevel | quote }} + name: cm-service + key: internalDatabasePassword image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: @@ -51,7 +44,7 @@ spec: protocol: "TCP" readinessProbe: httpGet: - path: "/" + path: "/healthz" port: "http" resources: {{- toYaml .Values.frontend.resources | nindent 12 }} @@ -70,7 +63,7 @@ spec: volumes: - name: output-volume persistentVolumeClaim: - claimName: cm-service-output + claimName: {{ .Chart.Name }}-output {{- with .Values.frontend.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/applications/cm-service/templates/configmap.yaml b/applications/cm-service/templates/configmap.yaml new file mode 100644 index 0000000000..16074fbdfa --- /dev/null +++ b/applications/cm-service/templates/configmap.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: "{{ .Chart.Name }}-env" + labels: + {{- include "application.labels" . | nindent 4 }} +data: + ASGI__PREFIX: {{ .Values.config.pathPrefix | quote }} + {{- with .Values.config.db }} + DB__URL: "postgresql://{{ .username }}@{{ .hostname }}:{{ .port }}/{{ .name }}" + DB__ECHO: {{ .echo | quote }} + {{- end }} + LOGGING__PROFILE: {{ .Values.config.logProfile | quote }} + LOGGING__LEVEL: {{ .Values.config.logLevel | quote }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: "{{ .Chart.Name }}-htcondor-env" + labels: + {{- include "application.labels" . | nindent 4 }} +data: + CONDOR_CONFIG: /home/lsstsvc1/.config/condor/condor-config diff --git a/applications/cm-service/templates/ingress.yaml b/applications/cm-service/templates/ingress.yaml index 0820003c40..21387bdbce 100644 --- a/applications/cm-service/templates/ingress.yaml +++ b/applications/cm-service/templates/ingress.yaml @@ -1,19 +1,19 @@ apiVersion: gafaelfawr.lsst.io/v1alpha1 kind: GafaelfawrIngress metadata: - name: "cm-service" + name: {{ .Chart.Name }} labels: - {{- include "cm-service.labels" . | nindent 4 }} + {{- include "application.labels" . | nindent 4 }} config: baseUrl: {{ .Values.global.baseUrl | quote }} loginRedirect: true scopes: all: - "exec:internal-tools" - service: "cm-service" + service: {{ .Chart.Name }} template: metadata: - name: "cm-service" + name: {{ .Chart.Name }} {{- with .Values.ingress.annotations }} annotations: {{- toYaml . | nindent 6 }} @@ -27,13 +27,20 @@ template: pathType: "Prefix" backend: service: - name: "cm-service" + name: {{ .Chart.Name }} port: - number: 8080 + name: "http" + - path: "/docs" + pathType: "Prefix" + backend: + service: + name: {{ .Chart.Name }} + port: + name: "http" - path: "/web_app" pathType: "Prefix" backend: service: - name: "cm-service" + name: {{ .Chart.Name }} port: - number: 8080 + name: "http" diff --git a/applications/cm-service/templates/networkpolicy.yaml b/applications/cm-service/templates/networkpolicy.yaml index 10adb9d3fb..0ec2ed901c 100644 --- a/applications/cm-service/templates/networkpolicy.yaml +++ b/applications/cm-service/templates/networkpolicy.yaml @@ -1,11 +1,11 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: - name: "cm-service" + name: {{ .Chart.Name }} spec: podSelector: matchLabels: - {{- include "cm-service.selectorLabels" . | nindent 6 }} + {{- include "application.selectorLabels" . | nindent 6 }} policyTypes: - "Ingress" ingress: diff --git a/applications/cm-service/templates/postgres.yaml b/applications/cm-service/templates/postgres.yaml deleted file mode 100644 index 805ab34f46..0000000000 --- a/applications/cm-service/templates/postgres.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: postgresql.cnpg.io/v1 -kind: Cluster -metadata: - name: cm-service-pg - labels: - {{- include "cm-service.labels" . | nindent 4 }} -spec: - instances: 1 - bootstrap: - initdb: - database: cm-service - owner: cm-service - secret: - name: postgres-secret - storage: - size: 1Gi diff --git a/applications/cm-service/templates/pre-install-hooks.yaml b/applications/cm-service/templates/pre-install-hooks.yaml new file mode 100644 index 0000000000..5c218798ad --- /dev/null +++ b/applications/cm-service/templates/pre-install-hooks.yaml @@ -0,0 +1,30 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: "{{ .Chart.Name }}-db-alembic-migration" + labels: + {{- include "application.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": pre-install + "helm.sh/hook-weight": "0" + "helm.sh/hook-delete-policy": before-hook-creation +spec: + template: + metadata: {} + spec: + restartPolicy: Never + containers: + - name: db-alembic-migration + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + command: ["alembic"] + args: ["upgrade", "head"] +{{- with .Values.config.db }} + env: + - name: DB__URL + value: "postgresql://{{ .username }}@{{ .hostname }}:{{ .port }}/{{ .name }}" +{{- end }} + - name: DB__PASSWORD + valueFrom: + secretKeyRef: + name: cm-service + key: internalDatabasePassword diff --git a/applications/cm-service/templates/pvc.yaml b/applications/cm-service/templates/pvc.yaml index 7de9bb006a..b4a54110bb 100644 --- a/applications/cm-service/templates/pvc.yaml +++ b/applications/cm-service/templates/pvc.yaml @@ -2,33 +2,31 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: cm-service-output + name: {{ .Chart.Name }}-output labels: - {{- include "cm-service.labels" . | nindent 4 }} + {{- include "application.labels" . | nindent 4 }} spec: - {{- with .Values.config.outputVolume.storageClassName }} - storageClassName: {{ . }} - {{- end }} + {{- with .Values.config.outputVolume }} + storageClassName: {{ .storageClassName }} accessModes: - ReadWriteMany resources: requests: - storage: {{ .Values.config.outputVolume.storage }} -{{- with .Values.worker.htcondor.fsRemoteDir }} + storage: {{ .storage }} + {{- end }} --- apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: cm-service-htcondor + name: {{ $.Chart.Name }}-htcondor labels: - {{- include "cm-service.labels" $ | nindent 4 }} + {{- include "application.labels" $ | nindent 4 }} spec: - {{- with .storageClassName }} - storageClassName: {{ . }} - {{- end }} + {{- with .Values.worker.htcondor.fsRemoteDir }} + storageClassName: {{ .storageClassName }} accessModes: - ReadWriteMany resources: requests: storage: {{ .storage }} -{{- end }} + {{- end }} diff --git a/applications/cm-service/templates/service.yaml b/applications/cm-service/templates/service.yaml index 1db992917a..a9389a4f1e 100644 --- a/applications/cm-service/templates/service.yaml +++ b/applications/cm-service/templates/service.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: Service metadata: - name: "cm-service" + name: {{ .Chart.Name }} labels: - {{- include "cm-service.labels" . | nindent 4 }} + {{- include "application.labels" . | nindent 4 }} spec: type: "ClusterIP" ports: @@ -12,5 +12,5 @@ spec: protocol: "TCP" name: "http" selector: - {{- include "cm-service.selectorLabels" . | nindent 4 }} + {{- include "application.selectorLabels" . | nindent 4 }} app.kubernetes.io/component: "frontend" diff --git a/applications/cm-service/templates/vault-secrets.yaml b/applications/cm-service/templates/vault-secrets.yaml index 996a6617d8..6ce364fd28 100644 --- a/applications/cm-service/templates/vault-secrets.yaml +++ b/applications/cm-service/templates/vault-secrets.yaml @@ -1,13 +1,10 @@ +--- apiVersion: ricoberger.de/v1alpha1 kind: VaultSecret metadata: - name: postgres-secret + name: {{ .Chart.Name }} labels: - {{- include "cm-service.labels" . | nindent 4 }} + {{- include "application.labels" . | nindent 4 }} spec: - path: "{{ .Values.global.vaultSecretsPath }}/cm-service" - templates: - username: cm-service - password: >- - {% index .Secrets "postgres-password" %} - type: kubernetes.io/basic-auth + path: "{{ .Values.global.vaultSecretsPath }}/{{ .Chart.Name }}" + type: Opaque diff --git a/applications/cm-service/templates/worker-configmap.yaml b/applications/cm-service/templates/worker-configmap.yaml index 2178125409..5f3cfdfa67 100644 --- a/applications/cm-service/templates/worker-configmap.yaml +++ b/applications/cm-service/templates/worker-configmap.yaml @@ -1,9 +1,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: "cm-service-config-worker" + name: "{{ .Chart.Name }}-config-worker" labels: - {{- include "cm-service.labels" . | nindent 4 }} + {{- include "application.labels" . | nindent 4 }} data: {{- with .Values.worker.htcondor.config }} config: | diff --git a/applications/cm-service/templates/worker-deployment.yaml b/applications/cm-service/templates/worker-deployment.yaml index 3218cd651d..4645295f80 100644 --- a/applications/cm-service/templates/worker-deployment.yaml +++ b/applications/cm-service/templates/worker-deployment.yaml @@ -1,14 +1,14 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "cm-service-worker" + name: {{ .Chart.Name }}-worker labels: - {{- include "cm-service.labels" . | nindent 4 }} + {{- include "application.labels" . | nindent 4 }} spec: replicas: {{ .Values.worker.replicaCount }} selector: matchLabels: - {{- include "cm-service.selectorLabels" . | nindent 6 }} + {{- include "application.selectorLabels" . | nindent 6 }} app.kubernetes.io/component: "worker" template: metadata: @@ -17,7 +17,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} labels: - {{- include "cm-service.selectorLabels" . | nindent 8 }} + {{- include "application.selectorLabels" . | nindent 8 }} app.kubernetes.io/component: "worker" spec: {{- with .Values.worker.affinity }} @@ -26,9 +26,28 @@ spec: {{- end }} automountServiceAccountToken: false containers: - - name: "cm-service-worker" + - name: "{{ .Chart.Name }}-worker" image: "{{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + imagePullPolicy: {{ .Values.worker.image.pullPolicy }} + ports: + - name: "http" + containerPort: 8080 + protocol: "TCP" + readinessProbe: + httpGet: + path: "/healthz" + port: "http" + envFrom: + - configMapRef: + name: {{ .Chart.Name }}-env + - configMapRef: + name: {{ .Chart.Name }}-htcondor-env + env: + - name: DB__PASSWORD + valueFrom: + secretKeyRef: + name: cm-service + key: internalDatabasePassword resources: {{- toYaml .Values.worker.resources | nindent 12 }} securityContext: @@ -65,14 +84,14 @@ spec: volumes: - name: output-volume persistentVolumeClaim: - claimName: cm-service-output + claimName: {{ .Chart.Name }}-output - name: tmp-volume emptyDir: sizeLimit: 500Mi {{- with .Values.worker.htcondor.config }} - name: condor-config-volume configMap: - name: cm-service-config-worker + name: {{ $.Chart.Name }}-config-worker items: - key: config path: condor-config @@ -80,12 +99,12 @@ spec: {{- with .Values.worker.htcondor.fsRemoteDir }} - name: condor-remote-volume persistentVolumeClaim: - claimName: cm-service-htcondor + claimName: {{ $.Chart.Name }}-htcondor {{- end }} {{- with .Values.worker.htcondor.scheddAddress }} - name: condor-schedd-volume configMap: - name: cm-service-config-worker + name: {{ $.Chart.Name }}-config-worker items: - key: scheddAddress path: schedd-address diff --git a/applications/cm-service/values-usdf-cm-dev.yaml b/applications/cm-service/values-usdf-cm-dev.yaml index e7b42a3f33..3828d7400d 100644 --- a/applications/cm-service/values-usdf-cm-dev.yaml +++ b/applications/cm-service/values-usdf-cm-dev.yaml @@ -1,30 +1,39 @@ +internalDB: true config: logLevel: "INFO" logProfile: "development" - databaseEcho: true + db: + hostname: "postgres.postgres" + echo: true outputVolume: storageClassName: "sdf-data-rubin" - subPath: "shared/campaigns/users/usdf-cm-prod" + subPath: "shared/campaigns/users/usdf-cm-dev" +image: + tag: "tickets-DM-48099-release" + pullPolicy: Always worker: + image: + tag: "tickets-DM-48099-release" + pullPolicy: Always htcondor: config: - mountPath: "/home/lsstsvc1/stack/conda/envs/lsst-scipipe-9.0.0/etc/condor/config.d" + mountPath: "/home/lsstsvc1/.config/condor" contents: | CONDOR_HOST = sdfiana012.sdf.slac.stanford.edu COLLECTOR_HOST = sdfiana012.sdf.slac.stanford.edu + SCHEDD_HOST = sdfiana012.sdf.slac.stanford.edu SEC_CLIENT_AUTHENTICATION_METHODS = FS, FS_REMOTE use security:recommended_v9_0 SEC_DEFAULT_AUTHENTICATION_METHODS = FS_REMOTE, IDTOKENS, FS SEC_DAEMON_AUTHENTICATION_METHODS = FS_REMOTE, IDTOKENS, FS SEC_READ_AUTHENTICATION_METHODS = FS_REMOTE, IDTOKENS, FS FS_REMOTE_DIR = /sdf/group/rubin/services/htcondor/shared - SCHEDD_ADDRESS_FILE = /config/schedd-address fsRemoteDir: storageClassName: "sdf-group-rubin" subPath: "services/htcondor/shared" mountPath: "/sdf/group/rubin/services/htcondor/shared" scheddAddress: - mountPath: "/config" + mountPath: "/home/lsstsvc1/.config/schedd" contents: | <172.24.49.173:5935?addrs=172.24.49.173-5935&alias=sdfiana012.sdf.slac.stanford.edu> $CondorVersion: 23.0.12 2024-06-13 BuildID: 739441 PackageID: 23.0.12-1 $ diff --git a/applications/cm-service/values-usdf-cm.yaml b/applications/cm-service/values-usdf-cm.yaml index e7b42a3f33..b8258a4acf 100644 --- a/applications/cm-service/values-usdf-cm.yaml +++ b/applications/cm-service/values-usdf-cm.yaml @@ -1,7 +1,8 @@ config: logLevel: "INFO" logProfile: "development" - databaseEcho: true + db: + echo: true outputVolume: storageClassName: "sdf-data-rubin" subPath: "shared/campaigns/users/usdf-cm-prod" diff --git a/applications/cm-service/values.yaml b/applications/cm-service/values.yaml index ae260853f4..c964e4e5ba 100644 --- a/applications/cm-service/values.yaml +++ b/applications/cm-service/values.yaml @@ -2,10 +2,26 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +# -- Whether to use the internal (phalanx) database +internalDB: false + config: - # -- Whether to echo SQLAlchemy generated SQL to the log - databaseEcho: false + db: + # -- Name of the database host + hostname: "" + + # -- Name of the database user to use for the application + username: "cmservice" + + # -- Name of the database to use for the application + name: "cmservice" + + # -- Whether to echo SQLAlchemy generated SQL to the log + echo: false + + # -- Port number of the database host + port: 5432 # -- Logging level (`DEBUG`, `INFO`, `WARNING`, `ERROR`, or `CRITICAL`) logLevel: "INFO" @@ -24,7 +40,7 @@ config: subPath: null # -- URL path prefix - pathPrefix: "/cm-service/v1" + pathPrefix: "/cm-service" image: # -- Image to use for frontend containers @@ -45,6 +61,17 @@ frontend: # -- Number of frontend pods to start replicaCount: 1 + image: + # -- Image to use for frontend containers + repository: "ghcr.io/lsst-dm/cm-service" + + # -- Pull policy for the frontend image + pullPolicy: "IfNotPresent" + + # -- Tag of frontend image to use + # @default -- The appVersion of the chart + tag: null + # -- Resource limits and requests for the frontend pods # @default -- See `values.yaml` resources: @@ -73,7 +100,7 @@ worker: image: # -- Image to use for worker containers - repository: "ghcr.io/lsst-dm/cm-service-worker" + repository: "ghcr.io/lsst-dm/cm-worker" # -- Pull policy for the worker image pullPolicy: "IfNotPresent"