diff --git a/K8s/descriptors/cart-deployment.yaml b/K8s/descriptors/cart-deployment.yaml index 9497a9469..f8286d80e 100644 --- a/K8s/descriptors/cart-deployment.yaml +++ b/K8s/descriptors/cart-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -6,16 +6,19 @@ metadata: 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 index 0fb59f680..f84c4ae6c 100644 --- a/K8s/descriptors/cart-service.yaml +++ b/K8s/descriptors/cart-service.yaml @@ -6,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: cart + app: cart name: cart spec: ports: @@ -14,6 +14,6 @@ spec: 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 index 2595f10fd..a96660755 100644 --- a/K8s/descriptors/catalogue-deployment.yaml +++ b/K8s/descriptors/catalogue-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -6,16 +6,19 @@ metadata: 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 index 2a7ef8357..d730f1aad 100644 --- a/K8s/descriptors/catalogue-service.yaml +++ b/K8s/descriptors/catalogue-service.yaml @@ -6,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: catalogue + app: catalogue name: catalogue spec: ports: @@ -14,6 +14,6 @@ spec: 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 index 93357b02f..8a0277b37 100644 --- a/K8s/descriptors/dispatch-deployment.yaml +++ b/K8s/descriptors/dispatch-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -6,16 +6,19 @@ metadata: 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 index f37fa19bd..b89c198af 100644 --- 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 index 7e2b4a46c..87ee20adc 100644 --- a/K8s/descriptors/mongodb-deployment.yaml +++ b/K8s/descriptors/mongodb-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -6,16 +6,19 @@ metadata: 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 index 9fa133e22..3792657f8 100644 --- a/K8s/descriptors/mongodb-service.yaml +++ b/K8s/descriptors/mongodb-service.yaml @@ -6,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: mongodb + app: mongodb name: mongodb spec: ports: @@ -14,6 +14,6 @@ spec: 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 index 4fe29225e..689ea4309 100644 --- a/K8s/descriptors/mysql-deployment.yaml +++ b/K8s/descriptors/mysql-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -6,16 +6,19 @@ metadata: 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 index 32d60d3a6..9fe0063f7 100644 --- a/K8s/descriptors/mysql-service.yaml +++ b/K8s/descriptors/mysql-service.yaml @@ -6,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: mysql + app: mysql name: mysql spec: ports: @@ -14,6 +14,6 @@ spec: 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 index 64fd6c33e..6fe5682aa 100644 --- a/K8s/descriptors/payment-deployment.yaml +++ b/K8s/descriptors/payment-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -6,16 +6,19 @@ metadata: 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 index 7cdfc51ae..e2cc24e0c 100644 --- a/K8s/descriptors/payment-service.yaml +++ b/K8s/descriptors/payment-service.yaml @@ -6,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: payment + app: payment name: payment spec: ports: @@ -14,6 +14,6 @@ spec: 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 index a9d7e2eba..284773b50 100644 --- a/K8s/descriptors/rabbitmq-deployment.yaml +++ b/K8s/descriptors/rabbitmq-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -6,16 +6,19 @@ metadata: 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 index 6e44a80da..d938830b1 100644 --- 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 index ca5f14283..0f9cc1bed 100644 --- a/K8s/descriptors/ratings-deployment.yaml +++ b/K8s/descriptors/ratings-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -6,16 +6,19 @@ metadata: 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 index 10d03bbe0..9c50ed4b1 100644 --- a/K8s/descriptors/ratings-service.yaml +++ b/K8s/descriptors/ratings-service.yaml @@ -6,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: ratings + app: ratings name: ratings spec: ports: @@ -14,6 +14,6 @@ spec: 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 index 9f5221a76..beec84611 100644 --- a/K8s/descriptors/redis-deployment.yaml +++ b/K8s/descriptors/redis-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -6,16 +6,19 @@ metadata: 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 diff --git a/K8s/descriptors/redis-service.yaml b/K8s/descriptors/redis-service.yaml index c4610c310..5855a633a 100644 --- a/K8s/descriptors/redis-service.yaml +++ b/K8s/descriptors/redis-service.yaml @@ -6,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: redis + app: redis name: redis spec: ports: @@ -14,6 +14,6 @@ spec: port: 6379 targetPort: 6379 selector: - io.kompose.service: redis + app: redis status: loadBalancer: {} diff --git a/K8s/descriptors/shipping-deployment.yaml b/K8s/descriptors/shipping-deployment.yaml index 40d545059..a61e55fc6 100644 --- a/K8s/descriptors/shipping-deployment.yaml +++ b/K8s/descriptors/shipping-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -6,16 +6,19 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: shipping + app: shipping name: shipping spec: replicas: 1 + selector: + matchLabels: + app: shipping strategy: {} template: metadata: creationTimestamp: null labels: - io.kompose.service: shipping + app: shipping spec: containers: - image: linuxacademycontent/rs-shipping:latest diff --git a/K8s/descriptors/shipping-service.yaml b/K8s/descriptors/shipping-service.yaml index 3fc536d4b..5c17655fb 100644 --- a/K8s/descriptors/shipping-service.yaml +++ b/K8s/descriptors/shipping-service.yaml @@ -6,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: shipping + app: shipping name: shipping spec: ports: @@ -14,6 +14,6 @@ spec: port: 8080 targetPort: 8080 selector: - io.kompose.service: shipping + app: shipping status: loadBalancer: {} diff --git a/K8s/descriptors/user-deployment.yaml b/K8s/descriptors/user-deployment.yaml index b7516d4d9..426bdcc81 100644 --- a/K8s/descriptors/user-deployment.yaml +++ b/K8s/descriptors/user-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -6,16 +6,19 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: user + app: user name: user spec: replicas: 1 + selector: + matchLabels: + app: user strategy: {} template: metadata: creationTimestamp: null labels: - io.kompose.service: user + app: user spec: containers: - image: linuxacademycontent/rs-user:latest diff --git a/K8s/descriptors/user-service.yaml b/K8s/descriptors/user-service.yaml index 818732359..771e3f366 100644 --- a/K8s/descriptors/user-service.yaml +++ b/K8s/descriptors/user-service.yaml @@ -6,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: user + app: user name: user spec: ports: @@ -14,6 +14,6 @@ spec: port: 8080 targetPort: 8080 selector: - io.kompose.service: user + app: user status: loadBalancer: {} diff --git a/K8s/descriptors/web-deployment.yaml b/K8s/descriptors/web-deployment.yaml index 91c1e5af1..32c094bf7 100644 --- a/K8s/descriptors/web-deployment.yaml +++ b/K8s/descriptors/web-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -6,16 +6,19 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: web + app: web name: web spec: replicas: 1 + selector: + matchLabels: + app: web strategy: {} template: metadata: creationTimestamp: null labels: - io.kompose.service: web + app: web spec: containers: - image: linuxacademycontent/rs-web:latest diff --git a/K8s/descriptors/web-service.yaml b/K8s/descriptors/web-service.yaml index 5a3d15518..17053daa5 100644 --- a/K8s/descriptors/web-service.yaml +++ b/K8s/descriptors/web-service.yaml @@ -6,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: web + app: web name: web spec: type: NodePort @@ -16,6 +16,6 @@ spec: targetPort: 8080 nodePort: 30080 selector: - io.kompose.service: web + app: web status: loadBalancer: {} diff --git a/OpenShift/instana-agent-os.yaml b/OpenShift/instana-agent-os.yaml index 870bf2cf6..6ece4fc83 100644 --- a/OpenShift/instana-agent-os.yaml +++ b/OpenShift/instana-agent-os.yaml @@ -22,7 +22,7 @@ items: data: key: - - apiVersion: extensions/v1beta1 + - apiVersion: apps/v1 kind: DaemonSet metadata: labels: diff --git a/README.md b/README.md index 7db9ac652..549dc9df5 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ Snippet targetPort: 8080 nodePort: 30080 selector: - io.kompose.service: web + app: web sessionAffinity: None type: NodePort