tidy up K8s descriptors

K8s/descriptors/cart-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: cart
@@ -6,14 +6,17 @@ metadata:
     service: cart
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      service: cart
   template:
     metadata:
       labels:
         service: cart
     spec:
       containers:
-      - image: robotshop/rs-cart:latest
+      - name: cart
-        name: cart
+        image: robotshop/rs-cart:latest
         # agent networking access 
         env:
           - name: INSTANA_AGENT_HOST

K8s/descriptors/cart-service.yaml

@@ -4,7 +4,8 @@ metadata:
   name: cart
 spec:
   ports:
-  - port: 8080
+  - name: http
+    port: 8080
     targetPort: 8080
   selector:
-    app: cart
+    service: cart

K8s/descriptors/catalogue-deployment.yaml

@@ -1,19 +1,22 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: catalogue
   labels:
     service: catalogue
-  name: catalogue
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      service: catalogue
   template:
     metadata:
       labels:
         service: catalogue
     spec:
       containers:
-      - image: robotshop/rs-catalogue:latest
+      - name: catalogue
-        name: catalogue
+        image: robotshop/rs-catalogue:latest
         env:
           - name: INSTANA_AGENT_HOST
             valueFrom:

K8s/descriptors/catalogue-service.yaml

@@ -6,10 +6,8 @@ metadata:
   name: catalogue
 spec:
   ports:
-  - name: "8080"
+  - name: http
     port: 8080
     targetPort: 8080
   selector:
     service: catalogue
-status:
-  loadBalancer: {}

K8s/descriptors/dispatch-deployment.yaml

@@ -1,21 +1,24 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: dispatch
   labels:
     service: dispatch
-  name: dispatch
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: dispatch
   template:
     metadata:
       labels:
         service: dispatch
     spec:
       containers:
-      - image: robotshop/rs-dispatch:latest
+      - name: dispatch
-        name: dispatch
+        image: robotshop/rs-dispatch:latest
         env:
+          # agent networking access
           - name: INSTANA_AGENT_HOST
             valueFrom:
               fieldRef:

K8s/descriptors/dispatch-service.yaml

@@ -1,9 +1,11 @@
+# dispatch just listens to a message queue
+# it does not expose any ports
 apiVersion: v1
 kind: Service
 metadata:
+  name: dispatch
   labels:
     service: dispatch
-  name: dispatch
 spec:
   clusterIP: None
   ports:

K8s/descriptors/mongodb-deployment.yaml

@@ -1,19 +1,22 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: mongodb
   labels:
     service: mongodb
-  name: mongodb
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      service: mongodb
   template:
     metadata:
       labels:
         service: mongodb
     spec:
       containers:
-      - image: robotshop/rs-mongodb:latest
+      - name: mongodb
-        name: mongodb
+        image: robotshop/rs-mongodb:latest
         ports:
         - containerPort: 27017
         resources:

K8s/descriptors/mongodb-service.yaml

@@ -6,7 +6,7 @@ metadata:
   name: mongodb
 spec:
   ports:
-  - name: "27017"
+  - name: mongo
     port: 27017
     targetPort: 27017
   selector:

K8s/descriptors/mysql-deployment.yaml

@@ -1,19 +1,23 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: mysql
   labels:
     service: mysql
-  name: mysql
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      service: mysql
   template:
     metadata:
       labels:
         service: mysql
     spec:
       containers:
-      - image: robotshop/rs-mysql-db:latest
+      - name: mysql
-        name: mysql
+        image: robotshop/rs-mysql-db:latest
+        # added for Istio
         securityContext:
           capabilities:
             add: ["NET_ADMIN"]

K8s/descriptors/payment-deployment.yaml

@@ -1,19 +1,23 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: payment
   labels:
     service: payment
-  name: payment
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      service: payment
   template:
     metadata:
       labels:
         service: payment
     spec:
       containers:
-      - image: robotshop/rs-payment:latest
+      - name: payment
-        name: payment
+        image: robotshop/rs-payment:latest
+        # agent networking access
         env:
           - name: INSTANA_AGENT_HOST
             valueFrom:

K8s/descriptors/payment-service.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
+  name: payment
   labels:
     service: payment
-  name: payment
 spec:
   ports:
-  - name: "8080"
+  - name: http
     port: 8080
     targetPort: 8080
   selector:

K8s/descriptors/rabbitmq-deployment.yaml

