Merge branch 'k8s-descriptors'

K8s/descriptors/cart-deployment.yaml

@@ -1,25 +1,23 @@
-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
+  labels:
+    service: cart
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: cart
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: cart
+        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
             valueFrom:
@@ -34,5 +32,3 @@ spec:
           requests:
             cpu: 100m
             memory: 50Mi
-      restartPolicy: Always
-status: {}

K8s/descriptors/cart-service.yaml

@@ -1,19 +1,11 @@
 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
 spec:
   ports:
-  - name: "8080"
+  - name: http
     port: 8080
     targetPort: 8080
   selector:
-    io.kompose.service: cart
-status:
-  loadBalancer: {}
+    service: cart

K8s/descriptors/catalogue-deployment.yaml

@@ -1,25 +1,22 @@
-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
+  labels:
+    service: catalogue
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: catalogue
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: catalogue
+        service: catalogue
     spec:
       containers:
-      - image: robotshop/rs-catalogue:latest
-        name: catalogue
+      - name: catalogue
+        image: robotshop/rs-catalogue:latest
         env:
           - name: INSTANA_AGENT_HOST
             valueFrom:
@@ -35,4 +32,3 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-status: {}

K8s/descriptors/catalogue-service.yaml

@@ -1,19 +1,13 @@
 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
+    service: catalogue
   name: catalogue
 spec:
   ports:
-  - name: "8080"
+  - name: http
     port: 8080
     targetPort: 8080
   selector:
-    io.kompose.service: catalogue
-status:
-  loadBalancer: {}
+    service: catalogue

K8s/descriptors/dispatch-deployment.yaml

@@ -1,26 +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
   name: dispatch
+  labels:
+    service: dispatch
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: dispatch
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: dispatch
+        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:
@@ -33,4 +31,3 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-status: {}

K8s/descriptors/dispatch-service.yaml

@@ -1,13 +1,11 @@
+# dispatch just listens to a message queue
+# it does not expose any ports
 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
+  labels:
+    service: dispatch
 spec:
   clusterIP: None
   ports:
@@ -15,6 +13,4 @@ spec:
     port: 55555
     targetPort: 0
   selector:
-    io.kompose.service: dispatch
-status:
-  loadBalancer: {}
+    service: dispatch

K8s/descriptors/mongodb-deployment.yaml

@@ -1,25 +1,22 @@
-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
+  labels:
+    service: mongodb
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: mongodb
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: mongodb
+        service: mongodb
     spec:
       containers:
-      - image: robotshop/rs-mongodb:latest
-        name: mongodb
+      - name: mongodb
+        image: robotshop/rs-mongodb:latest
         ports:
         - containerPort: 27017
         resources:
@@ -30,4 +27,3 @@ spec:
             cpu: 100m
             memory: 100Mi
       restartPolicy: Always
-status: {}

K8s/descriptors/mongodb-service.yaml

@@ -1,19 +1,13 @@
 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
+    service: mongodb
   name: mongodb
 spec:
   ports:
-  - name: "27017"
+  - name: mongo
     port: 27017
     targetPort: 27017
   selector:
-    io.kompose.service: mongodb
-status:
-  loadBalancer: {}
+    service: mongodb

K8s/descriptors/mysql-deployment.yaml

@@ -1,25 +1,23 @@
-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
   name: mysql
+  labels:
+    service: mysql
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: mysql
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: mysql
+        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"]
@@ -33,4 +31,3 @@ spec:
             cpu: 100m
             memory: 400Mi
       restartPolicy: Always
-status: {}

K8s/descriptors/mysql-service.yaml

@@ -1,12 +1,8 @@
 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: mysql
+    service: mysql
   name: mysql
 spec:
   ports:
@@ -14,6 +10,4 @@ spec:
     port: 3306
     targetPort: 3306
   selector:
-    io.kompose.service: mysql
-status:
-  loadBalancer: {}
+    service: mysql

K8s/descriptors/payment-deployment.yaml

@@ -1,25 +1,23 @@
-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
   name: payment
+  labels:
+    service: payment
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: payment
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: payment
+        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:
@@ -35,4 +33,3 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-status: {}

K8s/descriptors/payment-service.yaml

@@ -1,19 +1,13 @@
 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: payment
   name: payment
+  labels:
+    service: payment
 spec:
   ports:
-  - name: "8080"
+  - name: http
     port: 8080
     targetPort: 8080
   selector:
-    io.kompose.service: payment
-status:
-  loadBalancer: {}
+    service: payment

