Pongo namespace en lyrics y repostajes

LyricsPy/K8S/Makefile

@@ -6,6 +6,7 @@ imagen:
 	cd ../servicios; make
 
 install:
+	-kubectl create -f namespace.yaml
 	-kubectl create -f pv-local-lyrics.yaml
 	-kubectl create -f lyrics-prod-persistentvolumeclaim.yaml
 	-envsubst < lyrics-deployment.yaml |kubectl create -f -
@@ -14,3 +15,4 @@ clean:
 	-envsubst < lyrics-deployment.yaml |kubectl delete -f -
 	-kubectl delete -f lyrics-prod-persistentvolumeclaim.yaml
 	-kubectl delete -f pv-local-lyrics.yaml
+	-kubectl delete -f namespace.yaml

LyricsPy/K8S/lyrics-deployment.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: lyrics
+  namespace: lyrics
 spec:
   type: NodePort
   ports:
@@ -16,6 +17,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: lyrics
+  namespace: lyrics
   labels:
     app: lyrics
 spec:

LyricsPy/K8S/lyrics-prod-persistentvolumeclaim.yaml

@@ -5,6 +5,7 @@ metadata:
   labels:
     io.kompose.service: lyrics-prod
   name: lyrics-prod
+  namespace: lyrics
 spec:
   accessModes:
     - ReadWriteOnce

LyricsPy/K8S/namespace.yaml

@@ -0,0 +1,8 @@
+###################################################
+# Namespace lyrics
+###################################################
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: lyrics
+

LyricsPy/K8S/pv-local-lyrics.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: lyrics-app-folder
+  namespace: lyrics
   labels:
     app: lyrics
 spec:

RepostajesPy/K8S/Makefile

@@ -7,6 +7,7 @@ imagen:
 	cd ../servicios; make
 
 install:
+	-kubectl create -f namespace.yaml
 	-kubectl create -f pv-local-repostajes.yaml
 	-kubectl create -f repostajes-prod-persistentvolumeclaim.yaml
 	-envsubst < repostajes-deployment.yaml |kubectl create -f -
@@ -15,6 +16,7 @@ clean:
 	-envsubst < repostajes-deployment.yaml |kubectl delete -f -
 	-kubectl delete -f repostajes-prod-persistentvolumeclaim.yaml
 	-kubectl delete -f pv-local-repostajes.yaml
+	-kubectl detele -f namespace.yaml
 
 prueba:
 	@echo $(VERSION)

RepostajesPy/K8S/entra.sh

@@ -1 +1 @@
-kubectl exec -ti deployment.apps/repostajespy -- /bin/bash
+kubectl -n repostajes exec -ti deployment.apps/repostajespy -- /bin/bash

RepostajesPy/K8S/namespace.yaml

@@ -0,0 +1,8 @@
+###################################################
+# Namespace repostajes
+###################################################
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: repostajes
+

RepostajesPy/K8S/pv-local-repostajes.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: repostajespy-instance-folder
+  namespace: repostajes
   labels:
     app: repostajespy
 spec:
@@ -16,6 +17,7 @@ apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: repostajespy-migrations-folder
+  namespace: repostajes
   labels:
     app: repostajespy
 spec:

RepostajesPy/K8S/repostajes-deployment.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: repostajespy
+  namespace: repostajes
 spec:
   type: NodePort
   ports:
@@ -16,6 +17,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: repostajespy
+  namespace: repostajes
   labels:
     app: repostajespy
 spec:

RepostajesPy/K8S/repostajes-prod-persistentvolumeclaim.yaml

@@ -5,6 +5,7 @@ metadata:
   labels:
     io.kompose.service: repostajespy-instance
   name: repostajespy-instance
+  namespace: repostajes
 spec:
   accessModes:
     - ReadWriteOnce
@@ -20,6 +21,7 @@ metadata:
   labels:
     io.kompose.service: repostajespy-migrations
   name: repostajespy-migrations
+  namespace: repostajes
 spec:
   accessModes:
     - ReadWriteOnce

ReymotaApps/accounts/admin.py

