Browse Source

En preparación para K8S

politica
Celestino Rey 1 year ago
parent
commit
34f11fcf2d
10 changed files with 26 additions and 68 deletions
  1. +1
    -1
      JugarAlPadel/Dockerfile
  2. +2
    -2
      JugarAlPadel/K8S/Makefile
  3. +1
    -1
      JugarAlPadel/K8S/env-prod-configmap.yaml
  4. +8
    -18
      JugarAlPadel/K8S/jugaralpadel-deployment.yaml
  5. +4
    -36
      JugarAlPadel/K8S/jugaralpadel-prod-persistentvolumeclaim.yaml
  6. +2
    -2
      JugarAlPadel/K8S/pv-local-jugaralpadel.yaml
  7. +2
    -2
      JugarAlPadel/Makefile
  8. BIN
      JugarAlPadel/gestion_reservas/db.sqlite3
  9. +2
    -2
      JugarAlPadel/nginx/Makefile
  10. +4
    -4
      JugarAlPadel/nginx/nginx.conf

+ 1
- 1
JugarAlPadel/Dockerfile View File

@ -67,7 +67,7 @@ COPY . $APP_HOME
# change to the app user
#USER app
WORKDIR $APP_HOME/reymota
WORKDIR $APP_HOME/gestion_reservas
# run entrypoint.sh
ENTRYPOINT ["/app/entrypoint.sh"]

+ 2
- 2
JugarAlPadel/K8S/Makefile View File

@ -1,8 +1,8 @@
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.01
export IMG_NGINX_VERSION = 1.0
export IMG_VERSION = 0.03
export IMG_NGINX_VERSION = 2.0
# limpia todo
all: imagen clean install


+ 1
- 1
JugarAlPadel/K8S/env-prod-configmap.yaml View File

@ -1,6 +1,6 @@
apiVersion: v1
data:
DEBUG: "False"
DEBUG: "True"
DJANGO_ALLOWED_HOSTS: "reymota.es k8s-server localhost 127.0.0.1 [::1]"
CSRF_TRUSTED_ORIGINS: "https://reymota.es"
SECRET_KEY: change_me


+ 8
- 18
JugarAlPadel/K8S/jugaralpadel-deployment.yaml View File

@ -105,14 +105,10 @@ spec:
- mountPath: /app/jugaralpadel/mediafiles
name: jugaralpadel-media
- 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/jugaralpadel/eventos/migrations
name: jugaralpadel-eventos-migrations
- mountPath: /app/jugaralpadel/reymotausers/migrations
name: jugaralpadel-reymotausers-migrations
- mountPath: /app/jugaralpadel/staticfiles
name: static-volume
@ -123,18 +119,12 @@ spec:
- name: jugaralpadel-media
persistentVolumeClaim:
claimName: jugaralpadel-media
- name: jugaralpadel-lyrics-migrations
- name: jugaralpadel-eventos-migrations
persistentVolumeClaim:
claimName: jugaralpadel-lyrics-migrations
- name: jugaralpadel-repostajes-migrations
claimName: jugaralpadel-eventos-migrations
- name: jugaralpadel-reymotausers-migrations
persistentVolumeClaim:
claimName: jugaralpadel-repostajes-migrations
- name: jugaralpadel-libros-migrations
persistentVolumeClaim:
claimName: jugaralpadel-libros-migrations
- name: jugaralpadel-jugaralpadelusers-migrations
persistentVolumeClaim:
claimName: jugaralpadel-jugaralpadelusers-migrations
claimName: jugaralpadel-reymotausers-migrations
- name: static-volume
persistentVolumeClaim:
claimName: static-volume


+ 4
- 36
JugarAlPadel/K8S/jugaralpadel-prod-persistentvolumeclaim.yaml View File

