diff --git a/RepostajesPy/K8S/Makefile b/RepostajesPy/K8S/Makefile index b0b9220..ce6de1c 100644 --- a/RepostajesPy/K8S/Makefile +++ b/RepostajesPy/K8S/Makefile @@ -1,4 +1,4 @@ -export IMG_VERSION = 7.5 +export IMG_VERSION = 1.1 # limpia todo all: imagen clean install @@ -14,4 +14,3 @@ clean: envsubst < repostajes-deployment.yaml |kubectl delete -f - kubectl delete -f repostajes-prod-persistentvolumeclaim.yaml kubectl delete -f pv-local-repostajes.yaml - diff --git a/RepostajesPy/K8S/entra.sh b/RepostajesPy/K8S/entra.sh index e41ec11..e3c84ca 100644 --- a/RepostajesPy/K8S/entra.sh +++ b/RepostajesPy/K8S/entra.sh @@ -1 +1 @@ -kubectl exec -ti deployment.apps/lyrics -- /bin/bash \ No newline at end of file +kubectl exec -ti deployment.apps/repostajespy -- /bin/bash diff --git a/RepostajesPy/K8S/pv-local-repostajes.yaml b/RepostajesPy/K8S/pv-local-repostajes.yaml index 6599389..7a7e3b7 100644 --- a/RepostajesPy/K8S/pv-local-repostajes.yaml +++ b/RepostajesPy/K8S/pv-local-repostajes.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: repostajespy-app-folder + name: repostajespy-instance-folder labels: app: repostajespy spec: @@ -10,5 +10,19 @@ spec: accessModes: - ReadWriteOnce hostPath: - path: "/mnt/Externo/repostajespy" + path: "/mnt/Externo/repostajespy/instance" +--- +apiVersion: v1 +kind: PersistentVolume +metadata: + name: repostajespy-migrations-folder + labels: + app: repostajespy +spec: + capacity: + storage: 50Mi + accessModes: + - ReadWriteOnce + hostPath: + path: "/mnt/Externo/repostajespy/migrations" diff --git a/RepostajesPy/K8S/repostajes-deployment.yaml b/RepostajesPy/K8S/repostajes-deployment.yaml index e3c1e71..93a9ad9 100644 --- a/RepostajesPy/K8S/repostajes-deployment.yaml +++ b/RepostajesPy/K8S/repostajes-deployment.yaml @@ -36,8 +36,8 @@ spec: - --bind - 0.0.0.0:5000 - repostajes:create_app() - image: creylopez/repostajes:$IMG_VERSION name: repostajespy + image: creylopez/repostajes:$IMG_VERSION env: - name: SALUDO_DEMO value: "Hola, mundo" @@ -47,10 +47,15 @@ spec: resources: {} volumeMounts: - mountPath: /repostajes/instance - name: repostajespy-prod + name: repostajespy-instance + - mountPath: /repostajes/migrations + name: repostajespy-migrations restartPolicy: Always volumes: - - name: repostajespy-prod + - name: repostajespy-instance + persistentVolumeClaim: + claimName: repostajespy-instance + - name: repostajespy-migrations persistentVolumeClaim: - claimName: repostajespy-prod + claimName: repostajespy-migrations status: {} diff --git a/RepostajesPy/K8S/repostajes-prod-persistentvolumeclaim.yaml b/RepostajesPy/K8S/repostajes-prod-persistentvolumeclaim.yaml index abfa901..7d12f83 100644 --- a/RepostajesPy/K8S/repostajes-prod-persistentvolumeclaim.yaml +++ b/RepostajesPy/K8S/repostajes-prod-persistentvolumeclaim.yaml @@ -3,8 +3,8 @@ kind: PersistentVolumeClaim metadata: creationTimestamp: null labels: - io.kompose.service: repostajespy-prod - name: repostajespy-prod + io.kompose.service: repostajespy-instance + name: repostajespy-instance spec: accessModes: - ReadWriteOnce @@ -12,3 +12,19 @@ spec: requests: storage: 100Mi status: {} +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + creationTimestamp: null + labels: + io.kompose.service: repostajespy-migrations + name: repostajespy-migrations +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 50Mi +status: {} + diff --git a/RepostajesPy/K8S/verImg.sh b/RepostajesPy/K8S/verImg.sh index 0289df6..cc3de60 100644 --- a/RepostajesPy/K8S/verImg.sh +++ b/RepostajesPy/K8S/verImg.sh @@ -1 +1 @@ -docker run -it creylopez/repostajes:5.3 bash +docker run -it creylopez/repostajes:1.0 bash diff --git a/RepostajesPy/servicios/repostajes/models.py b/RepostajesPy/servicios/repostajes/models.py index 2782952..db7428d 100644 --- a/RepostajesPy/servicios/repostajes/models.py +++ b/RepostajesPy/servicios/repostajes/models.py @@ -7,7 +7,6 @@ from . import db class User(UserMixin, db.Model): id = db.Column(db.Integer, primary_key=True) username = db.Column(db.String(150), unique=True, nullable=False) - email = db.Column(db.String(150), unique=True, nullable=True) password = db.Column(db.String(150), nullable=False) photo = db.Column(db.String(150), nullable=False)