@@ -1,42 +0,0 @@
-from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin
-
-# Register your models here.
-
-
-from .models import ReyMotaUser
-from .forms import ReyMotaUserCreationForm, ReyMotaUserChangeForm
-
-class ReyMotaUserAdmin(UserAdmin):
-    add_form = ReyMotaUserCreationForm
-    form = ReyMotaUserChangeForm
-    model = ReyMotaUser
-    list_display = ("email", "nombre", "is_staff", "is_active", "foto")
-    list_filter = ("email", "nombre", "is_staff", "is_active",)
-    fieldsets = (
-        (None, {"fields": ("email", "password")}),
-        ("Personal", {"fields": ("nombre",)}),
-        ("Permissions", {"fields": ("is_staff", "is_active", "groups",
-                                    "user_permissions")}),
-        ("Varios", {"fields": ("foto",)}),
-    )
-    add_fieldsets = (
-        (
-            None,
-            {
-                "classes": ("wide",),
-                "fields": (
-                    "email", "password1", "password2", "is_staff",
-                    "is_active", "groups", "user_permissions"
-                )
-            }
-        ),
-
-        ("Personal", {"fields": ("nombre",)}),
-        ("Varios", {"fields": ("foto",)}),
-    )
-    search_fields = ("email",)
-    ordering = ("email",)
-
-
-admin.site.register(ReyMotaUser, ReyMotaUserAdmin)

ReymotaApps/accounts/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class AccountsConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'accounts'

ReymotaApps/accounts/forms.py

@@ -1,19 +0,0 @@
-from django import forms
-from django.contrib.auth.forms import UserCreationForm, UserChangeForm
-
-from .models import ReyMotaUser
-
-
-class ReyMotaUserCreationForm(UserCreationForm):
-
-    class Meta:
-        model = ReyMotaUser
-        fields = ("email", "nombre", "foto")
-        labels = {'email': 'Dirección de correo'}
-
-
-class ReyMotaUserChangeForm(UserChangeForm):
-
-    class Meta:
-        model = ReyMotaUser
-        fields = ("email", "foto")

ReymotaApps/accounts/managers.py

@@ -1,34 +0,0 @@
-from django.contrib.auth.base_user import BaseUserManager
-from django.utils.translation import gettext_lazy as _
-
-
-class ReyMotaUserManager(BaseUserManager):
-    """
-    ReyMota user model manager where email is the unique identifiers
-    for authentication instead of usernames.
-    """
-    def create_user(self, email, password, **extra_fields):
-        """
-        Create and save a user with the given email and password.
-        """
-        if not email:
-            raise ValueError(_("The Email must be set"))
-        email = self.normalize_email(email)
-        user = self.model(email=email, **extra_fields)
-        user.set_password(password)
-        user.save()
-        return user
-
-    def create_superuser(self, email, password, **extra_fields):
-        """
-        Create and save a SuperUser with the given email and password.
-        """
-        extra_fields.setdefault("is_staff", True)
-        extra_fields.setdefault("is_superuser", True)
-        extra_fields.setdefault("is_active", True)
-
-        if extra_fields.get("is_staff") is not True:
-            raise ValueError(_("Superuser must have is_staff=True."))
-        if extra_fields.get("is_superuser") is not True:
-            raise ValueError(_("Superuser must have is_superuser=True."))
-        return self.create_user(email, password, **extra_fields)

ReymotaApps/accounts/migrations/0001_initial.py

@@ -1,34 +0,0 @@
-# Generated by Django 5.1 on 2024-08-26 13:03
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('auth', '0012_alter_user_first_name_max_length'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ReyMotaUser',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-                ('email', models.EmailField(max_length=254, unique=True, verbose_name='email address')),
-                ('foto', models.ImageField(blank=True, upload_to='profile_images')),
-                ('is_staff', models.BooleanField(default=False)),
-                ('is_active', models.BooleanField(default=True)),
-                ('nombre', models.CharField(blank=True, max_length=200, null=True)),
-                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
-                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
-            ],
-            options={
-                'abstract': False,
-            },
-        ),
-    ]

ReymotaApps/accounts/models.py