@@ -1,19 +1,22 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: rabbitmq
   labels:
     service: rabbitmq
-  name: rabbitmq
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      service: rabbitmq
   template:
     metadata:
       labels:
         service: rabbitmq
     spec:
       containers:
-      - image: rabbitmq:3.7-management-alpine
+      - name: rabbitmq
-        name: rabbitmq
+        image: rabbitmq:3.7-management-alpine
         ports:
         - containerPort: 5672
         - containerPort: 15672

K8s/descriptors/rabbitmq-service.yaml

@@ -1,15 +1,15 @@
 apiVersion: v1
 kind: Service
 metadata:
+  name: rabbitmq
   labels:
     service: rabbitmq
-  name: rabbitmq
 spec:
   ports:
-  - name: "5672"
+  - name: "tcp-amqp"
     port: 5672
     targetPort: 5672
-  - name: "15672"
+  - name: "http-management"
     port: 15672
     targetPort: 15672
   selector:

K8s/descriptors/ratings-deployment.yaml

@@ -1,21 +1,24 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: ratings
   labels:
     service: ratings
-  name: ratings
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      service: ratings
   template:
     metadata:
       labels:
         service: ratings
     spec:
       containers:
-      - image: robotshop/rs-ratings:latest
+      - name: ratings
-        name: ratings
+        image: robotshop/rs-ratings:latest
         ports:
-        - containerPort: 3306
+        - containerPort: 80
         resources:
           limits:
             cpu: 200m

K8s/descriptors/ratings-service.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
+  name: ratings
   labels:
     service: ratings
-  name: ratings
 spec:
   ports:
-  - name: "80"
+  - name: http
     port: 80
     targetPort: 80
   selector:

K8s/descriptors/redis-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -6,14 +6,17 @@ metadata:
   name: redis
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      service: redis
   template:
     metadata:
       labels:
         service: redis
     spec:
       containers:
-      - image: redis:4.0.6
+      - name: redis
-        name: redis
+        image: redis:4.0.6
         ports:
         - containerPort: 6379
         resources:

K8s/descriptors/redis-service.yaml

@@ -6,7 +6,7 @@ metadata:
   name: redis
 spec:
   ports:
-  - name: "6379"
+  - name: redis
     port: 6379
     targetPort: 6379
   selector:

K8s/descriptors/shipping-deployment.yaml

@@ -1,21 +1,25 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: shipping
   labels:
     service: shipping
-  name: shipping
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      service: shipping
   template:
     metadata:
       labels:
         service: shipping
     spec:
       containers:
-      - image: robotshop/rs-shipping:latest
+      - name: shipping
-        name: shipping
+        image: robotshop/rs-shipping:latest
         ports:
         - containerPort: 8080
+        # it's Java it needs lots of memory
         resources:
           limits:
             cpu: 200m

K8s/descriptors/shipping-service.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
+  name: shipping
   labels:
     service: shipping
-  name: shipping
 spec:
   ports:
-  - name: "8080"
+  - name: http
     port: 8080
     targetPort: 8080
   selector:

K8s/descriptors/user-deployment.yaml

@@ -1,20 +1,24 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: user
   labels:
     service: user
-  name: user
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      service: user
   template:
     metadata:
       labels:
         service: user
     spec:
       containers:
-      - image: robotshop/rs-user:latest
+      - name: user
-        name: user
+        image: robotshop/rs-user:latest
         env:
+          # agent networking access
           - name: INSTANA_AGENT_HOST
             valueFrom:
               fieldRef:

K8s/descriptors/user-service.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
+  name: user
   labels:
     service: user
-  name: user
 spec:
   ports:
-  - name: "8080"
+  - name: http
     port: 8080
     targetPort: 8080
   selector:

K8s/descriptors/web-deployment.yaml

@@ -1,20 +1,22 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
+  name: web
   labels:
     service: web
-  name: web
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: web
   template:
     metadata:
       labels:
         service: web
     spec:
       containers:
-      - image: robotshop/rs-web:latest
+      - name: web
-        name: web
+        image: robotshop/rs-web:latest
         ports:
         - containerPort: 8080
         resources:

K8s/descriptors/web-service.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
+  name: web
   labels:
     service: web
-  name: web
 spec:
   ports:
-  - name: "8080"
+  - name: http
     port: 8080
     targetPort: 8080
   selector: