linuxacademy · folksy2004 · Feb 3, 2026 · Feb 3, 2026 · Feb 4, 2026
diff --git a/K8s/descriptors/.web-service.yaml.swo b/K8s/descriptors/.web-service.yaml.swo
diff --git a/K8s/descriptors/cart-deployment.yaml b/K8s/descriptors/cart-deployment.yaml
@@ -1,38 +1,48 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: kompose -f ../docker-compose.yaml convert
-    kompose.version: 1.10.0 (8bb0907)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: cart
   name: cart
+  namespace: robot-shop
+<<<<<<< HEAD
+=======
+  labels:
+    app: cart
+>>>>>>> 8a6c13d (Your commit message)
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+<<<<<<< HEAD
+      io.kompose.service: cart
+=======
+      app: cart
+>>>>>>> 8a6c13d (Your commit message)
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: cart
+        app: cart
     spec:
       containers:
-      - image: linuxacademycontent/rs-cart:latest
-        name: cart
-        env:
-          - name: INSTANA_AGENT_HOST
-            valueFrom:
-              fieldRef:
-                fieldPath: status.hostIP
+      - name: cart
+<<<<<<< HEAD
+        image: cart:latest
         ports:
         - containerPort: 8080
+=======
+        image: linuxacademycontent/rs-cart:latest
+        ports:
+        - containerPort: 8080
+        env:
+        - name: INSTANA_AGENT_HOST
+          valueFrom:
+            fieldRef:
+              fieldPath: status.hostIP
         resources:
           limits:
-            cpu: 200m
-            memory: 100Mi
+            cpu: "200m"
+            memory: "100Mi"
           requests:
-            cpu: 100m
-            memory: 50Mi
-      restartPolicy: Always
-status: {}
+            cpu: "100m"
+            memory: "50Mi"
+
+>>>>>>> 8a6c13d (Your commit message)
diff --git a/K8s/descriptors/cart-service.yaml b/K8s/descriptors/cart-service.yaml
@@ -1,19 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: kompose -f ../docker-compose.yaml convert
-    kompose.version: 1.10.0 (8bb0907)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: cart
   name: cart
+  namespace: robot-shop
 spec:
-  ports:
-  - name: "8080"
-    port: 8080
-    targetPort: 8080
   selector:
-    io.kompose.service: cart
-status:
-  loadBalancer: {}
+    app: cart
+  ports:
+    - protocol: TCP
+      port: 8080
+      targetPort: 8080
+  type: ClusterIP
+
diff --git a/K8s/descriptors/catalogue-deployment.yaml b/K8s/descriptors/catalogue-deployment.yaml
@@ -1,38 +1,48 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: kompose -f ../docker-compose.yaml convert
-    kompose.version: 1.10.0 (8bb0907)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: catalogue
   name: catalogue
+  namespace: robot-shop
+<<<<<<< HEAD
+=======
+  labels:
+    app: catalogue
+>>>>>>> 8a6c13d (Your commit message)
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+<<<<<<< HEAD
+      io.kompose.service: catalogue
+=======
+      app: catalogue
+>>>>>>> 8a6c13d (Your commit message)
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: catalogue
+        app: catalogue
     spec:
       containers:
-      - image: linuxacademycontent/rs-catalogue:latest
-        name: catalogue
-        env:
-          - name: INSTANA_AGENT_HOST
-            valueFrom:
-              fieldRef:
-                fieldPath: status.hostIP
+      - name: catalogue
+<<<<<<< HEAD
+        image: catalogue:latest
         ports:
         - containerPort: 8080
+=======
+        image: linuxacademycontent/rs-catalogue:latest
+        ports:
+        - containerPort: 8080
+        env:
+        - name: INSTANA_AGENT_HOST
+          valueFrom:
+            fieldRef:
+              fieldPath: status.hostIP
         resources:
           limits:
-            cpu: 200m
-            memory: 100Mi
+            cpu: "200m"
+            memory: "100Mi"
           requests:
-            cpu: 100m
-            memory: 50Mi
-      restartPolicy: Always
-status: {}
+            cpu: "100m"
+            memory: "50Mi"
+
+>>>>>>> 8a6c13d (Your commit message)
diff --git a/K8s/descriptors/catalogue-service.yaml b/K8s/descriptors/catalogue-service.yaml
@@ -1,19 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: kompose -f ../docker-compose.yaml convert
-    kompose.version: 1.10.0 (8bb0907)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: catalogue
   name: catalogue
+  namespace: robot-shop
 spec:
-  ports:
-  - name: "8080"
-    port: 8080
-    targetPort: 8080
   selector:
