diff --git a/.gitignore b/.gitignore index c5e0573..0da8864 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.cpython -__pycache__ \ No newline at end of file +__pycache__ +.idea \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..25571c3 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,4 @@ +include: + - project: 'astra/microservice-ci' + ref: main + file: '/templates/microservice.yaml' diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..81b6748 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,16 @@ +FROM python:3.11.3 + +WORKDIR /code + +COPY ./requirements.txt /code/requirements.txt + +RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt + +ENV PYTHONPATH='/code/src' + +COPY ./src/personal_info /code/src/personal_info +COPY ./migration /code/migration +COPY ./alembic.ini /code/alembic.ini + +# +CMD ["uvicorn", "medical_info.main:app", "--host", "0.0.0.0", "--port", "8080"] diff --git a/deploy/.env b/deploy/.env new file mode 100644 index 0000000..057f697 --- /dev/null +++ b/deploy/.env @@ -0,0 +1,2 @@ +SERVICE_REPLICAS=3 +SERVICE_PORT=8080 diff --git a/deploy/.helmignore b/deploy/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/deploy/.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/deploy/Chart.yaml b/deploy/Chart.yaml new file mode 100644 index 0000000..3ef0dc0 --- /dev/null +++ b/deploy/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: astra-users +appVersion: latest +description: A Helm chart to deploy app - astra + +# 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 + +engine: gotpl + +maintainers: +- name: DOP diff --git a/deploy/templates/NOTES.txt b/deploy/templates/NOTES.txt new file mode 100644 index 0000000..483dc61 --- /dev/null +++ b/deploy/templates/NOTES.txt @@ -0,0 +1 @@ +192.168.1.112:8888 diff --git a/deploy/templates/_helpers.tpl b/deploy/templates/_helpers.tpl new file mode 100644 index 0000000..3d14643 --- /dev/null +++ b/deploy/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "astra-frontend.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- 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 "astra-frontend.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 "astra-frontend.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "astra-frontend.labels" -}} +helm.sh/chart: {{ include "astra-frontend.chart" . }} +{{ include "astra-frontend.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "astra-frontend.selectorLabels" -}} +app.kubernetes.io/name: {{ include "astra-frontend.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "astra-frontend.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "astra-frontend.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/deploy/templates/deployment.yaml b/deploy/templates/deployment.yaml new file mode 100644 index 0000000..06799b8 --- /dev/null +++ b/deploy/templates/deployment.yaml @@ -0,0 +1,39 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ .Values.app.fullName }} +spec: + replicas: {{ .Values.replicas }} + revisionHistoryLimit: 10 + selector: + matchLabels: + app: {{ .Values.app.fullName }} + strategy: + rollingUpdate: + maxSurge: 25% + maxUnavailable: 25% + type: RollingUpdate + template: + metadata: + labels: + app: {{ .Values.app.fullName }} + spec: + imagePullSecrets: + - name: {{ .Values.images.pullSecret }} + containers: + - name: {{ .Values.app.fullName }} + env: + - name: TZ + value: Europe/Moscow + - name: PORT + value: {{ .Values.app.server.port | quote }} + - name: CONNECTION_STRING + value: {{ .Values.app.db.connection_string }} + {{- .Values.envs | toYaml | nindent 12 }} + + image: {{ .Values.app.image }}:{{ .Chart.AppVersion }} + imagePullPolicy: Always + ports: + - name: http + containerPort: {{ .Values.app.server.port }} + protocol: TCP \ No newline at end of file diff --git a/deploy/templates/hpa.yaml b/deploy/templates/hpa.yaml new file mode 100644 index 0000000..cc40f06 --- /dev/null +++ b/deploy/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include ".Values.app.fullName" . }} + labels: + app: {{ include ".Values.app.fullName" . }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include ".Values.app.fullName" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/deploy/templates/ingress.yaml b/deploy/templates/ingress.yaml new file mode 100644 index 0000000..516515e --- /dev/null +++ b/deploy/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include ".Values.app.fullName" . -}} +{{- $svcPort := .Values.app.server.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: + app: {{ $fullName }} + {{- 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/deploy/templates/service.yaml b/deploy/templates/service.yaml new file mode 100644 index 0000000..eff85e3 --- /dev/null +++ b/deploy/templates/service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ .Values.app.fullName }} + namespace: default +spec: + ports: + - port: {{ .Values.app.server.port }} + protocol: TCP + targetPort: {{ .Values.app.server.port }} + selector: + app: {{ .Values.app.fullName }} + sessionAffinity: None + type: ClusterIP +status: + loadBalancer: {} \ No newline at end of file diff --git a/deploy/values.template.yaml b/deploy/values.template.yaml new file mode 100644 index 0000000..aee6d6b --- /dev/null +++ b/deploy/values.template.yaml @@ -0,0 +1,18 @@ +app: + fullName: ${CI_PROJECT_TITLE} + image: docker-registry.dopcore.com/${CI_PROJECT_PATH} + db: + connection_string: ${CONNECTION_STRING} + server: + port: ${SERVICE_PORT} + +replicas: ${SERVICE_REPLICAS} + +images: + pullSecret: regcred + +ingress: + enabled: false + +autoscaling: + enabled: false diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..536d64e --- /dev/null +++ b/requirements.txt @@ -0,0 +1,37 @@ +alembic==1.10.4 +anyio==3.6.2 +certifi==2022.12.7 +click==8.1.3 +colorama==0.4.6 +exceptiongroup==1.1.1 +fastapi==0.95.1 +greenlet==2.0.2 +h11==0.14.0 +h2==4.1.0 +hpack==4.0.0 +httpcore==0.17.0 +httpx==0.24.0 +hyperframe==6.0.1 +idna==3.4 +importlib-metadata==6.6.0 +importlib-resources==5.12.0 +iniconfig==2.0.0 +Mako==1.2.4 +MarkupSafe==2.1.2 +packaging==23.1 +pip==23.1.2 +pluggy==1.0.0 +psycopg2==2.9.3 +psycopg2-binary==2.9.3 +pydantic==1.10.7 +pytest==7.3.1 +python-dotenv==1.0.0 +setuptools==67.7.2 +sniffio==1.3.0 +SQLAlchemy==2.0.11 +starlette==0.26.1 +tomli==2.0.1 +typing_extensions==4.5.0 +uvicorn==0.22.0 +wheel==0.40.0 +zipp==3.15.0