From b032d4b2f8896711376e25cbc996d49d2ac0d1b7 Mon Sep 17 00:00:00 2001
From: Vaibhav Gawad <58821506+vaibhav31s@users.noreply.github.com>
Date: Sun, 23 Jul 2023 03:04:53 +0530
Subject: [PATCH 1/2] ss

---
 deployment.yaml => k8s/deployment.yaml |  0
 namespace.yaml => k8s/namespace.yaml   |  0
 service.yaml => k8s/service.yaml       |  0
 k8s/serviceAccount.yaml                | 45 ++++++++++++++++++++++++++
 volume.yaml => k8s/volume.yaml         |  0
 serviceAccount.yaml                    | 30 -----------------
 6 files changed, 45 insertions(+), 30 deletions(-)
 rename deployment.yaml => k8s/deployment.yaml (100%)
 rename namespace.yaml => k8s/namespace.yaml (100%)
 rename service.yaml => k8s/service.yaml (100%)
 create mode 100644 k8s/serviceAccount.yaml
 rename volume.yaml => k8s/volume.yaml (100%)
 delete mode 100644 serviceAccount.yaml

diff --git a/deployment.yaml b/k8s/deployment.yaml
similarity index 100%
rename from deployment.yaml
rename to k8s/deployment.yaml
diff --git a/namespace.yaml b/k8s/namespace.yaml
similarity index 100%
rename from namespace.yaml
rename to k8s/namespace.yaml
diff --git a/service.yaml b/k8s/service.yaml
similarity index 100%
rename from service.yaml
rename to k8s/service.yaml
diff --git a/k8s/serviceAccount.yaml b/k8s/serviceAccount.yaml
new file mode 100644
index 0000000..d56eb7d
--- /dev/null
+++ b/k8s/serviceAccount.yaml
@@ -0,0 +1,45 @@
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+  name: local-storage
+provisioner: kubernetes.io/no-provisioner
+volumeBindingMode: WaitForFirstConsumer
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: jenkins-pv-volume
+  labels:
+    type: local
+spec:
+  storageClassName: local-storage
+  claimRef:
+    name: jenkins-pv-claim
+    namespace: devops-tools
+  capacity:
+    storage: 10Gi
+  accessModes:
+    - ReadWriteOnce
+  local:
+    path: /mnt
+  nodeAffinity:
+    required:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: kubernetes.io/hostname
+          operator: In
+          values:
+          - worker-node01
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: jenkins-pv-claim
+  namespace: devops-tools
+spec:
+  storageClassName: local-storage
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 3Gi
\ No newline at end of file
diff --git a/volume.yaml b/k8s/volume.yaml
similarity index 100%
rename from volume.yaml
rename to k8s/volume.yaml
diff --git a/serviceAccount.yaml b/serviceAccount.yaml
deleted file mode 100644
index 75245c1..0000000
--- a/serviceAccount.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: jenkins-admin
-rules:
-  - apiGroups: [""]
-    resources: ["*"]
-    verbs: ["*"]
-
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: jenkins-admin
-  namespace: devops-tools
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: jenkins-admin
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: jenkins-admin
-subjects:
-- kind: ServiceAccount
-  name: jenkins-admin
-  namespace: devops-tools
\ No newline at end of file

From f526dcd123148b8bd7e577b52b3ed145462a6e83 Mon Sep 17 00:00:00 2001
From: Vaibhav Gawad <58821506+vaibhav31s@users.noreply.github.com>
Date: Tue, 8 Aug 2023 02:55:49 +0530
Subject: [PATCH 2/2] Update serviceAccount.yaml

---
 k8s/serviceAccount.yaml | 63 ++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 39 deletions(-)

diff --git a/k8s/serviceAccount.yaml b/k8s/serviceAccount.yaml
index d56eb7d..7ca4c94 100644
--- a/k8s/serviceAccount.yaml
+++ b/k8s/serviceAccount.yaml
@@ -1,45 +1,30 @@
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
 metadata:
-  name: local-storage
-provisioner: kubernetes.io/no-provisioner
-volumeBindingMode: WaitForFirstConsumer
+  name: jenkins-admin
+rules:
+  - apiGroups: [""]
+    resources: ["*"]
+    verbs: ["*"]
+
 ---
 apiVersion: v1
-kind: PersistentVolume
+kind: ServiceAccount
 metadata:
-  name: jenkins-pv-volume
-  labels:
-    type: local
-spec:
-  storageClassName: local-storage
-  claimRef:
-    name: jenkins-pv-claim
-    namespace: devops-tools
-  capacity:
-    storage: 10Gi
-  accessModes:
-    - ReadWriteOnce
-  local:
-    path: /mnt
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: kubernetes.io/hostname
-          operator: In
-          values:
-          - worker-node01
+  name: jenkins-admin
+  namespace: jenkins
+
 ---
-apiVersion: v1
-kind: PersistentVolumeClaim
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
 metadata:
-  name: jenkins-pv-claim
-  namespace: devops-tools
-spec:
-  storageClassName: local-storage
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 3Gi
\ No newline at end of file
+  name: jenkins-admin
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: jenkins-admin
+subjects:
+- kind: ServiceAccount
+  name: jenkins-admin
+  namespace: jenkins