[feat/#87] Refactor: pod to deployment

MoaRoom · Aug 31, 2023 · fe015e9 · fe015e9
1 parent fee84cc
commit fe015e9
Show file tree

Hide file tree

Showing 5 changed files with 126 additions and 81 deletions.
diff --git a/resources/images/control-ubuntu/server/res/remote-deploy-professor.yml b/resources/images/control-ubuntu/server/res/remote-deploy-professor.yml
@@ -1,25 +1,34 @@
-apiVersion: v1
-kind: Pod
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: professor-{{ ID }}
   namespace: professor-ns
   labels:
     app: professor-label-{{ ID }}
 spec:
-  containers:
-    - name: professor-{{ ID }}
-      image: ryann3/professor-ubuntu:6.0
-      imagePullPolicy: Always
-      ports:
-        - name: nginx-port
-          containerPort: 80
-        - name: ssh-port
-          containerPort: 22
-        - name: webssh-port
-          containerPort: 8888
-        - name: server-port
-          containerPort: 8001
-      resources: {}
+  replicas: 1
+  selector:
+    matchLabels:
+      app: professor-label-{{ ID }}
+  template:
+    metadata:
+      labels:
+        app: professor-label-{{ ID }}
+    spec:
+      containers:
+        - name: professor-{{ ID }}
+          image: ryann3/professor-ubuntu:6.0
+          imagePullPolicy: Always
+          ports:
+            - name: nginx-port
+              containerPort: 80
+            - name: ssh-port
+              containerPort: 22
+            - name: webssh-port
+              containerPort: 8888
+            - name: server-port
+              containerPort: 8001
+          resources: {}
 ---
 apiVersion: v1
 kind: Service

diff --git a/resources/images/control-ubuntu/server/res/remote-deploy-student.yml b/resources/images/control-ubuntu/server/res/remote-deploy-student.yml
@@ -1,25 +1,34 @@
-apiVersion: v1
-kind: Pod
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: student-{{ ID }}
   namespace: student-ns
   labels:
     app: student-label-{{ ID }}
 spec:
-  containers:
-    - name: student-{{ ID }}
-      image: ryann3/student-ubuntu:6.0
-      imagePullPolicy: Always
-      ports:
-        - name: nginx-port
-          containerPort: 80
-        - name: ssh-port
-          containerPort: 22
-        - name: webssh-port
-          containerPort: 8888
-        - name: server-port
-          containerPort: 8001
-      resources: {}
+  replicas: 1
+  selector:
+    matchLabels:
+      app: student-label-{{ ID }}
+  template:
+    metadata:
+      labels:
+        app: student-label-{{ ID }}
+    spec:
+      containers:
+        - name: student-{{ ID }}
+          image: ryann3/student-ubuntu:6.0
+          imagePullPolicy: Always
+          ports:
+            - name: nginx-port
+              containerPort: 80
+            - name: ssh-port
+              containerPort: 22
+            - name: webssh-port
+              containerPort: 8888
+            - name: server-port
+              containerPort: 8001
+          resources: {}
 ---
 apiVersion: v1
 kind: Service

diff --git a/resources/yamls/deploy-control-ubuntu.yml b/resources/yamls/deploy-control-ubuntu.yml
@@ -47,29 +47,38 @@ roleRef:
   kind: ClusterRole
   name: access-to-apiserver-cr
 ---
-apiVersion: v1
-kind: Pod
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: control-ubuntu
   namespace: control-ns
   labels:
     app: control-label
 spec:
-  containers:
-    - name: control-ubuntu
-      image: ryann3/control-ubuntu:5.0
-      imagePullPolicy: Always
-      ports:
-        - name: nginx-port
-          containerPort: 80
-        - name: ssh-port
-          containerPort: 22
-        - name: server-port
-          containerPort: 8003
-        - name: webssh-port
-          containerPort: 8886
-      resources: {}
-  serviceAccountName: access-to-apiserver-sa
+  replicas: 1
+  selector:
+    matchLabels:
+      app: control-label
+  template:
+    metadata:
+      labels:
+        app: control-label
+    spec:
+      containers:
+        - name: control-ubuntu
+          image: ryann3/control-ubuntu:5.0
+          imagePullPolicy: Always
+          ports:
+            - name: nginx-port
+              containerPort: 80
+            - name: ssh-port
+              containerPort: 22
+            - name: server-port
+              containerPort: 8003
+            - name: webssh-port
+              containerPort: 8886
+          resources: {}
+      serviceAccountName: access-to-apiserver-sa
 ---
 apiVersion: v1
 kind: Service

diff --git a/resources/yamls/deploy-professor-ubuntu.yml b/resources/yamls/deploy-professor-ubuntu.yml
@@ -1,25 +1,34 @@
-apiVersion: v1
-kind: Pod
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: professor-ubuntu
   namespace: professor-ns
   labels:
     app: professor-label
 spec:
-  containers:
-    - name: professor-ubuntu
-      image: ryann3/professor-ubuntu:5.0
-      imagePullPolicy: Always
-      ports:
-        - name: nginx-port
-          containerPort: 80
-        - name: ssh-port
-          containerPort: 22
-        - name: webssh-port
-          containerPort: 8887
-        - name: server-port
-          containerPort: 8002
-      resources: {}
+  replicas: 1
+  selector:
+    matchLabels:
+      app: professor-label
+  template:
+    metadata:
+      labels:
+        app: professor-label
+    spec:
+      containers:
+        - name: professor-ubuntu
+          image: ryann3/professor-ubuntu:5.0
+          imagePullPolicy: Always
+          ports:
+            - name: nginx-port
+              containerPort: 80
+            - name: ssh-port
+              containerPort: 22
+            - name: webssh-port
+              containerPort: 8887
+            - name: server-port
+              containerPort: 8002
+          resources: {}
 ---
 apiVersion: v1
 kind: Service

diff --git a/resources/yamls/deploy-student-ubuntu.yml b/resources/yamls/deploy-student-ubuntu.yml
@@ -1,25 +1,34 @@
-apiVersion: v1
-kind: Pod
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: student-ubuntu
   namespace: student-ns
   labels:
     app: student-label
 spec:
-  containers:
-    - name: student-ubuntu
-      image: ryann3/student-ubuntu:5.0
-      imagePullPolicy: Always
-      ports:
-        - name: nginx-port
-          containerPort: 80
-        - name: ssh-port
-          containerPort: 22
-        - name: webssh-port
-          containerPort: 8888
-        - name: server-port
-          containerPort: 8001
-      resources: {}
+  replicas: 1
+  selector:
+    matchLabels:
+      app: student-label
+  template:
+    metadata:
+      labels:
+        app: student-label
+    spec:
+      containers:
+        - name: student-ubuntu
+          image: ryann3/student-ubuntu:5.0
+          imagePullPolicy: Always
+          ports:
+            - name: nginx-port
+              containerPort: 80
+            - name: ssh-port
+              containerPort: 22
+            - name: webssh-port
+              containerPort: 8888
+            - name: server-port
+              containerPort: 8001
+          resources: {}
 ---
 apiVersion: v1
 kind: Service