@@ -1,25 +0,0 @@
-from django.db import models
-from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin
-from django.utils.translation import gettext_lazy as _
-
-from .managers import ReyMotaUserManager
-
-
-# Create your models here.
-
-
-class ReyMotaUser(AbstractBaseUser, PermissionsMixin):
-    email = models.EmailField(_("email address"), unique=True)
-    foto = models.ImageField(upload_to="profile_images", blank=True)
-    is_staff = models.BooleanField(default=False)
-    is_active = models.BooleanField(default=True)
-    nombre = models.CharField(max_length=200, blank=True, null=True)
-
-    USERNAME_FIELD = "email"
-    REQUIRED_FIELDS = []
-
-    objects = ReyMotaUserManager()
-
-    def __str__(self):
-        return self.email
-

ReymotaApps/accounts/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

ReymotaApps/accounts/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

ReymotaApps/libros/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

ReymotaApps/libros/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class LibrosConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'libros'

ReymotaApps/libros/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

ReymotaApps/libros/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

ReymotaApps/libros/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

ReymotaApps/lyrics/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

ReymotaApps/lyrics/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class LyricsConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'lyrics'

ReymotaApps/lyrics/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

ReymotaApps/lyrics/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

ReymotaApps/lyrics/views.py

@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.

ReymotaApps/manage.py

@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-"""Django's command-line utility for administrative tasks."""
-import os
-import sys
-
-
-def main():
-    """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'reymotasite.settings')
-    try:
-        from django.core.management import execute_from_command_line
-    except ImportError as exc:
-        raise ImportError(
-            "Couldn't import Django. Are you sure it's installed and "
-            "available on your PYTHONPATH environment variable? Did you "
-            "forget to activate a virtual environment?"
-        ) from exc
-    execute_from_command_line(sys.argv)
-
-
-if __name__ == '__main__':
-    main()

ReymotaApps/reymotasite/asgi.py

@@ -1,16 +0,0 @@
-"""
-ASGI config for reymotasite project.
-
-It exposes the ASGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/5.1/howto/deployment/asgi/
-"""
-
-import os
-
-from django.core.asgi import get_asgi_application
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'reymotasite.settings')
-
-application = get_asgi_application()

ReymotaApps/reymotasite/settings.py

@@ -1,130 +0,0 @@
-"""
-Django settings for reymotasite project.
-
-Generated by 'django-admin startproject' using Django 5.1.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/5.1/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/5.1/ref/settings/
-"""
-
-from pathlib import Path
-
-# Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
-
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/5.1/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'django-insecure-!(tnryimm@evy66-mw164t#=%82c3poc@q24n8pk-8%2q=#b%e'
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = []
-
-
-# Application definition
-
-INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-
-    'accounts',
-    'libros',
-    'lyrics',
-]
-
-MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-]
-
-ROOT_URLCONF = 'reymotasite.urls'
-
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-            ],
-        },
-    },
-]
-
-WSGI_APPLICATION = 'reymotasite.wsgi.application'
-
-
-# Database
-# https://docs.djangoproject.com/en/5.1/ref/settings/#databases
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
-    }
-}
-
-
-# Password validation
-# https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
-]
-
-
-# Internationalization
-# https://docs.djangoproject.com/en/5.1/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-
-TIME_ZONE = 'UTC'
-
-USE_I18N = True
-
-USE_TZ = True
-
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/5.1/howto/static-files/
-
-STATIC_URL = 'static/'
-
-# Default primary key field type
-# https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field
-
-DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-
-AUTH_USER_MODEL = "accounts.ReyMotaUser"
-

ReymotaApps/reymotasite/urls.py

@@ -1,22 +0,0 @@
-"""
-URL configuration for reymotasite project.
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/5.1/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  path('', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
-Including another URLconf
-    1. Import the include() function: from django.urls import include, path
-    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
-"""
-from django.contrib import admin
-from django.urls import path
-
-urlpatterns = [
-    path('admin/', admin.site.urls),
-]

ReymotaApps/reymotasite/wsgi.py

@@ -1,16 +0,0 @@
-"""
-WSGI config for reymotasite project.
-
-It exposes the WSGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/5.1/howto/deployment/wsgi/
-"""
-
-import os
-
-from django.core.wsgi import get_wsgi_application
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'reymotasite.settings')
-
-application = get_wsgi_application()