commit b987d8918294287121e7fac776ad0dee5871e4a3 Author: stephen schuresko Date: Sun Feb 16 16:12:58 2025 -0500 try1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..597be97 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +__pycache__ +test.db diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..6c62ee3 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,16 @@ + +FROM python:3.12 + + +WORKDIR /code + + +COPY ./requirements.txt /code/requirements.txt + + +RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt + + +COPY ./papi.py /code/ + +CMD ["python3", "papi.py", "--port", "8912"] \ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..8f2d93b --- /dev/null +++ b/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash +REG=192.168.1.134:5000 +NS=papi +IMG=svc1 +TAG=dev +DIMG=${REG}/${NS}/${IMG}:${TAG} +docker build -f Dockerfile -t ${DIMG} . + +docker push ${DIMG} \ No newline at end of file diff --git a/papi-helm/.helmignore b/papi-helm/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/papi-helm/.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/papi-helm/Chart.yaml b/papi-helm/Chart.yaml new file mode 100644 index 0000000..eed94f6 --- /dev/null +++ b/papi-helm/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: papi +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: "1.16.0" diff --git a/papi-helm/templates/NOTES.txt b/papi-helm/templates/NOTES.txt new file mode 100644 index 0000000..d1ed3af --- /dev/null +++ b/papi-helm/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 "papi.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 its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "papi.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "papi.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 "papi.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/papi-helm/templates/_helpers.tpl b/papi-helm/templates/_helpers.tpl new file mode 100644 index 0000000..18f9704 --- /dev/null +++ b/papi-helm/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "papi.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 "papi.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 "papi.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "papi.labels" -}} +helm.sh/chart: {{ include "papi.chart" . }} +{{ include "papi.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "papi.selectorLabels" -}} +app.kubernetes.io/name: {{ include "papi.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "papi.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "papi.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/papi-helm/templates/deployment.yaml b/papi-helm/templates/deployment.yaml new file mode 100644 index 0000000..e56ee06 --- /dev/null +++ b/papi-helm/templates/deployment.yaml @@ -0,0 +1,78 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "papi.fullname" . }} + labels: + {{- include "papi.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "papi.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "papi.labels" . | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "papi.serviceAccountName" . }} + {{- with .Values.podSecurityContext }} + securityContext: + {{- toYaml . | nindent 8 }} + {{- end }} + containers: + - name: {{ .Chart.Name }} + {{- with .Values.securityContext }} + securityContext: + {{- toYaml . | nindent 12 }} + {{- end }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: {{ .Values.service.port }} + protocol: TCP + {{- with .Values.livenessProbe }} + livenessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.readinessProbe }} + readinessProbe: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.resources }} + resources: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- 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/papi-helm/templates/hpa.yaml b/papi-helm/templates/hpa.yaml new file mode 100644 index 0000000..20bccf1 --- /dev/null +++ b/papi-helm/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "papi.fullname" . }} + labels: + {{- include "papi.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "papi.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/papi-helm/templates/ingress.yaml b/papi-helm/templates/ingress.yaml new file mode 100644 index 0000000..e210f5b --- /dev/null +++ b/papi-helm/templates/ingress.yaml @@ -0,0 +1,43 @@ +{{- if .Values.ingress.enabled -}} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ include "papi.fullname" . }} + labels: + {{- include "papi.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- with .Values.ingress.className }} + ingressClassName: {{ . }} + {{- 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 }} + {{- with .pathType }} + pathType: {{ . }} + {{- end }} + backend: + service: + name: {{ include "papi.fullname" $ }} + port: + number: {{ $.Values.service.port }} + {{- end }} + {{- end }} +{{- end }} diff --git a/papi-helm/templates/service.yaml b/papi-helm/templates/service.yaml new file mode 100644 index 0000000..b1b2ef5 --- /dev/null +++ b/papi-helm/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "papi.fullname" . }} + labels: + {{- include "papi.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "papi.selectorLabels" . | nindent 4 }} diff --git a/papi-helm/templates/serviceaccount.yaml b/papi-helm/templates/serviceaccount.yaml new file mode 100644 index 0000000..b9aa14d --- /dev/null +++ b/papi-helm/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "papi.serviceAccountName" . }} + labels: + {{- include "papi.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +automountServiceAccountToken: {{ .Values.serviceAccount.automount }} +{{- end }} diff --git a/papi-helm/templates/tests/test-connection.yaml b/papi-helm/templates/tests/test-connection.yaml new file mode 100644 index 0000000..8095671 --- /dev/null +++ b/papi-helm/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "papi.fullname" . }}-test-connection" + labels: + {{- include "papi.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "papi.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/papi-helm/values.yaml b/papi-helm/values.yaml new file mode 100644 index 0000000..4213baf --- /dev/null +++ b/papi-helm/values.yaml @@ -0,0 +1,128 @@ +# Default values for papi. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/ +replicaCount: 1 + +# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/ +image: + repository: kube-reg.fairfaxmedia.net/papi/svc1 + # This sets the pull policy for images. + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "dev" + +# This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ +imagePullSecrets: [] +# This is to override the chart name. +nameOverride: "" +fullnameOverride: "" + +# This section builds out the service account more information can be found here: https://kubernetes.io/docs/concepts/security/service-accounts/ +serviceAccount: + # Specifies whether a service account should be created + create: true + # Automatically mount a ServiceAccount's API credentials? + automount: true + # 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: "" + +# This is for setting Kubernetes Annotations to a Pod. +# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ +podAnnotations: {} +# This is for setting Kubernetes Labels to a Pod. +# For more information checkout: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ +podLabels: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +# This is for setting up a service more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/ +service: + # This sets the service type more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types + type: NodePort + # This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports + port: 8912 + +# This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/ +ingress: + enabled: true + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: papi.fairfaxmedia.net + paths: + - path: / + pathType: ImplementationSpecific + + - host: papi.kube-dev.fairfaxmedia.net + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +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: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +# This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ +livenessProbe: + httpGet: + path: / + port: http +readinessProbe: + httpGet: + path: / + port: http + +# This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/ +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: [] +# - name: foo +# secret: +# secretName: mysecret +# optional: false + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: [] +# - name: foo +# mountPath: "/etc/foo" +# readOnly: true + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/papi.py b/papi.py new file mode 100644 index 0000000..bda569c --- /dev/null +++ b/papi.py @@ -0,0 +1,112 @@ +#!/bin/env python3 +from fastapi import FastAPI, Depends +import uvicorn +from sqlalchemy import create_engine, Column, Integer,String, ForeignKey +from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.engine import URL +from sqlalchemy.orm import sessionmaker, Session + + + +# Database setup +DATABASE_URL = "sqlite:///./test.db" +engine = create_engine(DATABASE_URL) +SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) +Base = declarative_base() + + +def get_db(): + db = SessionLocal() + try: + yield db + finally: + db.close() + + +class User(Base): + __tablename__ = "users" + id = Column(Integer, primary_key=True, index=True) + name = Column(String, index=True) + email = Column(String, unique=True, index=True) + password = Column(String) + +class Post(Base): + __tablename__ = "posts" + id = Column(Integer, primary_key=True, index=True) + title = Column(String) + content = Column(String) + author_id = Column(Integer, ForeignKey("users.id")) + + + +Base.metadata.create_all(bind=engine) +app = FastAPI() + + +@app.get("/") +async def root(): + return {"message": "Hello World"} + +@app.get("/users") +async def get_users(db: Session = Depends(get_db)): + return db.query(User).all() + #return [{"id":"asdf1234"}] +@app.get("/users/{id}") +async def get_user(id: str): + return {"id": id} + +@app.post("/users") +async def create_user(user: dict,db: Session = Depends(get_db)): + #db_user = User(name=user["name"], email=user["email"], password=user["password"]) + db_user = User(**user) + db.add(db_user) + db.commit() + db.refresh(db_user) + return {"message":"User created successfully","user":db_user} + +@app.get("/posts") +async def get_posts(db: Session = Depends(get_db)): + return db.query(Post).all() + +@app.get("/posts/{id}") +async def get_post(id: str,db: Session = Depends(get_db)): + return db.query(Post).filter(Post.id == id).first() + +@app.post("/posts") +async def create_post(post: dict,db: Session = Depends(get_db)): + db_post = Post(**post) + db.add(db_post) + db.commit() + db.refresh(db_post) + return {"message":"Post created successfully","post":db_post} + + +@app.put("/posts/{id}") +async def update_post(id: str, post: dict,db: Session = Depends(get_db)): + db_post = db.query(Post).filter(Post.id == id).first() + if "title" in post: + db_post.title = post["title"] + if "content" in post: + db_post.content = post["content"] + db.commit() + db.refresh(db_post) + return {"message":"Post updated successfully","post":db_post} + +@app.delete("/posts/{id}",db: Session = Depends(get_db)) +async def delete_post(id: str, post: dict): + db_post = db.query(Post).filter(Post.id == id).first() + db.delete(db_post) + db.commit() + return {"message":"Post deleted successfully","post":db_post} + + +@app.get("/hello/{name}") +async def say_hello(name: str): + return {"message": f"Hello {name}"} + + + +if __name__ == "__main__": + uvicorn.run("papi:app", host="0.0.0.0", port=8912, reload=True, log_level="debug", + workers=5, limit_concurrency=10, limit_max_requests=100) + diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..c1040e6 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +fastapi +sqlalchemy +uvicorn