From e51a11f0c553ae5b5bf6a598a6df60cde8d6b672 Mon Sep 17 00:00:00 2001 From: Xiao Gui Date: Thu, 17 Oct 2024 11:24:59 +0200 Subject: [PATCH] maint: bump siibra req cicd: reenable auto deploy --- .github/workflows/deploy-server-helm-v4.yml | 74 +++++++++++ .github/workflows/docker-img.yml | 30 +++++ .helm/siibra-api-v4-server/.helmignore | 23 ++++ .helm/siibra-api-v4-server/Chart.yaml | 24 ++++ .../siibra-api-v4-server/templates/NOTES.txt | 22 ++++ .../templates/_helpers.tpl | 80 ++++++++++++ .../templates/deployment.yaml | 76 +++++++++++ .helm/siibra-api-v4-server/templates/hpa.yaml | 32 +++++ .../templates/ingress.yaml | 61 +++++++++ .../templates/service.yaml | 15 +++ .../templates/serviceaccount.yaml | 13 ++ .../templates/tests/test-connection.yaml | 15 +++ .helm/siibra-api-v4-server/values.yaml | 121 ++++++++++++++++++ .helm/siibra-api-v4-worker/Chart.yaml | 2 +- requirements/siibra.txt | 2 +- 15 files changed, 588 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/deploy-server-helm-v4.yml create mode 100644 .helm/siibra-api-v4-server/.helmignore create mode 100644 .helm/siibra-api-v4-server/Chart.yaml create mode 100644 .helm/siibra-api-v4-server/templates/NOTES.txt create mode 100644 .helm/siibra-api-v4-server/templates/_helpers.tpl create mode 100644 .helm/siibra-api-v4-server/templates/deployment.yaml create mode 100644 .helm/siibra-api-v4-server/templates/hpa.yaml create mode 100644 .helm/siibra-api-v4-server/templates/ingress.yaml create mode 100644 .helm/siibra-api-v4-server/templates/service.yaml create mode 100644 .helm/siibra-api-v4-server/templates/serviceaccount.yaml create mode 100644 .helm/siibra-api-v4-server/templates/tests/test-connection.yaml create mode 100644 .helm/siibra-api-v4-server/values.yaml diff --git a/.github/workflows/deploy-server-helm-v4.yml b/.github/workflows/deploy-server-helm-v4.yml new file mode 100644 index 0000000..fc95893 --- /dev/null +++ b/.github/workflows/deploy-server-helm-v4.yml @@ -0,0 +1,74 @@ +name: "[deploy] on helm (v4)" + +on: + workflow_call: + inputs: + DEPLOYMENT_NAME: + required: true + type: string + + HELM_FILE: + default: ".helm/siibra-api-v4-server" + type: string + + FALVOR: + required: true + type: string + + IMAGE_TAG: + default: "0.3-server" + type: string + + secrets: + KUBECONFIG: + required: true + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: './.github/workflows/composite-set-k8s-cred' + with: + secrets: ${{ secrets.KUBECONFIG }} + - name: 'Get status' + run: | + helm status ${{ inputs.DEPLOYMENT_NAME }} + HELM_STATUS=$(echo $?) + echo "HELM_STATUS: $HELM_STATUS" + echo "HELM_STATUS=$HELM_STATUS" >> $GITHUB_ENV + + - name: Set Vars + run: | + SAPI_VERSION=$(cat VERSION) + + echo "SAPI_VERSION: $SAPI_VERSION" + + if [[ -z "$SAPI_VERSION" ]] + then + echo "SAPI_VERSION cannot be found $SAPI_VERSION" + exit 1 + fi + + echo "SAPI_VERSION=$SAPI_VERSION" >> $GITHUB_ENV + + - name: Run deploy + run: | + if [[ "$HELM_STATUS" == "0" ]] + then + helm upgrade \ + --set sapi.version=$SAPI_VERSION \ + --set sapi.flavor=${{ inputs.FALVOR }} \ + --set image.tag=${{ inputs.IMAGE_TAG }} \ + --reuse-values \ + --history-max 1 \ + ${{ inputs.DEPLOYMENT_NAME }} \ + ${{ inputs.HELM_FILE }} + else + helm install \ + --set sapi.version=$SAPI_VERSION \ + --set sapi.flavor=${{ inputs.FALVOR }} \ + --set image.tag=${{ inputs.IMAGE_TAG }} \ + ${{ inputs.DEPLOYMENT_NAME }} \ + ${{ inputs.HELM_FILE }} + fi diff --git a/.github/workflows/docker-img.yml b/.github/workflows/docker-img.yml index 12a52c4..5f24b53 100644 --- a/.github/workflows/docker-img.yml +++ b/.github/workflows/docker-img.yml @@ -222,7 +222,37 @@ jobs: RESOURCE: ${{ matrix.resource }} secrets: KUBECONFIG: ${{ secrets.KUBECONFIG }} + + deploy-rc-worker-v4-via-helm: + needs: + - warmup-rc-at-helm + - setup-envvar + + if: ${{ github.event_name == 'release' && contains(github.ref, 'rc') }} + uses: ./.github/workflows/deploy-worker-helm-v4.yml + with: + DEPLOYMENT_NAME: rc-worker-v4 + HELM_FILE: .helm/siibra-api-v4-worker + FALVOR: rc + QUEUE: celery + IMAGE_TAG: rc-worker-v4 + WORKER_PATH: new_api.worker.app + secrets: + KUBECONFIG: ${{ secrets.KUBECONFIG }} + deploy-rc-server-via-helm: + needs: + - warmup-rc-at-helm + - setup-envvar + if: ${{ github.event_name == 'release' && contains(github.ref, 'rc') }} + uses: ./.github/workflows/deploy-worker-helm-v4.yml + with: + DEPLOYMENT_NAME: rc-server + FALVOR: rc + IMAGE_TAG: rc-server + secrets: + KUBECONFIG: ${{ secrets.KUBECONFIG }} + # prod copy-by-helm: needs: setup-envvar diff --git a/.helm/siibra-api-v4-server/.helmignore b/.helm/siibra-api-v4-server/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/.helm/siibra-api-v4-server/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/.helm/siibra-api-v4-server/Chart.yaml b/.helm/siibra-api-v4-server/Chart.yaml new file mode 100644 index 0000000..dd9d0d2 --- /dev/null +++ b/.helm/siibra-api-v4-server/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: siibra-api-v4-server +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "0.3.21-rc3" diff --git a/.helm/siibra-api-v4-server/templates/NOTES.txt b/.helm/siibra-api-v4-server/templates/NOTES.txt new file mode 100644 index 0000000..ca8134a --- /dev/null +++ b/.helm/siibra-api-v4-server/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "siibra-api-v4-server.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "siibra-api-v4-server.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "siibra-api-v4-server.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "siibra-api-v4-server.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/.helm/siibra-api-v4-server/templates/_helpers.tpl b/.helm/siibra-api-v4-server/templates/_helpers.tpl new file mode 100644 index 0000000..c56a560 --- /dev/null +++ b/.helm/siibra-api-v4-server/templates/_helpers.tpl @@ -0,0 +1,80 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "siibra-api-v4-server.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + + +{{/* +Define cache-dir. append -rc if is rc +This is because, on deploy staging it will rm -rf cache-dir. +This should prevent misconfiguration from deleting prod cache +*/}} +{{- define "siibra-api-v4-server.cache-dir" -}} +{{- if eq .Values.sapi.flavor "rc" -}} +{{/* +N.B. *any* update here *needs* to be reflected in +.github/workflows/docker-img.yml#jobs>warmup-rc-at-helm +*/}} +{{- printf "%s-%s" .Values.sapi.version "rc" }} +{{- else }} +{{- .Values.sapi.version }} +{{- end }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "siibra-api-v4-server.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "siibra-api-v4-server.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "siibra-api-v4-server.labels" -}} +helm.sh/chart: {{ include "siibra-api-v4-server.chart" . }} +{{ include "siibra-api-v4-server.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "siibra-api-v4-server.selectorLabels" -}} +app.kubernetes.io/name: {{ include "siibra-api-v4-server.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "siibra-api-v4-server.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "siibra-api-v4-server.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/.helm/siibra-api-v4-server/templates/deployment.yaml b/.helm/siibra-api-v4-server/templates/deployment.yaml new file mode 100644 index 0000000..40a966b --- /dev/null +++ b/.helm/siibra-api-v4-server/templates/deployment.yaml @@ -0,0 +1,76 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "siibra-api-v4-server.fullname" . }} + labels: + {{- include "siibra-api-v4-server.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "siibra-api-v4-server.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "siibra-api-v4-server.labels" . | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "siibra-api-v4-server.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: {{ .Values.service.port }} + protocol: TCP + livenessProbe: + {{- toYaml .Values.livenessProbe | nindent 12 }} + readinessProbe: + {{- toYaml .Values.readinessProbe | nindent 12 }} + envFrom: + - configMapRef: + name: siibra-api-common + env: + - name: SIIBRA_CACHEDIR + value: "/siibra-api-volume/{{- include "siibra-api-v4-server.cache-dir" . -}}" + - name: SIIBRA_API_NAMESPACE + value: {{ .Values.sapi.flavor }} + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.volumeMounts }} + volumeMounts: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.volumes }} + volumes: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/.helm/siibra-api-v4-server/templates/hpa.yaml b/.helm/siibra-api-v4-server/templates/hpa.yaml new file mode 100644 index 0000000..d14a297 --- /dev/null +++ b/.helm/siibra-api-v4-server/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "siibra-api-v4-server.fullname" . }} + labels: + {{- include "siibra-api-v4-server.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "siibra-api-v4-server.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/.helm/siibra-api-v4-server/templates/ingress.yaml b/.helm/siibra-api-v4-server/templates/ingress.yaml new file mode 100644 index 0000000..2e97182 --- /dev/null +++ b/.helm/siibra-api-v4-server/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "siibra-api-v4-server.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "siibra-api-v4-server.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/.helm/siibra-api-v4-server/templates/service.yaml b/.helm/siibra-api-v4-server/templates/service.yaml new file mode 100644 index 0000000..66cca1a --- /dev/null +++ b/.helm/siibra-api-v4-server/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "siibra-api-v4-server.fullname" . }} + labels: + {{- include "siibra-api-v4-server.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "siibra-api-v4-server.selectorLabels" . | nindent 4 }} diff --git a/.helm/siibra-api-v4-server/templates/serviceaccount.yaml b/.helm/siibra-api-v4-server/templates/serviceaccount.yaml new file mode 100644 index 0000000..05c9b96 --- /dev/null +++ b/.helm/siibra-api-v4-server/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "siibra-api-v4-server.serviceAccountName" . }} + labels: + {{- include "siibra-api-v4-server.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +automountServiceAccountToken: {{ .Values.serviceAccount.automount }} +{{- end }} diff --git a/.helm/siibra-api-v4-server/templates/tests/test-connection.yaml b/.helm/siibra-api-v4-server/templates/tests/test-connection.yaml new file mode 100644 index 0000000..c18810d --- /dev/null +++ b/.helm/siibra-api-v4-server/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "siibra-api-v4-server.fullname" . }}-test-connection" + labels: + {{- include "siibra-api-v4-server.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "siibra-api-v4-server.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/.helm/siibra-api-v4-server/values.yaml b/.helm/siibra-api-v4-server/values.yaml new file mode 100644 index 0000000..d00fc20 --- /dev/null +++ b/.helm/siibra-api-v4-server/values.yaml @@ -0,0 +1,121 @@ +# Default values for siibra-api-v4-server. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +sapi: + flavor: "prod" + version: "0.3.21" + +image: + repository: docker-registry.ebrains.eu/siibra/siibra-api + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: 0.3-server + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: false + # Automatically mount a ServiceAccount's API credentials? + automount: false + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} +podLabels: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 5000 + +ingress: + enabled: true + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: siibra-api-rc.apps.tc.humanbrainproject.eu + paths: + - path: / + pathType: Prefix + tls: + - secretName: siibra-api-rc-secret + hosts: + - siibra-api-rc.apps.tc.humanbrainproject.eu + +resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: + cpu: 200m + memory: 512Mi + requests: + cpu: 100m + memory: 256Mi + +livenessProbe: + initialDelaySeconds: 20 + periodSeconds: 30 + timeoutSeconds: 10 + failureThreshold: 3 + exec: + command: ["/bin/ash", "-c", "cd /api && python server_health.py"] +readinessProbe: + initialDelaySeconds: 10 + periodSeconds: 30 + timeoutSeconds: 10 + failureThreshold: 3 + exec: + command: ["/bin/ash", "-c", "cd /api && python server_health.py"] + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: + - name: log-volume + persistentVolumeClaim: + claimName: log-volume-claim + - name: data-volume + persistentVolumeClaim: + claimName: data-volume-claim + + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: + - mountPath: /siibra-api-volume + name: data-volume + - mountPath: /siibra_api_logs + name: log-volume + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/.helm/siibra-api-v4-worker/Chart.yaml b/.helm/siibra-api-v4-worker/Chart.yaml index 51c43dc..c13f62d 100644 --- a/.helm/siibra-api-v4-worker/Chart.yaml +++ b/.helm/siibra-api-v4-worker/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.3.21-rc2" +appVersion: "0.3.21-rc3" diff --git a/requirements/siibra.txt b/requirements/siibra.txt index 56b6dd2..bf3bb9f 100644 --- a/requirements/siibra.txt +++ b/requirements/siibra.txt @@ -1,2 +1,2 @@ -siibra==0.4a81 +siibra==0.4a82 plotly