From 2653773529bfdb527ba8a1884007d065ab6e0d9b Mon Sep 17 00:00:00 2001
From: Celestino Rey <creylopez@yahoo.es>
Date: Tue, 3 Jun 2025 16:08:38 +0200
Subject: [PATCH] Renombro yamls

---
 Imagen/Dockerfile                             |  3 ++-
 Makefile                                      | 26 +++++++++----------
 namespace.yaml => jenkins-05-namespace.yaml   |  0
 ...unt.yaml => jenkins-10-serviceAccount.yaml |  0
 jenkins-20-storage-class.yaml                 |  6 +++++
 jenkins-02-pvc.yaml => jenkins-21-pvc.yaml    |  0
 ...s-02-volume.yaml => jenkins-25-volume.yaml | 20 --------------
 ...loyment.yaml => jenkins-30-deployment.yaml |  0
 ...04-service.yaml => jenkins-40-service.yaml |  0
 ...05-ingress.yaml => jenkins-50-ingress.yaml |  0
 10 files changed, 21 insertions(+), 34 deletions(-)
 rename namespace.yaml => jenkins-05-namespace.yaml (100%)
 rename jenkins-01-serviceAccount.yaml => jenkins-10-serviceAccount.yaml (100%)
 create mode 100644 jenkins-20-storage-class.yaml
 rename jenkins-02-pvc.yaml => jenkins-21-pvc.yaml (100%)
 rename jenkins-02-volume.yaml => jenkins-25-volume.yaml (57%)
 rename jenkins-03-deployment.yaml => jenkins-30-deployment.yaml (100%)
 rename jenkins-04-service.yaml => jenkins-40-service.yaml (100%)
 rename jenkins-05-ingress.yaml => jenkins-50-ingress.yaml (100%)

diff --git a/Imagen/Dockerfile b/Imagen/Dockerfile
index 01be326..caa0393 100644
--- a/Imagen/Dockerfile
+++ b/Imagen/Dockerfile
@@ -1,5 +1,6 @@
 # Use Jenkins base image
-FROM jenkins/jenkins:latest
+# FROM jenkins/jenkins:latest
+FROM jenkins/jenkins:lts
 
 # Switch to root user
 USER root
diff --git a/Makefile b/Makefile
index dd99dda..a85c581 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':')
 export REGISTRY=registry.reymota.es
-export IMG_VERSION = 1.20
+export IMG_VERSION = 1.21
 
 # limpia todo
 all: imagen clean install
@@ -9,20 +9,20 @@ imagen:
 	cd Imagen/; make
 
 install:
-	-kubectl create -f namespace.yaml
+	-kubectl create -f jenkins-05-namespace.yaml
 	-kubectl create -f reg-secret.yaml
-	-kubectl create -f jenkins-01-serviceAccount.yaml
+	-kubectl create -f jenkins-10-serviceAccount.yaml
 
-	-kubectl create -f jenkins-02-volume.yaml
-	-envsubst < jenkins-03-deployment.yaml |kubectl create -f -
-	-kubectl create -f jenkins-04-service.yaml
-	-kubectl create -f jenkins-05-ingress.yaml
+	-kubectl create -f jenkins-25-volume.yaml
+	-envsubst < jenkins-30-deployment.yaml |kubectl create -f -
+	-kubectl create -f jenkins-40-service.yaml
+	-kubectl create -f jenkins-50-ingress.yaml
 
 clean:
-	-kubectl delete -f jenkins-05-ingress.yaml
-	-kubectl delete -f jenkins-04-service.yaml
-	-envsubst < jenkins-03-deployment.yaml |kubectl delete -f -
-	-kubectl delete -f jenkins-02-volume.yaml
-	-kubectl delete -f jenkins-01-serviceAccount.yaml
+	-kubectl delete -f jenkins-50-ingress.yaml
+	-kubectl delete -f jenkins-40-service.yaml
+	-envsubst < jenkins-30-deployment.yaml |kubectl delete -f -
+	-kubectl delete -f jenkins-25-volume.yaml
+	-kubectl delete -f jenkins-10-serviceAccount.yaml
 	-kubectl delete -f reg-secret.yaml
-	-kubectl delete -f namespace.yaml
+	-kubectl delete -f jenkins-05-namespace.yaml
diff --git a/namespace.yaml b/jenkins-05-namespace.yaml
similarity index 100%
rename from namespace.yaml
rename to jenkins-05-namespace.yaml
diff --git a/jenkins-01-serviceAccount.yaml b/jenkins-10-serviceAccount.yaml
similarity index 100%
rename from jenkins-01-serviceAccount.yaml
rename to jenkins-10-serviceAccount.yaml
diff --git a/jenkins-20-storage-class.yaml b/jenkins-20-storage-class.yaml
new file mode 100644
index 0000000..75615c3
--- /dev/null
+++ b/jenkins-20-storage-class.yaml
@@ -0,0 +1,6 @@
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: local-path
+provisioner: kubernetes.io/no-provisioner
+volumeBindingMode: WaitForFirstConsumer
diff --git a/jenkins-02-pvc.yaml b/jenkins-21-pvc.yaml
similarity index 100%
rename from jenkins-02-pvc.yaml
rename to jenkins-21-pvc.yaml
diff --git a/jenkins-02-volume.yaml b/jenkins-25-volume.yaml
similarity index 57%
rename from jenkins-02-volume.yaml
rename to jenkins-25-volume.yaml
index f7ae6c5..0e122a1 100644
--- a/jenkins-02-volume.yaml
+++ b/jenkins-25-volume.yaml
@@ -1,10 +1,3 @@
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  name: local-path
-provisioner: kubernetes.io/no-provisioner
-volumeBindingMode: WaitForFirstConsumer
----
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -30,16 +23,3 @@ spec:
           operator: In
           values:
           - lima-rancher-desktop
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: jenkins-pv-claim
-  namespace: devops-tools
-spec:
-  storageClassName: local-path
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 3Gi
diff --git a/jenkins-03-deployment.yaml b/jenkins-30-deployment.yaml
similarity index 100%
rename from jenkins-03-deployment.yaml
rename to jenkins-30-deployment.yaml
diff --git a/jenkins-04-service.yaml b/jenkins-40-service.yaml
similarity index 100%
rename from jenkins-04-service.yaml
rename to jenkins-40-service.yaml
diff --git a/jenkins-05-ingress.yaml b/jenkins-50-ingress.yaml
similarity index 100%
rename from jenkins-05-ingress.yaml
rename to jenkins-50-ingress.yaml