-    io.kompose.service: catalogue
-status:
-  loadBalancer: {}
+    app: catalogue
+  ports:
+    - protocol: TCP
+      port: 8080
+      targetPort: 8080
+  type: ClusterIP
+
diff --git a/K8s/descriptors/dispatch-deployment.yaml b/K8s/descriptors/dispatch-deployment.yaml
@@ -1,36 +1,48 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: kompose -f ../docker-compose.yaml convert
-    kompose.version: 1.10.0 (8bb0907)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: dispatch
   name: dispatch
+  namespace: robot-shop
+<<<<<<< HEAD
+=======
+  labels:
+    app: dispatch
+>>>>>>> 8a6c13d (Your commit message)
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+<<<<<<< HEAD
+      io.kompose.service: dispatch
+=======
+      app: dispatch
+>>>>>>> 8a6c13d (Your commit message)
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: dispatch
+        app: dispatch
     spec:
       containers:
-      - image: linuxacademycontent/rs-dispatch:latest
-        name: dispatch
+      - name: dispatch
+<<<<<<< HEAD
+        image: dispatch:latest
+        ports:
+        - containerPort: 8080
+=======
+        image: linuxacademycontent/rs-dispatch:latest
+        ports:
+        - containerPort: 8080
         env:
-          - name: INSTANA_AGENT_HOST
-            valueFrom:
-              fieldRef:
-                fieldPath: status.hostIP
+        - name: INSTANA_AGENT_HOST
+          valueFrom:
+            fieldRef:
+              fieldPath: status.hostIP
         resources:
           limits:
-            cpu: 200m
-            memory: 100Mi
+            cpu: "200m"
+            memory: "100Mi"
           requests:
-            cpu: 100m
-            memory: 50Mi
-      restartPolicy: Always
-status: {}
+            cpu: "100m"
+            memory: "50Mi"
+
+>>>>>>> 8a6c13d (Your commit message)
diff --git a/K8s/descriptors/dispatch-service.yaml b/K8s/descriptors/dispatch-service.yaml
@@ -1,20 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: kompose -f ../docker-compose.yaml convert
-    kompose.version: 1.10.0 (8bb0907)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: dispatch
   name: dispatch
+  namespace: robot-shop
 spec:
-  clusterIP: None
-  ports:
-  - name: headless
-    port: 55555
-    targetPort: 0
   selector:
-    io.kompose.service: dispatch
-status:
-  loadBalancer: {}
+    app: dispatch
+  ports:
+    - protocol: TCP
+      port: 8080
+      targetPort: 8080
+  type: ClusterIP
+
diff --git a/K8s/descriptors/mongodb-deployment.yaml b/K8s/descriptors/mongodb-deployment.yaml
@@ -1,33 +1,44 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: kompose -f ../docker-compose.yaml convert
-    kompose.version: 1.10.0 (8bb0907)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: mongodb
   name: mongodb
+  namespace: robot-shop
+<<<<<<< HEAD
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      io.kompose.service: mongodb
+=======
+  labels:
+    app: mongodb
+spec:
+  replicas: 3  # <--- increase number of pods
+  selector:
+    matchLabels:
+      app: mongodb
+>>>>>>> 8a6c13d (Your commit message)
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: mongodb
+        app: mongodb
     spec:
       containers:
-      - image: linuxacademycontent/rs-mongodb:latest
-        name: mongodb
+      - name: mongodb
+<<<<<<< HEAD
+        image: mongo:latest
+        ports:
+        - containerPort: 27017
+=======
+        image: linuxacademycontent/rs-mongodb:latest
         ports:
         - containerPort: 27017
         resources:
           limits:
-            cpu: 200m
-            memory: 100Mi
+            cpu: "200m"
+            memory: "100Mi"
           requests:
-            cpu: 100m
-            memory: 50Mi
-      restartPolicy: Always
-status: {}
+            cpu: "100m"
+            memory: "50Mi"
+
+>>>>>>> 8a6c13d (Your commit message)
diff --git a/K8s/descriptors/mongodb-service.yaml b/K8s/descriptors/mongodb-service.yaml
@@ -1,19 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: kompose -f ../docker-compose.yaml convert
-    kompose.version: 1.10.0 (8bb0907)
-  creationTimestamp: null
-  labels:
-    io.kompose.service: mongodb
   name: mongodb
+  namespace: robot-shop
 spec:
-  ports:
-  - name: "27017"
-    port: 27017
-    targetPort: 27017
   selector:
-    io.kompose.service: mongodb
-status:
-  loadBalancer: {}
+    app: mongodb
+  ports:
+    - protocol: TCP
+      port: 27017
+      targetPort: 27017
+  type: ClusterIP
+