From 6cfd0194f65d7730fedcf4ac100f0c3aa28ad06d Mon Sep 17 00:00:00 2001 From: Santo Cariotti Date: Fri, 17 Jan 2025 11:41:55 +0100 Subject: Use only three files --- yaml/backend.yaml | 143 ++++++++++++++++++++++++++++++++++ yaml/cluster/kind-cluster-config.yaml | 8 -- yaml/configs/cas.yaml | 9 --- yaml/configs/frontend.yaml | 6 -- yaml/deployments/cas.yaml | 73 ----------------- yaml/deployments/frontend.yaml | 28 ------- yaml/deployments/postgres.yaml | 38 --------- yaml/frontend.yaml | 47 +++++++++++ yaml/kind-cluster.yaml | 8 ++ yaml/networking/balance.yaml | 37 --------- yaml/policies/network.yaml | 18 ----- yaml/postgres.yaml | 80 +++++++++++++++++++ yaml/pvcs/pgdata.yaml | 10 --- yaml/secrets/cas.yaml | 9 --- yaml/services/cas.yaml | 11 --- yaml/services/frontend.yaml | 11 --- yaml/services/postgres.yaml | 11 --- 17 files changed, 278 insertions(+), 269 deletions(-) create mode 100644 yaml/backend.yaml delete mode 100644 yaml/cluster/kind-cluster-config.yaml delete mode 100644 yaml/configs/cas.yaml delete mode 100644 yaml/configs/frontend.yaml delete mode 100644 yaml/deployments/cas.yaml delete mode 100644 yaml/deployments/frontend.yaml delete mode 100644 yaml/deployments/postgres.yaml create mode 100644 yaml/frontend.yaml create mode 100644 yaml/kind-cluster.yaml delete mode 100644 yaml/networking/balance.yaml delete mode 100644 yaml/policies/network.yaml create mode 100644 yaml/postgres.yaml delete mode 100644 yaml/pvcs/pgdata.yaml delete mode 100644 yaml/secrets/cas.yaml delete mode 100644 yaml/services/cas.yaml delete mode 100644 yaml/services/frontend.yaml delete mode 100644 yaml/services/postgres.yaml (limited to 'yaml') diff --git a/yaml/backend.yaml b/yaml/backend.yaml new file mode 100644 index 0000000..d157a07 --- /dev/null +++ b/yaml/backend.yaml @@ -0,0 +1,143 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: cas-backend-config +data: + RUST_LOG: ${RUST_LOG} + DATABASE_URL: "postgres://postgres:password@postgres-service:5432/gis" + ALLOWED_HOST: "0.0.0.0:8000" + AUDIO_PATH: "./assets" +--- +apiVersion: v1 +kind: Secret +metadata: + name: cas-backend-secret +type: Opaque +data: + JWT_SECRET: ${JWT_SECRET} + EXPO_ACCESS_TOKEN: ${EXPO_ACCESS_TOKEN} + UNREALSPEECH_TOKEN: ${UNREALSPEECH_TOKEN} +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cas-backend-deployment + labels: + app: cas-backend +spec: + replicas: 2 + selector: + matchLabels: + app: cas-backend + template: + metadata: + labels: + app: cas-backend + spec: + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchLabels: + app: cas-backend + topologyKey: "kubernetes.io/hostname" + resources: + requests: + cpu: "200m" + memory: "500Mi" + limits: + cpu: "500m" + memory: "1Gi" + containers: + - name: cas + image: ghcr.io/cas-4/backend:latest + imagePullPolicy: Always + env: + - name: RUST_LOG + valueFrom: + configMapKeyRef: + name: cas-backend-config + key: RUST_LOG + - name: DATABASE_URL + valueFrom: + configMapKeyRef: + name: cas-backend-config + key: DATABASE_URL + - name: JWT_SECRET + valueFrom: + secretKeyRef: + name: cas-secret + key: JWT_SECRET + - name: EXPO_ACCESS_TOKEN + valueFrom: + secretKeyRef: + name: cas-secret + key: EXPO_ACCESS_TOKEN + - name: UNREALSPEECH_TOKEN + valueFrom: + secretKeyRef: + name: cas-secret + key: UNREALSPEECH_TOKEN + - name: ALLOWED_HOST + valueFrom: + configMapKeyRef: + name: cas-backend-config + key: ALLOWED_HOST + - name: AUDIO_PATH + valueFrom: + configMapKeyRef: + name: cas-backend-config + key: AUDIO_PATH + ports: + - containerPort: 8000 + restartPolicy: Always +--- +apiVersion: v1 +kind: Service +metadata: + name: cas-backend-service +spec: + ports: + - port: 80 + targetPort: 8000 + selector: + app: cas-backend + type: LoadBalancer +--- +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: cas-backend-hpa +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: cas-backend-deployment + minReplicas: 1 + maxReplicas: 10 + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: 70 + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: 70 + behavior: + scaleUp: + stabilizationWindowSeconds: 60 + policies: + - type: Percent + value: 100 + periodSeconds: 15 + scaleDown: + stabilizationWindowSeconds: 300 + policies: + - type: Percent + value: 100 + periodSeconds: 15 diff --git a/yaml/cluster/kind-cluster-config.yaml b/yaml/cluster/kind-cluster-config.yaml deleted file mode 100644 index 6f0e32d..0000000 --- a/yaml/cluster/kind-cluster-config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -kind: Cluster -apiVersion: kind.x-k8s.io/v1alpha4 -nodes: -- role: control-plane -- role: worker -- role: worker -- role: worker -- role: worker diff --git a/yaml/configs/cas.yaml b/yaml/configs/cas.yaml deleted file mode 100644 index 34d5d58..0000000 --- a/yaml/configs/cas.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: cas-config -data: - RUST_LOG: ${RUST_LOG} - DATABASE_URL: "postgres://postgres:password@postgres-service:5432/gis" - ALLOWED_HOST: "0.0.0.0:8000" - AUDIO_PATH: "./assets" diff --git a/yaml/configs/frontend.yaml b/yaml/configs/frontend.yaml deleted file mode 100644 index f80a790..0000000 --- a/yaml/configs/frontend.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: frontend-config -data: - VITE_API_URL: ${VITE_API_URL} diff --git a/yaml/deployments/cas.yaml b/yaml/deployments/cas.yaml deleted file mode 100644 index 1b106ad..0000000 --- a/yaml/deployments/cas.yaml +++ /dev/null @@ -1,73 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cas-deployment - labels: - app: cas-app -spec: - replicas: 2 - selector: - matchLabels: - app: cas-app - template: - metadata: - labels: - app: cas-app - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - app: cas-app - topologyKey: "kubernetes.io/hostname" - resources: - requests: - cpu: "200m" - memory: "500Mi" - limits: - cpu: "500m" - memory: "1Gi" - containers: - - name: cas - image: ghcr.io/cas-4/backend:latest - imagePullPolicy: Always - env: - - name: RUST_LOG - valueFrom: - configMapKeyRef: - name: cas-config - key: RUST_LOG - - name: DATABASE_URL - valueFrom: - configMapKeyRef: - name: cas-config - key: DATABASE_URL - - name: JWT_SECRET - valueFrom: - secretKeyRef: - name: cas-secret - key: JWT_SECRET - - name: EXPO_ACCESS_TOKEN - valueFrom: - secretKeyRef: - name: cas-secret - key: EXPO_ACCESS_TOKEN - - name: UNREALSPEECH_TOKEN - valueFrom: - secretKeyRef: - name: cas-secret - key: UNREALSPEECH_TOKEN - - name: ALLOWED_HOST - valueFrom: - configMapKeyRef: - name: cas-config - key: ALLOWED_HOST - - name: AUDIO_PATH - valueFrom: - configMapKeyRef: - name: cas-config - key: AUDIO_PATH - ports: - - containerPort: 8000 - restartPolicy: Always diff --git a/yaml/deployments/frontend.yaml b/yaml/deployments/frontend.yaml deleted file mode 100644 index 781bf87..0000000 --- a/yaml/deployments/frontend.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: frontend-deployment - labels: - app: frontend-app -spec: - selector: - matchLabels: - app: frontend-app - template: - metadata: - labels: - app: frontend-app - spec: - containers: - - name: frontend - image: ghcr.io/cas-4/frontend:latest - imagePullPolicy: Always - ports: - - containerPort: 80 - env: - - name: VITE_API_URL - valueFrom: - configMapKeyRef: - name: frontend-config - key: VITE_API_URL - restartPolicy: Always diff --git a/yaml/deployments/postgres.yaml b/yaml/deployments/postgres.yaml deleted file mode 100644 index fd9945f..0000000 --- a/yaml/deployments/postgres.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: postgres-deployment -spec: - replicas: 1 - selector: - matchLabels: - app: postgres - template: - metadata: - labels: - app: postgres - spec: - containers: - - name: postgres - image: postgis/postgis:16-3.4 - env: - - name: POSTGRES_USER - value: "postgres" - - name: POSTGRES_PASSWORD - value: "password" - - name: POSTGRES_DB - value: "gis" - ports: - - containerPort: 5432 - volumeMounts: - - mountPath: /var/lib/postgresql/data - name: pgdata - - mountPath: /docker-entrypoint-initdb.d - name: schema - volumes: - - name: pgdata - persistentVolumeClaim: - claimName: pgdata-pvc - - name: schema - hostPath: - path: ${PGDATA} diff --git a/yaml/frontend.yaml b/yaml/frontend.yaml new file mode 100644 index 0000000..94766a8 --- /dev/null +++ b/yaml/frontend.yaml @@ -0,0 +1,47 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: cas-frontend-config +data: + VITE_API_URL: ${VITE_API_URL} +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cas-frontend-deployment + labels: + app: cas-frontend-app +spec: + selector: + matchLabels: + app: cas-frontend-app + template: + metadata: + labels: + app: cas-frontend-app + spec: + containers: + - name: frontend + image: ghcr.io/cas-4/frontend:latest + imagePullPolicy: Always + ports: + - containerPort: 80 + env: + - name: VITE_API_URL + valueFrom: + configMapKeyRef: + name: cas-frontend-config + key: VITE_API_URL + restartPolicy: Always +--- +apiVersion: v1 +kind: Service +metadata: + name: cas-frontend-service +spec: + ports: + - port: 80 + targetPort: 80 + selector: + app: cas-frontend-app + type: ClusterIP diff --git a/yaml/kind-cluster.yaml b/yaml/kind-cluster.yaml new file mode 100644 index 0000000..6f0e32d --- /dev/null +++ b/yaml/kind-cluster.yaml @@ -0,0 +1,8 @@ +kind: Cluster +apiVersion: kind.x-k8s.io/v1alpha4 +nodes: +- role: control-plane +- role: worker +- role: worker +- role: worker +- role: worker diff --git a/yaml/networking/balance.yaml b/yaml/networking/balance.yaml deleted file mode 100644 index a2367e7..0000000 --- a/yaml/networking/balance.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: cas-hpa -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: cas-deployment - minReplicas: 1 - maxReplicas: 10 - metrics: - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: 70 - - type: Resource - resource: - name: memory - target: - type: Utilization - averageUtilization: 70 - behavior: - scaleUp: - stabilizationWindowSeconds: 60 - policies: - - type: Percent - value: 100 - periodSeconds: 15 - scaleDown: - stabilizationWindowSeconds: 300 - policies: - - type: Percent - value: 100 - periodSeconds: 15 diff --git a/yaml/policies/network.yaml b/yaml/policies/network.yaml deleted file mode 100644 index 2af8a27..0000000 --- a/yaml/policies/network.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: allow-cas-postgres -spec: - podSelector: - matchLabels: - app: cas - policyTypes: - - Ingress - ingress: - - from: - - podSelector: - matchLabels: - app: postgres - ports: - - protocol: TCP - port: 5432 diff --git a/yaml/postgres.yaml b/yaml/postgres.yaml new file mode 100644 index 0000000..1306581 --- /dev/null +++ b/yaml/postgres.yaml @@ -0,0 +1,80 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: postgres-deployment +spec: + replicas: 1 + selector: + matchLabels: + app: postgres + template: + metadata: + labels: + app: postgres + spec: + containers: + - name: postgres + image: postgis/postgis:16-3.4 + env: + - name: POSTGRES_USER + value: "postgres" + - name: POSTGRES_PASSWORD + value: "password" + - name: POSTGRES_DB + value: "gis" + ports: + - containerPort: 5432 + volumeMounts: + - mountPath: /var/lib/postgresql/data + name: pgdata + - mountPath: /docker-entrypoint-initdb.d + name: schema + volumes: + - name: pgdata + persistentVolumeClaim: + claimName: pgdata-pvc + - name: schema + hostPath: + path: ${PGDATA} +--- +apiVersion: v1 +kind: Service +metadata: + name: postgres-service +spec: + ports: + - port: 5432 + targetPort: 5432 + selector: + app: postgres + type: ClusterIP +--- +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: allow-cas-postgres +spec: + podSelector: + matchLabels: + app: cas + policyTypes: + - Ingress + ingress: + - from: + - podSelector: + matchLabels: + app: postgres + ports: + - protocol: TCP + port: 5432 +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: pgdata-pvc +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 1Gi diff --git a/yaml/pvcs/pgdata.yaml b/yaml/pvcs/pgdata.yaml deleted file mode 100644 index 7580530..0000000 --- a/yaml/pvcs/pgdata.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: pgdata-pvc -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi diff --git a/yaml/secrets/cas.yaml b/yaml/secrets/cas.yaml deleted file mode 100644 index a2fc3e3..0000000 --- a/yaml/secrets/cas.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: cas-secret -type: Opaque -data: - JWT_SECRET: ${JWT_SECRET} - EXPO_ACCESS_TOKEN: ${EXPO_ACCESS_TOKEN} - UNREALSPEECH_TOKEN: ${UNREALSPEECH_TOKEN} diff --git a/yaml/services/cas.yaml b/yaml/services/cas.yaml deleted file mode 100644 index 0942e33..0000000 --- a/yaml/services/cas.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: cas-service -spec: - ports: - - port: 80 - targetPort: 8000 - selector: - app: cas-app - type: LoadBalancer diff --git a/yaml/services/frontend.yaml b/yaml/services/frontend.yaml deleted file mode 100644 index f5580ae..0000000 --- a/yaml/services/frontend.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: frontend-service -spec: - ports: - - port: 80 - targetPort: 80 - selector: - app: frontend-app - type: ClusterIP diff --git a/yaml/services/postgres.yaml b/yaml/services/postgres.yaml deleted file mode 100644 index ad3b969..0000000 --- a/yaml/services/postgres.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: postgres-service -spec: - ports: - - port: 5432 - targetPort: 5432 - selector: - app: postgres - type: ClusterIP -- cgit v1.2.3-18-g5258