Cambios en Makefile para instalar localmente

K8S/Makefile

@@ -1,7 +1,7 @@
-export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':')
 export REGISTRY=registry.reymota.es
-export IMG_VERSION = 0.46
+export IMG_VERSION = 0.55
 export IMG_NGINX_VERSION = 1.4
+export NAMESPACE = finanzas
 
 # limpia todo
 all: imagen clean install
@@ -9,58 +9,40 @@ all: imagen clean install
 imagen:
 	cd ../; make
 
-install:
+ns:
 	-kubectl create -f namespace.yaml
-	-kubectl create -f reg-secret.yaml
-	-kubectl create -f env-prod-configmap.yaml 
-	-kubectl create -f env-prod-db-configmap.yaml 
 
-	-kubectl create -f pv-local-finanzas.yaml
-	-kubectl create -f finanzas-prod-persistentvolumeclaim.yaml
-	-kubectl create -f static-volume-persistentvolumeclaim.yaml
-	-kubectl create -f postgres-data-persistentvolumeclaim.yaml
+install:
+	-cat reg-secret.yaml| sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
+	-cat env-prod-configmap.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
+	-cat env-prod-db-configmap.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
 
-	-kubectl create -f db-deployment.yaml
-	-kubectl create -f db-service.yaml
+	-cat db-deployment.yaml| sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
+	-cat db-service.yaml| sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
 
-	-envsubst < finanzas-deployment.yaml |kubectl create -f -
-	-kubectl create -f finanzas-ingress.yaml
+	-cat finanzas-deployment.yaml | sed -e "s/<NS>/${NAMESPACE}/" | sed -e "s/<TAG>/${IMG_VERSION}/" | kubectl create -f -
+	-cat finanzas-ingress.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl create -f -
 
 clean:
-	-envsubst < finanzas-deployment.yaml |kubectl delete -f -
+	-cat finanzas-deployment.yaml | sed -e "s/<NS>/${NAMESPACE}/" | sed -e "s/<TAG>/${IMG_VERSION}/" | kubectl delete -f -
 
-	-kubectl delete -f db-deployment.yaml
-	-kubectl delete -f db-service.yaml
+	-cat db-deployment.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -
+	-cat db-service.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -
 
-	-kubectl delete -f env-prod-configmap.yaml 
-	-kubectl delete -f env-prod-db-configmap.yaml 
+	-cat env-prod-configmap.yaml  | sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -
+	-cat env-prod-db-configmap.yaml  | sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -
 
-	-kubectl delete -f postgres-data-persistentvolumeclaim.yaml
-	-kubectl delete -f static-volume-persistentvolumeclaim.yaml
-	-kubectl delete -f finanzas-prod-persistentvolumeclaim.yaml
-	-kubectl delete -f pv-local-finanzas.yaml
-	-kubectl delete -f reg-secret.yaml
-	-kubectl delete -f finanzas-ingress.yaml
-	-kubectl delete -f namespace.yaml
+	-cat reg-secret.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -
+	-cat finanzas-ingress.yaml | sed -e "s/<NS>/${NAMESPACE}/" | kubectl delete -f -
 
 nginx:
 	cd ../nginx; make
 
-backup:
-	kubectl --kubeconfig /home/creylopez/.kube/config -n finanzas exec -ti deployment.apps/db -- /usr/lib/postgresql/15/bin/pg_dump --username=creylopez --dbname=finanzas > finanzas-$(IMG_VERSION).sql
+claims:
+	-kubectl create -f pvc-finanzas.yaml
+	-kubectl create -f pvc-static.yaml
+	-kubectl create -f pvc-postgresql.yaml
 
-fleet:
-	-cp namespace.yaml ../Fleet/15-namespace.yaml
-	-cp reg-secret.yaml ../Fleet/20-reg-secret.yaml
-	-cp env-prod-configmap.yaml  ../Fleet/25-env-prod-configmap.yaml
-	-cp env-prod-db-configmap.yaml  ../Fleet/30-env-prod-db-configmap.yaml
-	-cp pv-local-finanzas.yaml ../Fleet/35-pv-local-finanzas.yaml
-	-cp finanzas-prod-persistentvolumeclaim.yaml ../Fleet/40-finanzas-prod-persistentvolumeclaim.yaml
-	-cp static-volume-persistentvolumeclaim.yaml ../Fleet/43-static-volume-persistentvolumeclaim.yaml
-	-cp postgres-data-persistentvolumeclaim.yaml ../Fleet/45-postgres-data-persistentvolumeclaim.yaml
-	-cp db-deployment.yaml ../Fleet/55-db-deployment.yaml
-	-cp db-service.yaml ../Fleet/60-db-service.yaml
-	-cp nginx-service.yaml ../Fleet/65-nginx-service.yaml
-	-envsubst < finanzas-deployment.yaml > ../Fleet/70-finanzas-deployment.yaml
-	-envsubst < nginx-deployment.yaml > ../Fleet/75-nginx-deployment.yaml
-	-cp finanzas-ingress.yaml ../Fleet/80-finanzas-ingress.yaml
+app:
+	-cat finanzas-deployment.yaml | sed -e "s/<NS>/${NAMESPACE}/" | sed -e "s/<TAG>/${IMG_VERSION}/" | kubectl delete -f -
+	-cat finanzas-deployment.yaml | sed -e "s/<NS>/${NAMESPACE}/" | sed -e "s/<TAG>/${IMG_VERSION}/" | kubectl create -f -

Makefile

@@ -1,8 +1,8 @@
 install:
 
-	echo "Creando imagen con version '${IMG_VERSION}' para la arquitectura '${ARQUITECTURA}' en el registry '${REGISTRY}'"
+	echo "Creando imagen con version '${IMG_VERSION}' en el registry '${REGISTRY}'"
 
-	docker build --no-cache -t ${REGISTRY}/finanzas-${ARQUITECTURA}:${IMG_VERSION} -f Dockerfile .
-	docker push ${REGISTRY}/finanzas-${ARQUITECTURA}:${IMG_VERSION}
+	docker build --no-cache -t ${REGISTRY}/finanzas:${IMG_VERSION} -f Dockerfile .
+	docker push ${REGISTRY}/finanzas:${IMG_VERSION}
 
 

src/misfinanzas/settings.py

@@ -32,9 +32,9 @@ SECRET_KEY = 'django-insecure-^9*3@g$5brgjmhv&h!h*)c9kp)8i5tnqee_eu+fi728@g96#8&
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.environ.get('DEBUG', 'False') == 'True'
 
-ALLOWED_HOSTS = [".reymota.es", ".reymota.lab", "127.0.0.1", "localhost", "k8s-server"]
+ALLOWED_HOSTS = [".reymota.es", ".reymota.lab", "127.0.0.1", "localhost", "k8s-server", ".rancher.lab"]
 
-CSRF_TRUSTED_ORIGINS = ["https://*.reymota.es", "http://*.reymota.lab", "http://k8s-server"]
+CSRF_TRUSTED_ORIGINS = ["https://*.reymota.es", "http://*.reymota.lab", "http://k8s-server", "http://*.rancher.lab"]
 
 
 # Application definition