K8s/descriptors/rabbitmq-deployment.yaml

@@ -1,25 +1,22 @@
-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
   name: rabbitmq
+  labels:
+    service: rabbitmq
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: rabbitmq
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: rabbitmq
+        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
@@ -31,4 +28,3 @@ spec:
             cpu: 100m
             memory: 256Mi
       restartPolicy: Always
-status: {}

K8s/descriptors/rabbitmq-service.yaml

@@ -1,22 +1,16 @@
 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: rabbitmq
   name: rabbitmq
+  labels:
+    service: rabbitmq
 spec:
   ports:
-  - name: "5672"
+  - name: "tcp-amqp"
     port: 5672
     targetPort: 5672
-  - name: "15672"
+  - name: "http-management"
     port: 15672
     targetPort: 15672
   selector:
-    io.kompose.service: rabbitmq
-status:
-  loadBalancer: {}
+    service: rabbitmq

K8s/descriptors/ratings-deployment.yaml

@@ -1,27 +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
   name: ratings
+  labels:
+    service: ratings
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: ratings
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: ratings
+        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
@@ -30,4 +27,3 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-status: {}

K8s/descriptors/ratings-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: ratings
   name: ratings
+  labels:
+    service: ratings
 spec:
   ports:
-  - name: "80"
+  - name: http
     port: 80
     targetPort: 80
   selector:
-    io.kompose.service: ratings
-status:
-  loadBalancer: {}
+    service: ratings
+

K8s/descriptors/redis-deployment.yaml

@@ -1,25 +1,22 @@
-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
+    service: redis
   name: redis
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: redis
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: redis
+        service: redis
     spec:
       containers:
-      - image: redis:4.0.6
-        name: redis
+      - name: redis
+        image: redis:4.0.6
         ports:
         - containerPort: 6379
         resources:
@@ -30,4 +27,3 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-status: {}

K8s/descriptors/redis-service.yaml

@@ -1,19 +1,13 @@
 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: redis
+    service: redis
   name: redis
 spec:
   ports:
-  - name: "6379"
+  - name: redis
     port: 6379
     targetPort: 6379
   selector:
-    io.kompose.service: redis
-status:
-  loadBalancer: {}
+    service: redis

K8s/descriptors/shipping-deployment.yaml

@@ -1,27 +1,25 @@
-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: shipping
   name: shipping
+  labels:
+    service: shipping
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: shipping
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: shipping
+        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
@@ -30,4 +28,3 @@ spec:
             cpu: 100m
             memory: 500Mi
       restartPolicy: Always
-status: {}

K8s/descriptors/shipping-service.yaml

@@ -1,19 +1,13 @@
 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: shipping
   name: shipping
+  labels:
+    service: shipping
 spec:
   ports:
-  - name: "8080"
+  - name: http
     port: 8080
     targetPort: 8080
   selector:
-    io.kompose.service: shipping
-status:
-  loadBalancer: {}
+    service: shipping

K8s/descriptors/user-deployment.yaml

@@ -1,26 +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: user
   name: user
+  labels:
+    service: user
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: user
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: user
+        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:
@@ -35,4 +33,3 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-status: {}

K8s/descriptors/user-service.yaml

@@ -1,19 +1,13 @@
 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: user
   name: user
+  labels:
+    service: user
 spec:
   ports:
-  - name: "8080"
+  - name: http
     port: 8080
     targetPort: 8080
   selector:
-    io.kompose.service: user
-status:
-  loadBalancer: {}
+    service: user

K8s/descriptors/web-deployment.yaml

@@ -1,25 +1,22 @@
-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: web
   name: web
+  labels:
+    service: web
 spec:
   replicas: 1
-  strategy: {}
+  selector:
+    matchLabels:
+      service: web
   template:
     metadata:
-      creationTimestamp: null
       labels:
-        io.kompose.service: web
+        service: web
     spec:
       containers:
-      - image: robotshop/rs-web:latest
-        name: web
+      - name: web
+        image: robotshop/rs-web:latest
         ports:
         - containerPort: 8080
         resources:
@@ -30,4 +27,3 @@ spec:
             cpu: 100m
             memory: 50Mi
       restartPolicy: Always
-status: {}

K8s/descriptors/web-service.yaml

@@ -1,19 +1,13 @@
 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: web
   name: web
+  labels:
+    service: web
 spec:
   ports:
-  - name: "8080"
+  - name: http
     port: 8080
     targetPort: 8080
   selector:
-    io.kompose.service: web
-status:
-  loadBalancer: {}
+    service: web