Merge pull request #2 from MrMatAP/feature/container

Containerisation

Author: MrMatAP

.idea/dataSources.xml

@@ -5,9 +5,12 @@
 GIT_SHA := $(shell git rev-parse --short HEAD)
 VERSION ?= 0.0.0-dev0.${GIT_SHA}
 PYTHON_VERSION := $(shell echo "${VERSION}" | sed -e 's/-dev0\./-dev0+/')
+WHEEL_VERSION := $(shell echo "${VERSION}" | sed -e 's/-dev0\./.dev0+/')
+
+ROOT_PATH := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
 PYTHON_SOURCES := $(shell find src/mrmat_python_api_fastapi -name '*.py')
-PYTHON_TARGET := dist/mrmat_python_api_fastapi-${PYTHON_VERSION}-py3-none-any.whl
+PYTHON_TARGET := dist/mrmat_python_api_fastapi-${WHEEL_VERSION}-py3-none-any.whl
 CONTAINER_SOURCES := $(shell find var/container)
 HELM_SOURCES := $(shell find var/helm)
 HELM_TARGET := dist/mrmat-python-api-fastapi-$(VERSION).tgz
@@ -31,16 +34,22 @@ container: $(PYTHON_TARGET) $(CONTAINER_SOURCES)
 		-f var/container/Dockerfile \
 		-t localhost:5001/mrmat-python-api-fastapi:$(VERSION) \
 		--build-arg MRMAT_VERSION=$(VERSION) \
-		.
+		--build-arg WHEEL=$(PYTHON_TARGET) \
+		$(ROOT_PATH)
 	docker push localhost:5001/mrmat-python-api-fastapi:$(VERSION)
 
 helm-install: $(HELM_TARGET)
+	kubectl create ns mpafastapi || true
+	kubectl label --overwrite ns mpafastapi istio-injection=true
 	helm upgrade \
 		mrmat-python-api-fastapi \
 		${HELM_TARGET} \
 		--install \
-		--create-namespace \
-		--namespace mrmat-python-api-fastapi
+		--force \
+		--namespace mpafastapi
+
+helm-uninstall:
+	helm delete -n mpafastapi mrmat-python-api-fastapi
 
 clean:
 	rm -rf build dist

.idea/misc.xml

@@ -3,5 +3,5 @@
 [![Build](https://github.com/MrMatOrg/mrmat-python-api-fastapi/actions/workflows/build.yml/badge.svg)](https://github.com/MrMatOrg/mrmat-python-api-fastapi/actions/workflows/build.yml)
 
 
-Boilerplate (and playground) for a code-first Python FastAPI API, with all the bells and whistles we've come to expect
+Boilerplate (and playground) for a code-first Python FastAPI API, with all the bells and whistles we've come to expect.
 

.idea/mrmat-python-api-fastapi.iml

@@ -1,7 +1,32 @@
 #
 # Runtime requirements
 
-fastapi==0.115.11            # MIT
-sqlalchemy[asyncio]==2.0.40  # MIT
-uvicorn==0.34.0              # BSD 3-Clause
-pydantic==2.10.6             # MIT
+fastapi==0.115.11                               # MIT
+sqlalchemy[asyncio]==2.0.40                     # MIT
+uvicorn==0.34.0                                 # BSD 3-Clause
+pydantic==2.10.6                                # MIT
+psycopg2-binary==2.9.10                         # LGPL with exceptions
+
+prometheus-fastapi-instrumentator==7.1.0        # ISC
+
+# For zero-code-instrumentation
+# Check the requirements by using opentelemetry-bootstrap -a requirements
+opentelemetry-distro                            # Apache 2.0
+opentelemetry-exporter-otlp
+opentelemetry-instrumentation-asyncio==0.53b1
+opentelemetry-instrumentation-dbapi==0.53b1
+opentelemetry-instrumentation-logging==0.53b1
+opentelemetry-instrumentation-sqlite3==0.53b1
+opentelemetry-instrumentation-threading==0.53b1
+opentelemetry-instrumentation-urllib==0.53b1
+opentelemetry-instrumentation-wsgi==0.53b1
+opentelemetry-instrumentation-asgi==0.53b1
+opentelemetry-instrumentation-click==0.53b1
+opentelemetry-instrumentation-fastapi==0.53b1
+opentelemetry-instrumentation-grpc==0.53b1
+opentelemetry-instrumentation-httpx==0.53b1
+opentelemetry-instrumentation-requests==0.53b1
+opentelemetry-instrumentation-sqlalchemy==0.53b1
+opentelemetry-instrumentation-starlette==0.53b1
+opentelemetry-instrumentation-tortoiseorm==0.53b1
+opentelemetry-instrumentation-urllib3==0.53b1

.idea/runConfigurations/run.xml

@@ -19,10 +19,11 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 #  SOFTWARE.
+
 from pydantic import BaseModel
 
 from .config import Config
-app_config = Config.from_json_file()
+app_config = Config.from_context()
 from sqlalchemy.orm import DeclarativeBase
 
 class ORMBase(DeclarativeBase):

Makefile

@@ -26,6 +26,7 @@
 
 from typing import Optional
 from fastapi import APIRouter
+
 from mrmat_python_api_fastapi.apis.greeting.v2 import GreetingV2Output
 
 router = APIRouter()

README.md

@@ -21,6 +21,7 @@
 #  SOFTWARE.
 
 from fastapi import APIRouter
+
 from mrmat_python_api_fastapi.apis.greeting.v3 import GreetingV3Output
 
 router = APIRouter()