linuxacademy · Teal-Projects · Nov 14, 2019
diff --git a/K8s/descriptors/cart-deployment.yaml b/K8s/descriptors/cart-deployment.yaml
@@ -1,21 +1,24 @@
-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
+    app: cart
   name: cart
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: cart
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: cart
+        app: cart
     spec:
       containers:
       - image: linuxacademycontent/rs-cart:latest

diff --git a/K8s/descriptors/cart-service.yaml b/K8s/descriptors/cart-service.yaml
@@ -6,14 +6,14 @@ metadata:
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
-    io.kompose.service: cart
+    app: cart
   name: cart
 spec:
   ports:
   - name: "8080"
     port: 8080
     targetPort: 8080
   selector:
-    io.kompose.service: cart
+    app: cart
 status:
   loadBalancer: {}
diff --git a/K8s/descriptors/catalogue-deployment.yaml b/K8s/descriptors/catalogue-deployment.yaml
@@ -1,21 +1,24 @@
-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
+    app: catalogue
   name: catalogue
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: catalogue
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: catalogue
+        app: catalogue
     spec:
       containers:
       - image: linuxacademycontent/rs-catalogue:latest

diff --git a/K8s/descriptors/catalogue-service.yaml b/K8s/descriptors/catalogue-service.yaml
@@ -6,14 +6,14 @@ metadata:
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
-    io.kompose.service: catalogue
+    app: catalogue
   name: catalogue
 spec:
   ports:
   - name: "8080"
     port: 8080
     targetPort: 8080
   selector:
-    io.kompose.service: catalogue
+    app: catalogue
 status:
   loadBalancer: {}
diff --git a/K8s/descriptors/dispatch-deployment.yaml b/K8s/descriptors/dispatch-deployment.yaml
@@ -1,21 +1,24 @@
-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
+    app: dispatch
   name: dispatch
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: dispatch
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: dispatch
+        app: dispatch
     spec:
       containers:
       - image: linuxacademycontent/rs-dispatch:latest

diff --git a/K8s/descriptors/dispatch-service.yaml b/K8s/descriptors/dispatch-service.yaml
@@ -6,7 +6,7 @@ metadata:
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
-    io.kompose.service: dispatch
+    app: dispatch
   name: dispatch
 spec:
   clusterIP: None
@@ -15,6 +15,6 @@ spec:
     port: 55555
     targetPort: 0
   selector:
-    io.kompose.service: dispatch
+    app: dispatch
 status:
   loadBalancer: {}
diff --git a/K8s/descriptors/mongodb-deployment.yaml b/K8s/descriptors/mongodb-deployment.yaml
@@ -1,21 +1,24 @@
-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
+    app: mongodb
   name: mongodb
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: mongodb
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: mongodb
+        app: mongodb
     spec:
       containers:
       - image: linuxacademycontent/rs-mongodb:latest

diff --git a/K8s/descriptors/mongodb-service.yaml b/K8s/descriptors/mongodb-service.yaml
@@ -6,14 +6,14 @@ metadata:
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
-    io.kompose.service: mongodb
+    app: mongodb
   name: mongodb
 spec:
   ports:
   - name: "27017"
     port: 27017
     targetPort: 27017
   selector:
-    io.kompose.service: mongodb
+    app: mongodb
 status:
   loadBalancer: {}
diff --git a/K8s/descriptors/mysql-deployment.yaml b/K8s/descriptors/mysql-deployment.yaml
@@ -1,21 +1,24 @@
-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: mysql
+    app: mysql
   name: mysql
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: mysql
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: mysql
+        app: mysql
     spec:
       containers:
       - image: linuxacademycontent/rs-mysql-db:latest

diff --git a/K8s/descriptors/mysql-service.yaml b/K8s/descriptors/mysql-service.yaml
@@ -6,14 +6,14 @@ metadata:
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
-    io.kompose.service: mysql
+    app: mysql
   name: mysql
 spec:
   ports:
   - name: "3306"
     port: 3306
     targetPort: 3306
   selector:
-    io.kompose.service: mysql
+    app: mysql
 status:
   loadBalancer: {}
diff --git a/K8s/descriptors/payment-deployment.yaml b/K8s/descriptors/payment-deployment.yaml
@@ -1,21 +1,24 @@
-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: payment
+    app: payment
   name: payment
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: payment
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: payment
+        app: payment
     spec:
       containers:
       - image: linuxacademycontent/rs-payment:latest

diff --git a/K8s/descriptors/payment-service.yaml b/K8s/descriptors/payment-service.yaml
@@ -6,14 +6,14 @@ metadata:
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
-    io.kompose.service: payment
+    app: payment
   name: payment
 spec:
   ports:
   - name: "8080"
     port: 8080
     targetPort: 8080
   selector:
-    io.kompose.service: payment
+    app: payment
 status:
   loadBalancer: {}
diff --git a/K8s/descriptors/rabbitmq-deployment.yaml b/K8s/descriptors/rabbitmq-deployment.yaml
@@ -1,21 +1,24 @@
-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: rabbitmq
+    app: rabbitmq
   name: rabbitmq
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: rabbitmq
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: rabbitmq
+        app: rabbitmq
     spec:
       containers:
       - image: rabbitmq:3.7-management-alpine

diff --git a/K8s/descriptors/rabbitmq-service.yaml b/K8s/descriptors/rabbitmq-service.yaml
@@ -6,7 +6,7 @@ metadata:
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
-    io.kompose.service: rabbitmq
+    app: rabbitmq
   name: rabbitmq
 spec:
   ports:
@@ -17,6 +17,6 @@ spec:
     port: 15672
     targetPort: 15672
   selector:
-    io.kompose.service: rabbitmq
+    app: rabbitmq
 status:
   loadBalancer: {}
diff --git a/K8s/descriptors/ratings-deployment.yaml b/K8s/descriptors/ratings-deployment.yaml
@@ -1,21 +1,24 @@
-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: ratings
+    app: ratings
   name: ratings
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: ratings
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: ratings
+        app: ratings
     spec:
       containers:
       - image: linuxacademycontent/rs-ratings:latest

diff --git a/K8s/descriptors/ratings-service.yaml b/K8s/descriptors/ratings-service.yaml
@@ -6,14 +6,14 @@ metadata:
     kompose.version: 1.10.0 (8bb0907)
   creationTimestamp: null
   labels:
-    io.kompose.service: ratings
+    app: ratings
   name: ratings
 spec:
   ports:
   - name: "80"
     port: 80
     targetPort: 80
   selector:
-    io.kompose.service: ratings
+    app: ratings
 status:
   loadBalancer: {}
diff --git a/K8s/descriptors/redis-deployment.yaml b/K8s/descriptors/redis-deployment.yaml
@@ -1,21 +1,24 @@
-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: redis
+    app: redis
   name: redis
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: redis
   strategy: {}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        io.kompose.service: redis
+        app: redis
     spec:
       containers:
       - image: redis:4.0.6