From 9e3aff2e2a88f7b95b4c785a1af6084c09621d53 Mon Sep 17 00:00:00 2001 From: Santo Cariotti Date: Wed, 18 Sep 2024 11:20:04 +0200 Subject: Reorganize files in folders --- yaml/cas-config.yaml | 8 ------- yaml/cas-deployment.yaml | 52 ------------------------------------------ yaml/cas-secret.yaml | 9 -------- yaml/cas-service.yaml | 13 ----------- yaml/configs/cas.yaml | 8 +++++++ yaml/deployments/cas.yaml | 52 ++++++++++++++++++++++++++++++++++++++++++ yaml/deployments/postgres.yaml | 38 ++++++++++++++++++++++++++++++ yaml/network-policy.yaml | 18 --------------- yaml/pgdata-pvc.yaml | 10 -------- yaml/policies/network.yaml | 18 +++++++++++++++ yaml/postgres-deployment.yaml | 38 ------------------------------ yaml/postgres-service.yaml | 11 --------- yaml/pvcs/pgdata.yaml | 10 ++++++++ yaml/secrets/cas.yaml | 9 ++++++++ yaml/services/cas.yaml | 13 +++++++++++ yaml/services/postgres.yaml | 11 +++++++++ 16 files changed, 159 insertions(+), 159 deletions(-) delete mode 100644 yaml/cas-config.yaml delete mode 100644 yaml/cas-deployment.yaml delete mode 100644 yaml/cas-secret.yaml delete mode 100644 yaml/cas-service.yaml create mode 100644 yaml/configs/cas.yaml create mode 100644 yaml/deployments/cas.yaml create mode 100644 yaml/deployments/postgres.yaml delete mode 100644 yaml/network-policy.yaml delete mode 100644 yaml/pgdata-pvc.yaml create mode 100644 yaml/policies/network.yaml delete mode 100644 yaml/postgres-deployment.yaml delete mode 100644 yaml/postgres-service.yaml create mode 100644 yaml/pvcs/pgdata.yaml create mode 100644 yaml/secrets/cas.yaml create mode 100644 yaml/services/cas.yaml create mode 100644 yaml/services/postgres.yaml (limited to 'yaml') diff --git a/yaml/cas-config.yaml b/yaml/cas-config.yaml deleted file mode 100644 index a7aa9d8..0000000 --- a/yaml/cas-config.yaml +++ /dev/null @@ -1,8 +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" diff --git a/yaml/cas-deployment.yaml b/yaml/cas-deployment.yaml deleted file mode 100644 index fc0289a..0000000 --- a/yaml/cas-deployment.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cas-deployment -spec: - replicas: 1 - selector: - matchLabels: - app: cas - template: - metadata: - labels: - app: cas - spec: - 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 - ports: - - containerPort: 8000 - restartPolicy: Always diff --git a/yaml/cas-secret.yaml b/yaml/cas-secret.yaml deleted file mode 100644 index a2fc3e3..0000000 --- a/yaml/cas-secret.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/cas-service.yaml b/yaml/cas-service.yaml deleted file mode 100644 index ff1d8c5..0000000 --- a/yaml/cas-service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: cas-service -spec: - ports: - - port: 8000 - targetPort: 8000 - name: http - protocol: TCP - selector: - app: cas - type: ClusterIP diff --git a/yaml/configs/cas.yaml b/yaml/configs/cas.yaml new file mode 100644 index 0000000..a7aa9d8 --- /dev/null +++ b/yaml/configs/cas.yaml @@ -0,0 +1,8 @@ +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" diff --git a/yaml/deployments/cas.yaml b/yaml/deployments/cas.yaml new file mode 100644 index 0000000..fc0289a --- /dev/null +++ b/yaml/deployments/cas.yaml @@ -0,0 +1,52 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cas-deployment +spec: + replicas: 1 + selector: + matchLabels: + app: cas + template: + metadata: + labels: + app: cas + spec: + 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 + ports: + - containerPort: 8000 + restartPolicy: Always diff --git a/yaml/deployments/postgres.yaml b/yaml/deployments/postgres.yaml new file mode 100644 index 0000000..fd9945f --- /dev/null +++ b/yaml/deployments/postgres.yaml @@ -0,0 +1,38 @@ +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/network-policy.yaml b/yaml/network-policy.yaml deleted file mode 100644 index 2af8a27..0000000 --- a/yaml/network-policy.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/pgdata-pvc.yaml b/yaml/pgdata-pvc.yaml deleted file mode 100644 index 7580530..0000000 --- a/yaml/pgdata-pvc.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/policies/network.yaml b/yaml/policies/network.yaml new file mode 100644 index 0000000..2af8a27 --- /dev/null +++ b/yaml/policies/network.yaml @@ -0,0 +1,18 @@ +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-deployment.yaml b/yaml/postgres-deployment.yaml deleted file mode 100644 index fd9945f..0000000 --- a/yaml/postgres-deployment.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/postgres-service.yaml b/yaml/postgres-service.yaml deleted file mode 100644 index ad3b969..0000000 --- a/yaml/postgres-service.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 diff --git a/yaml/pvcs/pgdata.yaml b/yaml/pvcs/pgdata.yaml new file mode 100644 index 0000000..7580530 --- /dev/null +++ b/yaml/pvcs/pgdata.yaml @@ -0,0 +1,10 @@ +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 new file mode 100644 index 0000000..a2fc3e3 --- /dev/null +++ b/yaml/secrets/cas.yaml @@ -0,0 +1,9 @@ +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 new file mode 100644 index 0000000..ff1d8c5 --- /dev/null +++ b/yaml/services/cas.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: Service +metadata: + name: cas-service +spec: + ports: + - port: 8000 + targetPort: 8000 + name: http + protocol: TCP + selector: + app: cas + type: ClusterIP diff --git a/yaml/services/postgres.yaml b/yaml/services/postgres.yaml new file mode 100644 index 0000000..ad3b969 --- /dev/null +++ b/yaml/services/postgres.yaml @@ -0,0 +1,11 @@ +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