diff --git a/swh/templates/graphql/deployment.yaml b/swh/templates/graphql/deployment.yaml index 415b280..4762f00 100644 --- a/swh/templates/graphql/deployment.yaml +++ b/swh/templates/graphql/deployment.yaml @@ -1,69 +1,69 @@ {{ if .Values.graphql.enabled -}} --- apiVersion: apps/v1 kind: Deployment metadata: name: graphql namespace: {{ .Values.namespace }} labels: app: graphql spec: - revisionHistoryLimit: 3 + revisionHistoryLimit: 2 replicas: {{ .Values.graphql.replicas }} selector: matchLabels: app: graphql strategy: type: RollingUpdate rollingUpdate: maxSurge: 1 template: metadata: labels: app: graphql annotations: # Force a rollout upgrade if the configuration changes checksum/config: {{ include (print $.Template.BasePath "/graphql/configmap.yaml") . | sha256sum }} spec: containers: - name: graphql image: {{ .Values.swh_graphql_image }}:{{ .Values.swh_graphql_image_version }} imagePullPolicy: Always ports: - containerPort: 5013 env: - name: PORT value: "5013" - name: THREADS value: {{ .Values.graphql.gunicorn.threads | quote }} - name: WORKERS value: {{ .Values.graphql.gunicorn.workers | quote }} - name: LOG_LEVEL value: {{ .Values.graphql.logLevel | quote }} - name: TIMEOUT value: {{ .Values.graphql.gunicorn.timeout | quote }} {{ if .Values.graphql.sentry_enabled -}} - name: SWH_SENTRY_ENVIRONMENT value: {{ $.Values.sentry.environment }} - name: SWH_MAIN_PACKAGE value: swh.graphql - name: SWH_SENTRY_DSN valueFrom: secretKeyRef: name: graphql-sentry-secrets key: sentry-dsn # 'name' secret must exist & include key "host" optional: false {{ end }} volumeMounts: - name: config mountPath: /etc/swh/config.yml subPath: config.yml readOnly: true volumes: - name: config configMap: name: graphql defaultMode: 0444 {{ end }} diff --git a/swh/templates/listers/deployment.yaml b/swh/templates/listers/deployment.yaml index 508b36c..d5dc598 100644 --- a/swh/templates/listers/deployment.yaml +++ b/swh/templates/listers/deployment.yaml @@ -1,120 +1,120 @@ {{ if .Values.listers.enabled -}} {{- $configurationChecksum := include (print $.Template.BasePath "/listers/configmap.yaml") . -}} {{- range $lister_type, $deployment_config := .Values.listers.deployments -}} {{- $lister_name := ( print "lister-" $lister_type ) -}} --- apiVersion: apps/v1 kind: Deployment metadata: name: {{ $lister_name }} namespace: {{ $.Values.namespace }} labels: app: {{ $lister_name }} spec: - revisionHistoryLimit: 3 + revisionHistoryLimit: 2 selector: matchLabels: app: {{ $lister_name }} strategy: type: RollingUpdate rollingUpdate: maxSurge: 1 template: metadata: labels: app: {{ $lister_name }} annotations: # Force a rollout upgrade if the configuration changes checksum/config: {{ $configurationChecksum | sha256sum }} spec: {{- if $.Values.listers.affinity }} affinity: {{ toYaml $.Values.listers.affinity | nindent 8 }} {{- end }} initContainers: - name: prepare-configuration image: debian:bullseye imagePullPolicy: Always envFrom: - secretRef: # define the ${host) values for configuration "celery > task_broker: " key name: amqp-access-credentials command: - /entrypoint.sh volumeMounts: - name: configuration-template mountPath: /entrypoint.sh subPath: "init-container-entrypoint.sh" readOnly: true - name: configuration mountPath: /etc/swh - name: configuration-template mountPath: /etc/swh/configuration-template - name: lister-credentials-secrets mountPath: /etc/credentials/listers readOnly: true containers: - name: listers resources: requests: memory: {{ get $deployment_config "requestedMemory" | default "512Mi" }} cpu: {{ get $deployment_config "requestedCpu" | default "500m" }} limits: memory: "4000Mi" cpu: "1200m" image: {{ $.Values.swh_listers_image }}:{{ $.Values.swh_listers_image_version }} imagePullPolicy: Always command: - /bin/bash args: - -c - /opt/swh/entrypoint.sh lifecycle: preStop: exec: command: ["kill", "1"] env: - name: STATSD_HOST value: {{ $.Values.statsdExternalHost | default "prometheus-statsd-exporter" }} - name: STATSD_PORT value: {{ $.Values.statsdPort | default "9125" | quote }} - name: CONCURRENCY value: {{ get $deployment_config "concurrency" | default 1 | quote }} - name: MAX_TASKS_PER_CHILD value: {{ get $deployment_config "maxTasksPerChild" | default 1 | quote }} - name: LOGLEVEL value: {{ get $deployment_config "logLevel" | default "INFO" | quote }} - name: SWH_CONFIG_FILENAME value: /etc/swh/config.yml - name: SWH_SENTRY_ENVIRONMENT value: {{ $.Values.sentry.environment }} - name: SWH_MAIN_PACKAGE value: {{ $.Values.listers.sentrySwhPackage }} - name: SWH_SENTRY_DSN valueFrom: secretKeyRef: name: lister-sentry-secrets key: sentry-dsn # 'name' secret must exist & include key "host" optional: false volumeMounts: - name: configuration mountPath: /etc/swh volumes: - name: configuration emptyDir: {} - name: configuration-template configMap: name: {{ $lister_name }}-template defaultMode: 0777 items: - key: "config.yml.template" path: "config.yml.template" - key: "init-container-entrypoint.sh" path: "init-container-entrypoint.sh" - name: lister-credentials-secrets secret: secretName: lister-credentials-secrets optional: true {{ end }} {{- end -}} diff --git a/swh/templates/loaders/deployment.yaml b/swh/templates/loaders/deployment.yaml index ceea568..2d14791 100644 --- a/swh/templates/loaders/deployment.yaml +++ b/swh/templates/loaders/deployment.yaml @@ -1,125 +1,125 @@ {{ if .Values.loaders.enabled -}} {{- $configurationChecksum := include (print $.Template.BasePath "/loaders/configmap.yaml") . -}} {{- range $loader_type, $deployment_config := .Values.loaders.deployments -}} {{- $loader_name := ( print "loader-" $loader_type ) -}} {{- $image_name_key := ( print "swh_loader_" $loader_type "_image" ) -}} {{- $image_version_key := ( print $image_name_key "_version" ) -}} {{- $container_image := get $.Values $image_name_key }} {{- $container_image_version := get $.Values $image_version_key }} --- apiVersion: apps/v1 kind: Deployment metadata: name: {{ $loader_name }} namespace: {{ $.Values.namespace }} labels: app: {{ $loader_name }} spec: - revisionHistoryLimit: 3 + revisionHistoryLimit: 2 selector: matchLabels: app: {{ $loader_name }} strategy: type: RollingUpdate rollingUpdate: maxSurge: 1 template: metadata: labels: app: {{ $loader_name }} annotations: # Force a rollout upgrade if the configuration changes checksum/config: {{ $configurationChecksum | sha256sum }} spec: {{- if $.Values.loaders.affinity }} affinity: {{ toYaml $.Values.loaders.affinity | nindent 8 }} {{- end }} initContainers: - name: prepare-configuration image: debian:bullseye imagePullPolicy: Always envFrom: - secretRef: # define the ${host) values for configuration "celery > task_broker: " key name: amqp-access-credentials command: - /entrypoint.sh volumeMounts: - name: configuration-template mountPath: /entrypoint.sh subPath: "init-container-entrypoint.sh" readOnly: true - name: configuration mountPath: /etc/swh - name: configuration-template mountPath: /etc/swh/configuration-template - name: metadata-fetcher-credentials mountPath: /etc/credentials/metadata-fetcher readOnly: true containers: - name: loaders {{ if $container_image -}} image: {{ $container_image }}:{{ $container_image_version }} {{ else -}} image: {{ $.Values.swh_loaders_image }}:{{ $.Values.swh_loaders_image_version }} {{ end }} imagePullPolicy: Always command: - /opt/swh/entrypoint.sh resources: requests: memory: {{ get $deployment_config "requestedMemory" | default "512Mi" }} cpu: {{ get $deployment_config "requestedCpu" | default "500m" }} limits: memory: "4000Mi" cpu: "1200m" lifecycle: preStop: exec: command: ["kill", "1"] env: - name: STATSD_HOST value: {{ $.Values.statsdExternalHost | default "prometheus-statsd-exporter" }} - name: STATSD_PORT value: {{ $.Values.statsdPort | default "9125" | quote }} - name: CONCURRENCY value: {{ get $deployment_config "concurrency" | default 1 | quote }} - name: MAX_TASKS_PER_CHILD value: {{ get $deployment_config "maxTasksPerChild" | default 5 | quote }} - name: LOGLEVEL value: {{ get $deployment_config "logLevel" | default "INFO" | quote }} - name: SWH_CONFIG_FILENAME value: /etc/swh/config.yml - name: SWH_SENTRY_ENVIRONMENT value: {{ $.Values.sentry.environment }} - name: SWH_MAIN_PACKAGE value: {{ get $deployment_config "sentrySwhPackage" }} - name: SWH_SENTRY_DSN valueFrom: secretKeyRef: name: {{ $loader_name }}-sentry-secrets key: sentry-dsn # 'name' secret must exist & include key "host" optional: false volumeMounts: - name: configuration mountPath: /etc/swh volumes: - name: configuration emptyDir: {} - name: configuration-template configMap: name: {{ $loader_name }}-template defaultMode: 0777 items: - key: "config.yml.template" path: "config.yml.template" - key: "init-container-entrypoint.sh" path: "init-container-entrypoint.sh" - name: metadata-fetcher-credentials secret: secretName: metadata-fetcher-credentials optional: true {{ end }} {{- end -}} diff --git a/swh/templates/storage-replayer/deployment.yaml b/swh/templates/storage-replayer/deployment.yaml index 5a14ec8..9104b72 100644 --- a/swh/templates/storage-replayer/deployment.yaml +++ b/swh/templates/storage-replayer/deployment.yaml @@ -1,86 +1,86 @@ {{ if .Values.storage_replayer.enabled -}} {{- $configurationChecksum := include (print $.Template.BasePath "/storage-replayer/configmap.yaml") . -}} {{- range $deployment, $deployment_config := .Values.storage_replayer.deployments -}} --- apiVersion: apps/v1 kind: Deployment metadata: namespace: {{ $.Values.namespace }} name: storage-replayer-{{ $deployment }} labels: app: storage-replayer-{{ $deployment }} spec: - revisionHistoryLimit: 3 + revisionHistoryLimit: 2 selector: matchLabels: app: storage-replayer-{{ $deployment }} template: metadata: labels: app: storage-replayer-{{ $deployment }} annotations: checksum/config: {{ $configurationChecksum | sha256sum }} spec: {{- if $.Values.storage_replayer.affinity }} affinity: {{ toYaml $.Values.storage_replayer.affinity | nindent 8 }} {{- end }} initContainers: - name: prepare-configuration image: debian:bullseye imagePullPolicy: Always envFrom: - secretRef: name: {{ $.Values.storage_replayer.journalBrokers.secretName }} command: - /bin/bash args: - -c - eval echo "\"$( /etc/swh/config.yml volumeMounts: - name: configuration mountPath: /etc/swh - name: configuration-template mountPath: /etc/swh/configuration-template {{- if $.Values.storage_replayer.cassandra.initKeyspace }} - name: init-database image: {{ $.Values.swh_storage_replayer_image }}:{{ $.Values.swh_storage_replayer_image_version }} imagePullPolicy: Always command: - /bin/bash args: - -c - eval "echo \"from swh.storage.cassandra import create_keyspace; create_keyspace(['{{ first $.Values.storage_replayer.cassandra.seeds }}'], 'swh')\" | python3" {{- end }} containers: - name: storage-replayer resources: requests: memory: {{ get $deployment_config "requestedMemory" | default "512Mi" }} cpu: {{ get $deployment_config "requestedCpu" | default "500m" }} image: {{ $.Values.swh_storage_replayer_image }}:{{ $.Values.swh_storage_replayer_image_version }} command: - /bin/bash args: - -c - /opt/swh/entrypoint.sh env: - name: STATSD_HOST value: {{ $.Values.statsdExternalHost | default "prometheus-statsd-exporter" }} - name: STATSD_PORT value: {{ $.Values.statsdPort | default "9125" | quote }} imagePullPolicy: Always volumeMounts: - name: configuration mountPath: /etc/swh volumes: - name: configuration emptyDir: {} - name: configuration-template configMap: name: storage-replayer-configuration-{{ $deployment }}-template items: - key: "config.yml.template" path: "config.yml.template" {{ end }} {{- end -}}