@ -19,24 +19,8 @@ kind: PersistentVolumeClaim
metadata:
creationTimestamp: null
labels:
io.kompose.service: jugaralpadel-libros-migrations
name: jugaralpadel-libros-migrations
namespace: jugaralpadel
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 51Mi
status: {}
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
creationTimestamp: null
labels:
io.kompose.service: jugaralpadel-lyrics-migrations
name: jugaralpadel-lyrics-migrations
io.kompose.service: jugaralpadel-eventos-migrations
name: jugaralpadel-eventos-migrations
namespace: jugaralpadel
spec:
accessModes:
@ -51,24 +35,8 @@ kind: PersistentVolumeClaim
metadata:
creationTimestamp: null
labels:
io.kompose.service: jugaralpadel-repostajes-migrations
name: jugaralpadel-repostajes-migrations
namespace: jugaralpadel
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 52Mi
status: {}
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
creationTimestamp: null
labels:
io.kompose.service: jugaralpadel-jugaralpadelusers-migrations
name: jugaralpadel-jugaralpadelusers-migrations
io.kompose.service: jugaralpadel-reymotausers-migrations
name: jugaralpadel-reymotausers-migrations
namespace: jugaralpadel
spec:
accessModes:


+ 2
- 2
JugarAlPadel/K8S/pv-local-jugaralpadel.yaml View File

@ -16,7 +16,7 @@ spec:
apiVersion: v1
kind: PersistentVolume
metadata:
name: jugaralpadel-lyrics-migrations-folder
name: jugaralpadel-eventos-migrations-folder
namespace: jugaralpadel
labels:
app: jugaralpadel
@ -31,7 +31,7 @@ spec:
apiVersion: v1
kind: PersistentVolume
metadata:
name: jugaralpadel-jugaralpadelusers-migrations-folder
name: jugaralpadel-reymotausers-migrations-folder
namespace: jugaralpadel
labels:
app: jugaralpadel


+ 2
- 2
JugarAlPadel/Makefile View File

@ -2,7 +2,7 @@ install:
echo "Creando imagen con version '${IMG_VERSION}' para la arquitectura '${ARQUITECTURA}' en el registry '${REGISTRY}'"
docker build --no-cache -t ${REGISTRY}/reymota-${ARQUITECTURA}:${IMG_VERSION} .
docker push ${REGISTRY}/reymota-${ARQUITECTURA}:${IMG_VERSION}
docker build --no-cache -t ${REGISTRY}/jugaralpadel-${ARQUITECTURA}:${IMG_VERSION} .
docker push ${REGISTRY}/jugaralpadel-${ARQUITECTURA}:${IMG_VERSION}

BIN
JugarAlPadel/gestion_reservas/db.sqlite3 View File


+ 2
- 2
JugarAlPadel/nginx/Makefile View File

@ -2,7 +2,7 @@ install:
echo "Creando imagen con version '${IMG_NGINX_VERSION}' para la arquitectura '${ARQUITECTURA}' en el registry '${REGISTRY}'"
docker build --no-cache -t ${REGISTRY}/nginx-reymota-${ARQUITECTURA}:${IMG_NGINX_VERSION} .
docker push ${REGISTRY}/nginx-reymota-${ARQUITECTURA}:${IMG_NGINX_VERSION}
docker build --no-cache -t ${REGISTRY}/nginx-jugaralpadel-${ARQUITECTURA}:${IMG_NGINX_VERSION} .
docker push ${REGISTRY}/nginx-jugaralpadel-${ARQUITECTURA}:${IMG_NGINX_VERSION}

+ 4
- 4
JugarAlPadel/nginx/nginx.conf View File

@ -1,5 +1,5 @@
upstream reymota {
server reymota:8000;
server jugaralpadel:8000;
}
server {
@ -7,7 +7,7 @@ server {
listen 80;
location / {
proxy_pass http://reymota;
proxy_pass http://jugaralpadel;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_redirect off;
@ -15,11 +15,11 @@ server {
}
location /static/ {
alias /app/reymota/staticfiles/;
alias /app/gestion_reservas/staticfiles/;
}
location /media/ {
alias /app/reymota/mediafiles/;
alias /app/gestion_reservas/mediafiles/;
}
}

Loading…
Cancel
Save