From 4677a67fec425373aeb46a711b07cbcf672b532a Mon Sep 17 00:00:00 2001 From: Osinuga Oluwaseun Date: Fri, 3 Mar 2023 22:38:43 +0100 Subject: [PATCH 1/8] adding support for k8s --- K8s/descriptors/cart-deployment.yaml | 6 +++--- K8s/descriptors/cart-service.yaml | 4 ++-- K8s/descriptors/catalogue-deployment.yaml | 6 +++--- K8s/descriptors/catalogue-service.yaml | 4 ++-- K8s/descriptors/dispatch-deployment.yaml | 6 +++--- K8s/descriptors/dispatch-service.yaml | 4 ++-- K8s/descriptors/mongodb-deployment.yaml | 6 +++--- K8s/descriptors/mongodb-service.yaml | 4 ++-- K8s/descriptors/mysql-deployment.yaml | 6 +++--- K8s/descriptors/mysql-service.yaml | 4 ++-- K8s/descriptors/payment-deployment.yaml | 6 +++--- K8s/descriptors/payment-service.yaml | 4 ++-- K8s/descriptors/rabbitmq-deployment.yaml | 6 +++--- K8s/descriptors/rabbitmq-service.yaml | 4 ++-- K8s/descriptors/ratings-deployment.yaml | 6 +++--- K8s/descriptors/ratings-service.yaml | 4 ++-- K8s/descriptors/redis-deployment.yaml | 6 +++--- K8s/descriptors/redis-service.yaml | 4 ++-- K8s/descriptors/shipping-deployment.yaml | 6 +++--- K8s/descriptors/shipping-service.yaml | 4 ++-- K8s/descriptors/user-deployment.yaml | 6 +++--- K8s/descriptors/user-service.yaml | 4 ++-- K8s/descriptors/web-deployment.yaml | 6 +++--- K8s/descriptors/web-service.yaml | 4 ++-- OpenShift/instana-agent-os.yaml | 2 +- README.md | 2 +- 26 files changed, 62 insertions(+), 62 deletions(-) diff --git a/K8s/descriptors/cart-deployment.yaml b/K8s/descriptors/cart-deployment.yaml index 9497a9469..24dba0eff 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,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: cart + app: cart name: cart spec: replicas: 1 @@ -15,7 +15,7 @@ spec: 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..9d4ebaddb 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..11b248ab4 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,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: catalogue + app: catalogue name: catalogue spec: replicas: 1 @@ -15,7 +15,7 @@ spec: 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..bd35210da 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..4682cd6d0 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,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: dispatch + app: dispatch name: dispatch spec: replicas: 1 @@ -15,7 +15,7 @@ spec: 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..1c3330439 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..72637af55 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,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: mongodb + app: mongodb name: mongodb spec: replicas: 1 @@ -15,7 +15,7 @@ spec: 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..218473e57 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..4a9094da0 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,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: mysql + app: mysql name: mysql spec: replicas: 1 @@ -15,7 +15,7 @@ spec: 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..fbb28fbb9 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..d59ca77e7 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,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: payment + app: payment name: payment spec: replicas: 1 @@ -15,7 +15,7 @@ spec: 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..2f74e4e36 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..87353788c 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,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: rabbitmq + app: rabbitmq name: rabbitmq spec: replicas: 1 @@ -15,7 +15,7 @@ spec: 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..382c00062 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..033233f1b 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,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: ratings + app: ratings name: ratings spec: replicas: 1 @@ -15,7 +15,7 @@ spec: 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..89975699e 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..1b75bf4de 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,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: redis + app: redis name: redis spec: replicas: 1 @@ -15,7 +15,7 @@ spec: 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..4a18c422d 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..9fe44490b 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,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: shipping + app: shipping name: shipping spec: replicas: 1 @@ -15,7 +15,7 @@ spec: 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..f89178599 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..b6fb48b24 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,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: user + app: user name: user spec: replicas: 1 @@ -15,7 +15,7 @@ spec: 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..307f2ffa9 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..4cbc19381 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,7 +6,7 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - io.kompose.service: web + app: web name: web spec: replicas: 1 @@ -15,7 +15,7 @@ spec: 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..1223669b6 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..dee435c6b 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 From fd3fdfeda3851eb12b0b3d668afe260f4d00304e Mon Sep 17 00:00:00 2001 From: Osinuga Oluwaseun Date: Fri, 3 Mar 2023 22:55:49 +0100 Subject: [PATCH 2/8] cart fix --- K8s/descriptors/cart-deployment.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/K8s/descriptors/cart-deployment.yaml b/K8s/descriptors/cart-deployment.yaml index 24dba0eff..5b3096a4e 100644 --- a/K8s/descriptors/cart-deployment.yaml +++ b/K8s/descriptors/cart-deployment.yaml @@ -4,16 +4,17 @@ metadata: annotations: kompose.cmd: kompose -f ../docker-compose.yaml convert kompose.version: 1.10.0 (8bb0907) - creationTimestamp: null labels: app: cart name: cart spec: + selector: + matchLabels: + app: cart replicas: 1 strategy: {} template: metadata: - creationTimestamp: null labels: app: cart spec: From 629c501d0d4c2df2adced13a016a065d510b2885 Mon Sep 17 00:00:00 2001 From: Osinuga Oluwaseun Date: Fri, 3 Mar 2023 23:04:11 +0100 Subject: [PATCH 3/8] deployment fix --- K8s/descriptors/catalogue-deployment.yaml | 4 +++- K8s/descriptors/dispatch-deployment.yaml | 4 +++- K8s/descriptors/mongodb-deployment.yaml | 4 +++- K8s/descriptors/mysql-deployment.yaml | 4 +++- K8s/descriptors/payment-deployment.yaml | 4 +++- K8s/descriptors/rabbitmq-deployment.yaml | 4 +++- K8s/descriptors/ratings-deployment.yaml | 4 +++- K8s/descriptors/redis-deployment.yaml | 4 +++- K8s/descriptors/shipping-deployment.yaml | 4 +++- K8s/descriptors/user-deployment.yaml | 4 +++- K8s/descriptors/web-deployment.yaml | 4 +++- 11 files changed, 33 insertions(+), 11 deletions(-) diff --git a/K8s/descriptors/catalogue-deployment.yaml b/K8s/descriptors/catalogue-deployment.yaml index 11b248ab4..103f02979 100644 --- a/K8s/descriptors/catalogue-deployment.yaml +++ b/K8s/descriptors/catalogue-deployment.yaml @@ -4,11 +4,13 @@ metadata: annotations: kompose.cmd: kompose -f ../docker-compose.yaml convert kompose.version: 1.10.0 (8bb0907) - creationTimestamp: null labels: app: catalogue name: catalogue spec: + selector: + matchLabels: + app: catalogue replicas: 1 strategy: {} template: diff --git a/K8s/descriptors/dispatch-deployment.yaml b/K8s/descriptors/dispatch-deployment.yaml index 4682cd6d0..01bcb987f 100644 --- a/K8s/descriptors/dispatch-deployment.yaml +++ b/K8s/descriptors/dispatch-deployment.yaml @@ -4,11 +4,13 @@ metadata: annotations: kompose.cmd: kompose -f ../docker-compose.yaml convert kompose.version: 1.10.0 (8bb0907) - creationTimestamp: null labels: app: dispatch name: dispatch spec: + selector: + matchLabels: + app: dispatch replicas: 1 strategy: {} template: diff --git a/K8s/descriptors/mongodb-deployment.yaml b/K8s/descriptors/mongodb-deployment.yaml index 72637af55..733179be0 100644 --- a/K8s/descriptors/mongodb-deployment.yaml +++ b/K8s/descriptors/mongodb-deployment.yaml @@ -4,11 +4,13 @@ metadata: annotations: kompose.cmd: kompose -f ../docker-compose.yaml convert kompose.version: 1.10.0 (8bb0907) - creationTimestamp: null labels: app: mongodb name: mongodb spec: + selector: + matchLabels: + app: mongodb replicas: 1 strategy: {} template: diff --git a/K8s/descriptors/mysql-deployment.yaml b/K8s/descriptors/mysql-deployment.yaml index 4a9094da0..f33d1f152 100644 --- a/K8s/descriptors/mysql-deployment.yaml +++ b/K8s/descriptors/mysql-deployment.yaml @@ -4,11 +4,13 @@ metadata: annotations: kompose.cmd: kompose -f ../docker-compose.yaml convert kompose.version: 1.10.0 (8bb0907) - creationTimestamp: null labels: app: mysql name: mysql spec: + selector: + matchLabels: + app: mysql replicas: 1 strategy: {} template: diff --git a/K8s/descriptors/payment-deployment.yaml b/K8s/descriptors/payment-deployment.yaml index d59ca77e7..c26710e65 100644 --- a/K8s/descriptors/payment-deployment.yaml +++ b/K8s/descriptors/payment-deployment.yaml @@ -4,11 +4,13 @@ metadata: annotations: kompose.cmd: kompose -f ../docker-compose.yaml convert kompose.version: 1.10.0 (8bb0907) - creationTimestamp: null labels: app: payment name: payment spec: + selector: + matchLabels: + app: payment replicas: 1 strategy: {} template: diff --git a/K8s/descriptors/rabbitmq-deployment.yaml b/K8s/descriptors/rabbitmq-deployment.yaml index 87353788c..1d3818f4d 100644 --- a/K8s/descriptors/rabbitmq-deployment.yaml +++ b/K8s/descriptors/rabbitmq-deployment.yaml @@ -4,11 +4,13 @@ metadata: annotations: kompose.cmd: kompose -f ../docker-compose.yaml convert kompose.version: 1.10.0 (8bb0907) - creationTimestamp: null labels: app: rabbitmq name: rabbitmq spec: + selector: + matchLabels: + app: rabbitmq replicas: 1 strategy: {} template: diff --git a/K8s/descriptors/ratings-deployment.yaml b/K8s/descriptors/ratings-deployment.yaml index 033233f1b..90a0e866e 100644 --- a/K8s/descriptors/ratings-deployment.yaml +++ b/K8s/descriptors/ratings-deployment.yaml @@ -4,11 +4,13 @@ metadata: annotations: kompose.cmd: kompose -f ../docker-compose.yaml convert kompose.version: 1.10.0 (8bb0907) - creationTimestamp: null labels: app: ratings name: ratings spec: + selector: + matchLabels: + app: ratings replicas: 1 strategy: {} template: diff --git a/K8s/descriptors/redis-deployment.yaml b/K8s/descriptors/redis-deployment.yaml index 1b75bf4de..121396cb0 100644 --- a/K8s/descriptors/redis-deployment.yaml +++ b/K8s/descriptors/redis-deployment.yaml @@ -4,11 +4,13 @@ metadata: annotations: kompose.cmd: kompose -f ../docker-compose.yaml convert kompose.version: 1.10.0 (8bb0907) - creationTimestamp: null labels: app: redis name: redis spec: + selector: + matchLabels: + app: redis replicas: 1 strategy: {} template: diff --git a/K8s/descriptors/shipping-deployment.yaml b/K8s/descriptors/shipping-deployment.yaml index 9fe44490b..0c6355688 100644 --- a/K8s/descriptors/shipping-deployment.yaml +++ b/K8s/descriptors/shipping-deployment.yaml @@ -4,11 +4,13 @@ metadata: annotations: kompose.cmd: kompose -f ../docker-compose.yaml convert kompose.version: 1.10.0 (8bb0907) - creationTimestamp: null labels: app: shipping name: shipping spec: + selector: + matchLabels: + app: shipping replicas: 1 strategy: {} template: diff --git a/K8s/descriptors/user-deployment.yaml b/K8s/descriptors/user-deployment.yaml index b6fb48b24..66d089f5a 100644 --- a/K8s/descriptors/user-deployment.yaml +++ b/K8s/descriptors/user-deployment.yaml @@ -4,11 +4,13 @@ metadata: annotations: kompose.cmd: kompose -f ../docker-compose.yaml convert kompose.version: 1.10.0 (8bb0907) - creationTimestamp: null labels: app: user name: user spec: + selector: + matchLabels: + app: user replicas: 1 strategy: {} template: diff --git a/K8s/descriptors/web-deployment.yaml b/K8s/descriptors/web-deployment.yaml index 4cbc19381..d9c1aa241 100644 --- a/K8s/descriptors/web-deployment.yaml +++ b/K8s/descriptors/web-deployment.yaml @@ -4,11 +4,13 @@ metadata: annotations: kompose.cmd: kompose -f ../docker-compose.yaml convert kompose.version: 1.10.0 (8bb0907) - creationTimestamp: null labels: app: web name: web spec: + selector: + matchLabels: + app: web replicas: 1 strategy: {} template: From 9f99b927a8245823ff50d1050363e4a5871d596d Mon Sep 17 00:00:00 2001 From: Osinuga Oluwaseun Date: Fri, 3 Mar 2023 23:13:38 +0100 Subject: [PATCH 4/8] modeport --- K8s/descriptors/web-service.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/K8s/descriptors/web-service.yaml b/K8s/descriptors/web-service.yaml index 1223669b6..c69176da8 100644 --- a/K8s/descriptors/web-service.yaml +++ b/K8s/descriptors/web-service.yaml @@ -14,8 +14,7 @@ spec: - name: "8080" port: 8080 targetPort: 8080 - nodePort: 30080 - selector: += selector: app: web status: loadBalancer: {} From 2450a00132b32b4ba0c2b10e35d7d30c9853b64a Mon Sep 17 00:00:00 2001 From: Osinuga Oluwaseun Date: Fri, 3 Mar 2023 23:23:17 +0100 Subject: [PATCH 5/8] fix web service --- K8s/descriptors/web-service.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/K8s/descriptors/web-service.yaml b/K8s/descriptors/web-service.yaml index c69176da8..9760ac336 100644 --- a/K8s/descriptors/web-service.yaml +++ b/K8s/descriptors/web-service.yaml @@ -9,7 +9,6 @@ metadata: app: web name: web spec: - type: NodePort ports: - name: "8080" port: 8080 From 791e2ae95d8388687b996fe98bdf89bbcb9bc49f Mon Sep 17 00:00:00 2001 From: Osinuga Oluwaseun Date: Fri, 3 Mar 2023 23:26:27 +0100 Subject: [PATCH 6/8] fix error --- K8s/descriptors/web-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/K8s/descriptors/web-service.yaml b/K8s/descriptors/web-service.yaml index 9760ac336..0c8ba3d44 100644 --- a/K8s/descriptors/web-service.yaml +++ b/K8s/descriptors/web-service.yaml @@ -13,7 +13,7 @@ spec: - name: "8080" port: 8080 targetPort: 8080 -= selector: + selector: app: web status: loadBalancer: {} From 0458d6b1daf0982466c62983b6d3e8ea2aac70eb Mon Sep 17 00:00:00 2001 From: Osinuga Oluwaseun Date: Fri, 3 Mar 2023 23:46:58 +0100 Subject: [PATCH 7/8] fix error --- K8s/descriptors/web-service.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/K8s/descriptors/web-service.yaml b/K8s/descriptors/web-service.yaml index 0c8ba3d44..1c52b4f46 100644 --- a/K8s/descriptors/web-service.yaml +++ b/K8s/descriptors/web-service.yaml @@ -6,14 +6,16 @@ metadata: kompose.version: 1.10.0 (8bb0907) creationTimestamp: null labels: - app: web + app: web name: web spec: + type: NodePort ports: - name: "8080" port: 8080 targetPort: 8080 + nodePort: 30080 selector: - app: web + app: web status: - loadBalancer: {} + loadBalancer: {} \ No newline at end of file From 6ddb9882f05cd3c1c33810ad03417382ff99b5af Mon Sep 17 00:00:00 2001 From: Osinuga Oluwaseun Date: Fri, 3 Mar 2023 23:48:23 +0100 Subject: [PATCH 8/8] fix error --- K8s/descriptors/web-service.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/K8s/descriptors/web-service.yaml b/K8s/descriptors/web-service.yaml index 1c52b4f46..993a8ebce 100644 --- a/K8s/descriptors/web-service.yaml +++ b/K8s/descriptors/web-service.yaml @@ -14,7 +14,6 @@ spec: - name: "8080" port: 8080 targetPort: 8080 - nodePort: 30080 selector: app: web status: