From c2895f31e7d71e940d5f8adab99131706680a0bf Mon Sep 17 00:00:00 2001 From: Celestino Rey Date: Tue, 1 Oct 2024 16:02:29 +0200 Subject: [PATCH] Preparado para k8s --- JugarAlPadel/K8S/Makefile | 14 ++-- JugarAlPadel/K8S/db-deployment.yaml | 2 +- JugarAlPadel/K8S/db-service.yaml | 2 +- JugarAlPadel/K8S/entra.sh | 2 +- JugarAlPadel/K8S/entraPsql.sh | 2 +- JugarAlPadel/K8S/env-prod-configmap.yaml | 6 +- JugarAlPadel/K8S/env-prod-db-configmap.yaml | 11 --- JugarAlPadel/K8S/jugaralpadel-deployment.yaml | 64 ++++++++--------- ...garalpadel-prod-persistentvolumeclaim.yaml | 30 ++++---- JugarAlPadel/K8S/namespace.yaml | 2 +- JugarAlPadel/K8S/nginx-deployment.yaml | 14 ++-- JugarAlPadel/K8S/nginx-service.yaml | 4 +- .../postgres-data-persistentvolumeclaim.yaml | 2 +- JugarAlPadel/K8S/pv-local-jugaralpadel.yaml | 70 +++++++++---------- JugarAlPadel/K8S/reg-secret.yaml | 2 +- .../static-volume-persistentvolumeclaim.yaml | 2 +- JugarAlPadel/K8S/verImg.sh | 2 +- 17 files changed, 110 insertions(+), 121 deletions(-) delete mode 100644 JugarAlPadel/K8S/env-prod-db-configmap.yaml diff --git a/JugarAlPadel/K8S/Makefile b/JugarAlPadel/K8S/Makefile index e0296d4..5b6e690 100644 --- a/JugarAlPadel/K8S/Makefile +++ b/JugarAlPadel/K8S/Makefile @@ -1,7 +1,7 @@ export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':') #export REGISTRY=registry.cube.local export REGISTRY=registry.reymota.es -export IMG_VERSION = 0.16 +export IMG_VERSION = 0.01 export IMG_NGINX_VERSION = 1.0 # limpia todo @@ -16,22 +16,22 @@ install: -kubectl create -f env-prod-configmap.yaml -kubectl create -f env-prod-db-configmap.yaml - -kubectl create -f pv-local-reymota.yaml - -kubectl create -f reymota-prod-persistentvolumeclaim.yaml + -kubectl create -f pv-local-jugaralpadel.yaml + -kubectl create -f jugaralpadel-prod-persistentvolumeclaim.yaml -kubectl create -f static-volume-persistentvolumeclaim.yaml -kubectl create -f postgres-data-persistentvolumeclaim.yaml -kubectl create -f db-deployment.yaml -kubectl create -f db-service.yaml - -envsubst < reymota-deployment.yaml |kubectl create -f - + -envsubst < jugaralpadel-deployment.yaml |kubectl create -f - -envsubst < nginx-deployment.yaml |kubectl create -f - -kubectl create -f nginx-service.yaml clean: -envsubst < nginx-deployment.yaml |kubectl delete -f - -kubectl delete -f nginx-service.yaml - -envsubst < reymota-deployment.yaml |kubectl delete -f - + -envsubst < jugaralpadel-deployment.yaml |kubectl delete -f - -kubectl delete -f db-deployment.yaml -kubectl delete -f db-service.yaml @@ -41,8 +41,8 @@ clean: -kubectl delete -f postgres-data-persistentvolumeclaim.yaml -kubectl delete -f static-volume-persistentvolumeclaim.yaml - -kubectl delete -f reymota-prod-persistentvolumeclaim.yaml - -kubectl delete -f pv-local-reymota.yaml + -kubectl delete -f jugaralpadel-prod-persistentvolumeclaim.yaml + -kubectl delete -f pv-local-jugaralpadel.yaml -kubectl delete -f reg-secret.yaml -kubectl delete -f namespace.yaml diff --git a/JugarAlPadel/K8S/db-deployment.yaml b/JugarAlPadel/K8S/db-deployment.yaml index e80c2bd..eba7712 100644 --- a/JugarAlPadel/K8S/db-deployment.yaml +++ b/JugarAlPadel/K8S/db-deployment.yaml @@ -7,7 +7,7 @@ metadata: labels: io.kompose.service: db name: db - namespace: reymota + namespace: jugaralpadel spec: replicas: 1 selector: diff --git a/JugarAlPadel/K8S/db-service.yaml b/JugarAlPadel/K8S/db-service.yaml index 98e237d..335e238 100644 --- a/JugarAlPadel/K8S/db-service.yaml +++ b/JugarAlPadel/K8S/db-service.yaml @@ -7,7 +7,7 @@ metadata: labels: io.kompose.service: db name: db - namespace: reymota + namespace: jugaralpadel spec: ports: - name: "5432" diff --git a/JugarAlPadel/K8S/entra.sh b/JugarAlPadel/K8S/entra.sh index 57091db..f637562 100644 --- a/JugarAlPadel/K8S/entra.sh +++ b/JugarAlPadel/K8S/entra.sh @@ -1 +1 @@ -kubectl -n reymota exec -ti deployment.apps/reymota -- /bin/bash +kubectl -n jugaralpadel exec -ti deployment.apps/jugaralpadel -- /bin/bash diff --git a/JugarAlPadel/K8S/entraPsql.sh b/JugarAlPadel/K8S/entraPsql.sh index 077b82f..c87b17f 100644 --- a/JugarAlPadel/K8S/entraPsql.sh +++ b/JugarAlPadel/K8S/entraPsql.sh @@ -1 +1 @@ -kubectl -n reymota exec -ti deployment.apps/db -- psql --username=creylopez --dbname=reymota +kubectl -n jugaralpadel exec -ti deployment.apps/db -- psql --username=creylopez --dbname=jugaralpadel diff --git a/JugarAlPadel/K8S/env-prod-configmap.yaml b/JugarAlPadel/K8S/env-prod-configmap.yaml index 3c5a9ea..0da623e 100644 --- a/JugarAlPadel/K8S/env-prod-configmap.yaml +++ b/JugarAlPadel/K8S/env-prod-configmap.yaml @@ -1,10 +1,10 @@ apiVersion: v1 data: - DEBUG: "True" + DEBUG: "False" DJANGO_ALLOWED_HOSTS: "reymota.es k8s-server localhost 127.0.0.1 [::1]" CSRF_TRUSTED_ORIGINS: "https://reymota.es" SECRET_KEY: change_me - SQL_DATABASE: reymota + SQL_DATABASE: jugaralpadel SQL_ENGINE: django.db.backends.postgresql SQL_HOST: db SQL_PASSWORD: Dsa-0213 @@ -16,4 +16,4 @@ metadata: labels: io.kompose.service: web-env-prod name: env-prod - namespace: reymota + namespace: jugaralpadel diff --git a/JugarAlPadel/K8S/env-prod-db-configmap.yaml b/JugarAlPadel/K8S/env-prod-db-configmap.yaml deleted file mode 100644 index d871dce..0000000 --- a/JugarAlPadel/K8S/env-prod-db-configmap.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -data: - POSTGRES_DB: reymota - POSTGRES_PASSWORD: Dsa-0213 - POSTGRES_USER: creylopez -kind: ConfigMap -metadata: - labels: - io.kompose.service: db-env-prod-db - name: env-prod-db - namespace: reymota diff --git a/JugarAlPadel/K8S/jugaralpadel-deployment.yaml b/JugarAlPadel/K8S/jugaralpadel-deployment.yaml index d334954..4d6cabd 100644 --- a/JugarAlPadel/K8S/jugaralpadel-deployment.yaml +++ b/JugarAlPadel/K8S/jugaralpadel-deployment.yaml @@ -1,43 +1,43 @@ apiVersion: v1 kind: Service metadata: - name: reymota - namespace: reymota + name: jugaralpadel + namespace: jugaralpadel spec: ports: - name: "8000" port: 8000 targetPort: 8000 selector: - app: reymota + app: jugaralpadel --- apiVersion: apps/v1 kind: Deployment metadata: - name: reymota - namespace: reymota + name: jugaralpadel + namespace: jugaralpadel labels: - app: reymota + app: jugaralpadel spec: replicas: 1 selector: matchLabels: - app: reymota + app: jugaralpadel strategy: type: Recreate template: metadata: labels: - app: reymota + app: jugaralpadel spec: containers: - args: - gunicorn - - reymota.wsgi:application + - gestion_reservas.wsgi:application - --bind - 0.0.0.0:8000 - name: reymota - image: $REGISTRY/reymota-$ARQUITECTURA:$IMG_VERSION + name: jugaralpadel + image: $REGISTRY/jugaralpadel-$ARQUITECTURA:$IMG_VERSION env: - name: VERSION value: "$IMG_VERSION" @@ -102,39 +102,39 @@ spec: - containerPort: 8000 protocol: TCP volumeMounts: - - mountPath: /app/reymota/mediafiles - name: reymota-media + - mountPath: /app/jugaralpadel/mediafiles + name: jugaralpadel-media - - mountPath: /app/reymota/lyrics/migrations - name: reymota-lyrics-migrations - - mountPath: /app/reymota/repostajes/migrations - name: reymota-repostajes-migrations - - mountPath: /app/reymota/libros/migrations - name: reymota-libros-migrations - - mountPath: /app/reymota/reymotausers/migrations - name: reymota-reymotausers-migrations + - mountPath: /app/jugaralpadel/lyrics/migrations + name: jugaralpadel-lyrics-migrations + - mountPath: /app/jugaralpadel/repostajes/migrations + name: jugaralpadel-repostajes-migrations + - mountPath: /app/jugaralpadel/libros/migrations + name: jugaralpadel-libros-migrations + - mountPath: /app/jugaralpadel/jugaralpadelusers/migrations + name: jugaralpadel-jugaralpadelusers-migrations - - mountPath: /app/reymota/staticfiles + - mountPath: /app/jugaralpadel/staticfiles name: static-volume imagePullSecrets: - name: myregistrykey restartPolicy: Always volumes: - - name: reymota-media + - name: jugaralpadel-media persistentVolumeClaim: - claimName: reymota-media - - name: reymota-lyrics-migrations + claimName: jugaralpadel-media + - name: jugaralpadel-lyrics-migrations persistentVolumeClaim: - claimName: reymota-lyrics-migrations - - name: reymota-repostajes-migrations + claimName: jugaralpadel-lyrics-migrations + - name: jugaralpadel-repostajes-migrations persistentVolumeClaim: - claimName: reymota-repostajes-migrations - - name: reymota-libros-migrations + claimName: jugaralpadel-repostajes-migrations + - name: jugaralpadel-libros-migrations persistentVolumeClaim: - claimName: reymota-libros-migrations - - name: reymota-reymotausers-migrations + claimName: jugaralpadel-libros-migrations + - name: jugaralpadel-jugaralpadelusers-migrations persistentVolumeClaim: - claimName: reymota-reymotausers-migrations + claimName: jugaralpadel-jugaralpadelusers-migrations - name: static-volume persistentVolumeClaim: claimName: static-volume diff --git a/JugarAlPadel/K8S/jugaralpadel-prod-persistentvolumeclaim.yaml b/JugarAlPadel/K8S/jugaralpadel-prod-persistentvolumeclaim.yaml index e20ef2d..c3b19d2 100644 --- a/JugarAlPadel/K8S/jugaralpadel-prod-persistentvolumeclaim.yaml +++ b/JugarAlPadel/K8S/jugaralpadel-prod-persistentvolumeclaim.yaml @@ -3,9 +3,9 @@ kind: PersistentVolumeClaim metadata: creationTimestamp: null labels: - io.kompose.service: reymota-media - name: reymota-media - namespace: reymota + io.kompose.service: jugaralpadel-media + name: jugaralpadel-media + namespace: jugaralpadel spec: accessModes: - ReadWriteOnce @@ -19,9 +19,9 @@ kind: PersistentVolumeClaim metadata: creationTimestamp: null labels: - io.kompose.service: reymota-libros-migrations - name: reymota-libros-migrations - namespace: reymota + io.kompose.service: jugaralpadel-libros-migrations + name: jugaralpadel-libros-migrations + namespace: jugaralpadel spec: accessModes: - ReadWriteOnce @@ -35,9 +35,9 @@ kind: PersistentVolumeClaim metadata: creationTimestamp: null labels: - io.kompose.service: reymota-lyrics-migrations - name: reymota-lyrics-migrations - namespace: reymota + io.kompose.service: jugaralpadel-lyrics-migrations + name: jugaralpadel-lyrics-migrations + namespace: jugaralpadel spec: accessModes: - ReadWriteOnce @@ -51,9 +51,9 @@ kind: PersistentVolumeClaim metadata: creationTimestamp: null labels: - io.kompose.service: reymota-repostajes-migrations - name: reymota-repostajes-migrations - namespace: reymota + io.kompose.service: jugaralpadel-repostajes-migrations + name: jugaralpadel-repostajes-migrations + namespace: jugaralpadel spec: accessModes: - ReadWriteOnce @@ -67,9 +67,9 @@ kind: PersistentVolumeClaim metadata: creationTimestamp: null labels: - io.kompose.service: reymota-reymotausers-migrations - name: reymota-reymotausers-migrations - namespace: reymota + io.kompose.service: jugaralpadel-jugaralpadelusers-migrations + name: jugaralpadel-jugaralpadelusers-migrations + namespace: jugaralpadel spec: accessModes: - ReadWriteOnce diff --git a/JugarAlPadel/K8S/namespace.yaml b/JugarAlPadel/K8S/namespace.yaml index 775e161..170bd04 100644 --- a/JugarAlPadel/K8S/namespace.yaml +++ b/JugarAlPadel/K8S/namespace.yaml @@ -4,4 +4,4 @@ apiVersion: v1 kind: Namespace metadata: - name: reymota + name: jugaralpadel diff --git a/JugarAlPadel/K8S/nginx-deployment.yaml b/JugarAlPadel/K8S/nginx-deployment.yaml index 358e2c6..9df7e7b 100644 --- a/JugarAlPadel/K8S/nginx-deployment.yaml +++ b/JugarAlPadel/K8S/nginx-deployment.yaml @@ -7,7 +7,7 @@ metadata: labels: io.kompose.service: nginx name: nginx - namespace: reymota + namespace: jugaralpadel spec: replicas: 1 selector: @@ -24,16 +24,16 @@ spec: io.kompose.service: nginx spec: containers: - - image: $REGISTRY/nginx-reymota-$ARQUITECTURA:$IMG_NGINX_VERSION + - image: $REGISTRY/nginx-jugaralpadel-$ARQUITECTURA:$IMG_NGINX_VERSION name: nginx ports: - containerPort: 80 protocol: TCP volumeMounts: - - mountPath: /app/reymota/staticfiles + - mountPath: /app/jugaralpadel/staticfiles name: static-volume - - mountPath: /app/reymota/mediafiles - name: reymota-media + - mountPath: /app/jugaralpadel/mediafiles + name: jugaralpadel-media imagePullSecrets: - name: myregistrykey restartPolicy: Always @@ -41,6 +41,6 @@ spec: - name: static-volume persistentVolumeClaim: claimName: static-volume - - name: reymota-media + - name: jugaralpadel-media persistentVolumeClaim: - claimName: reymota-media + claimName: jugaralpadel-media diff --git a/JugarAlPadel/K8S/nginx-service.yaml b/JugarAlPadel/K8S/nginx-service.yaml index 1e8742f..1acf4a8 100644 --- a/JugarAlPadel/K8S/nginx-service.yaml +++ b/JugarAlPadel/K8S/nginx-service.yaml @@ -7,13 +7,13 @@ metadata: labels: io.kompose.service: nginx name: nginx - namespace: reymota + namespace: jugaralpadel spec: type: NodePort ports: - name: "1337" port: 1337 - nodePort: 30341 + nodePort: 30345 targetPort: 80 selector: io.kompose.service: nginx diff --git a/JugarAlPadel/K8S/postgres-data-persistentvolumeclaim.yaml b/JugarAlPadel/K8S/postgres-data-persistentvolumeclaim.yaml index 6c51a1d..c1576e0 100644 --- a/JugarAlPadel/K8S/postgres-data-persistentvolumeclaim.yaml +++ b/JugarAlPadel/K8S/postgres-data-persistentvolumeclaim.yaml @@ -4,7 +4,7 @@ metadata: labels: io.kompose.service: postgres-data name: postgres-data - namespace: reymota + namespace: jugaralpadel spec: accessModes: - ReadWriteOnce diff --git a/JugarAlPadel/K8S/pv-local-jugaralpadel.yaml b/JugarAlPadel/K8S/pv-local-jugaralpadel.yaml index ea9ecb7..8509926 100644 --- a/JugarAlPadel/K8S/pv-local-jugaralpadel.yaml +++ b/JugarAlPadel/K8S/pv-local-jugaralpadel.yaml @@ -1,111 +1,111 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: reymota-media-folder - namespace: reymota + name: jugaralpadel-media-folder + namespace: jugaralpadel labels: - app: reymota + app: jugaralpadel spec: capacity: storage: 100Mi accessModes: - ReadWriteOnce hostPath: - #path: "/mnt/Externo/reymota/media" - path: "/mnt/Externo/copiareymota/media" + #path: "/mnt/Externo/jugaralpadel/media" + path: "/mnt/Externo/jugaralpadel/media" --- apiVersion: v1 kind: PersistentVolume metadata: - name: reymota-lyrics-migrations-folder - namespace: reymota + name: jugaralpadel-lyrics-migrations-folder + namespace: jugaralpadel labels: - app: reymota + app: jugaralpadel spec: capacity: storage: 50Mi accessModes: - ReadWriteOnce hostPath: - #path: "/mnt/Externo/reymota/migrations/lyrics" - path: "/mnt/Externo/copiareymota/migrations/lyrics" + #path: "/mnt/Externo/jugaralpadel/migrations/lyrics" + path: "/mnt/Externo/jugaralpadel/migrations/lyrics" --- apiVersion: v1 kind: PersistentVolume metadata: - name: reymota-libros-migrations-folder - namespace: reymota + name: jugaralpadel-libros-migrations-folder + namespace: jugaralpadel labels: - app: reymota + app: jugaralpadel spec: capacity: storage: 51Mi accessModes: - ReadWriteOnce hostPath: - #path: "/mnt/Externo/reymota/migrations/libros" - path: "/mnt/Externo/copiareymota/migrations/libros" + #path: "/mnt/Externo/jugaralpadel/migrations/libros" + path: "/mnt/Externo/jugaralpadel/migrations/libros" --- apiVersion: v1 kind: PersistentVolume metadata: - name: reymota-repostajes-migrations-folder - namespace: reymota + name: jugaralpadel-repostajes-migrations-folder + namespace: jugaralpadel labels: - app: reymota + app: jugaralpadel spec: capacity: storage: 52Mi accessModes: - ReadWriteOnce hostPath: - #path: "/mnt/Externo/reymota/migrations/repostajes" - path: "/mnt/Externo/copiareymota/migrations/repostajes" + #path: "/mnt/Externo/jugaralpadel/migrations/repostajes" + path: "/mnt/Externo/jugaralpadel/migrations/repostajes" --- apiVersion: v1 kind: PersistentVolume metadata: - name: reymota-reymotausers-migrations-folder - namespace: reymota + name: jugaralpadel-jugaralpadelusers-migrations-folder + namespace: jugaralpadel labels: - app: reymota + app: jugaralpadel spec: capacity: storage: 53Mi accessModes: - ReadWriteOnce hostPath: - #path: "/mnt/Externo/reymota/migrations/reymotausers" - path: "/mnt/Externo/copiareymota/migrations/reymotausers" + #path: "/mnt/Externo/jugaralpadel/migrations/jugaralpadelusers" + path: "/mnt/Externo/jugaralpadel/migrations/jugaralpadelusers" --- apiVersion: v1 kind: PersistentVolume metadata: - name: reymota-static-folder - namespace: reymota + name: jugaralpadel-static-folder + namespace: jugaralpadel labels: - app: reymota + app: jugaralpadel spec: capacity: storage: 70Mi accessModes: - ReadWriteOnce hostPath: - #path: "/mnt/Externo/reymota/static" - path: "/mnt/Externo/copiareymota/static" + #path: "/mnt/Externo/jugaralpadel/static" + path: "/mnt/Externo/jugaralpadel/static" --- apiVersion: v1 kind: PersistentVolume metadata: - name: reymota-pg-folder - namespace: reymota + name: jugaralpadel-pg-folder + namespace: jugaralpadel labels: - app: reymota + app: jugaralpadel spec: capacity: storage: 200Mi accessModes: - ReadWriteOnce hostPath: - #path: "/mnt/Externo/reymota/pg" - path: "/mnt/Externo/copiareymota/pg" + #path: "/mnt/Externo/jugaralpadel/pg" + path: "/mnt/Externo/jugaralpadel/pg" diff --git a/JugarAlPadel/K8S/reg-secret.yaml b/JugarAlPadel/K8S/reg-secret.yaml index 87d0614..b3c9082 100644 --- a/JugarAlPadel/K8S/reg-secret.yaml +++ b/JugarAlPadel/K8S/reg-secret.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: name: myregistrykey - namespace: reymota + namespace: jugaralpadel data: .dockerconfigjson: ewoJImF1dGhzIjogewoJCSJyZWdpc3RyeS5yZXltb3RhLmVzIjogewoJCQkiYXV0aCI6ICJZM0psZVd4dmNHVjZPbEpsZVMweE1UYzIiCgkJfQoJfQp9 type: kubernetes.io/dockerconfigjson diff --git a/JugarAlPadel/K8S/static-volume-persistentvolumeclaim.yaml b/JugarAlPadel/K8S/static-volume-persistentvolumeclaim.yaml index 5eb01e2..85c1fb7 100644 --- a/JugarAlPadel/K8S/static-volume-persistentvolumeclaim.yaml +++ b/JugarAlPadel/K8S/static-volume-persistentvolumeclaim.yaml @@ -4,7 +4,7 @@ metadata: labels: io.kompose.service: static-volume name: static-volume - namespace: reymota + namespace: jugaralpadel spec: accessModes: - ReadWriteOnce diff --git a/JugarAlPadel/K8S/verImg.sh b/JugarAlPadel/K8S/verImg.sh index a9ade1f..c342ede 100644 --- a/JugarAlPadel/K8S/verImg.sh +++ b/JugarAlPadel/K8S/verImg.sh @@ -1 +1 @@ -docker run -it registry.reymota.es/reymota-x86_64:0.1 bash +docker run -it registry.jugaralpadel.es/jugaralpadel-x86_64:0.1 bash