From cae04b18f3289a760a7d69970713c138bc330cdf Mon Sep 17 00:00:00 2001 From: shinmatsuzaki Date: Wed, 3 Mar 2021 21:00:22 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=80=E6=96=B0=E3=81=AEk8s=20API?= =?UTF-8?q?=E3=81=A7=E3=82=82=E5=8B=95=E4=BD=9C=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86manifest=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kubernetes/stateful-services/ftgo-dynamodb-local.yml | 5 ++++- .../kubernetes/stateful-services/ftgo-kafka-deployment.yml | 5 ++++- .../kubernetes/stateful-services/ftgo-mysql-deployment.yml | 5 ++++- .../stateful-services/ftgo-zookeeper-deployment.yml | 5 ++++- .../src/deployment/kubernetes/ftgo-accounting-service.yml | 5 ++++- .../src/deployment/kubernetes/ftgo-api-gateway.yml | 5 ++++- .../src/deployment/kubernetes/ftgo-consumer-service.yml | 5 ++++- .../src/deployment/kubernetes/ftgo-kitchen-service.yml | 5 ++++- .../src/deployment/kubernetes/ftgo-order-history-service.yml | 5 ++++- .../src/deployment/kubernetes/ftgo-order-service.yml | 5 ++++- .../src/deployment/kubernetes/ftgo-restaurant-service.yml | 5 ++++- 11 files changed, 44 insertions(+), 11 deletions(-) diff --git a/deployment/kubernetes/stateful-services/ftgo-dynamodb-local.yml b/deployment/kubernetes/stateful-services/ftgo-dynamodb-local.yml index 7413bee3..a84f8722 100644 --- a/deployment/kubernetes/stateful-services/ftgo-dynamodb-local.yml +++ b/deployment/kubernetes/stateful-services/ftgo-dynamodb-local.yml @@ -9,13 +9,16 @@ spec: selector: svc: ftgo-dynamodb-local --- -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: StatefulSet metadata: name: ftgo-dynamodb-local labels: application: ftgo spec: + selector: + matchLabels: + svc: ftgo-dynamodb-local serviceName: "ftgo-dynamodb" replicas: 1 template: diff --git a/deployment/kubernetes/stateful-services/ftgo-kafka-deployment.yml b/deployment/kubernetes/stateful-services/ftgo-kafka-deployment.yml index 0190b53e..91aba08f 100644 --- a/deployment/kubernetes/stateful-services/ftgo-kafka-deployment.yml +++ b/deployment/kubernetes/stateful-services/ftgo-kafka-deployment.yml @@ -11,11 +11,14 @@ spec: selector: role: ftgo-kafka --- -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: StatefulSet metadata: name: ftgo-kafka spec: + selector: + matchLabels: + role: ftgo-kafka serviceName: "kafka" replicas: 1 template: diff --git a/deployment/kubernetes/stateful-services/ftgo-mysql-deployment.yml b/deployment/kubernetes/stateful-services/ftgo-mysql-deployment.yml index 73b98479..c71e8024 100644 --- a/deployment/kubernetes/stateful-services/ftgo-mysql-deployment.yml +++ b/deployment/kubernetes/stateful-services/ftgo-mysql-deployment.yml @@ -12,11 +12,14 @@ spec: selector: role: ftgo-mysql --- -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: StatefulSet metadata: name: ftgo-mysql spec: + selector: + matchLabels: + role: ftgo-mysql serviceName: "mysql" replicas: 1 template: diff --git a/deployment/kubernetes/stateful-services/ftgo-zookeeper-deployment.yml b/deployment/kubernetes/stateful-services/ftgo-zookeeper-deployment.yml index 4bfadd5d..becf34df 100644 --- a/deployment/kubernetes/stateful-services/ftgo-zookeeper-deployment.yml +++ b/deployment/kubernetes/stateful-services/ftgo-zookeeper-deployment.yml @@ -12,11 +12,14 @@ spec: selector: role: ftgo-zookeeper --- -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: StatefulSet metadata: name: ftgo-zookeeper spec: + selector: + matchLabels: + role: ftgo-zookeeper serviceName: "zookeeper" replicas: 1 template: diff --git a/ftgo-accounting-service/src/deployment/kubernetes/ftgo-accounting-service.yml b/ftgo-accounting-service/src/deployment/kubernetes/ftgo-accounting-service.yml index 4076b11a..c0a5a172 100644 --- a/ftgo-accounting-service/src/deployment/kubernetes/ftgo-accounting-service.yml +++ b/ftgo-accounting-service/src/deployment/kubernetes/ftgo-accounting-service.yml @@ -9,13 +9,16 @@ spec: selector: svc: ftgo-accounting-service --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: ftgo-accounting-service labels: application: ftgo spec: + selector: + matchLabels: + svc: ftgo-accounting-service replicas: 1 strategy: rollingUpdate: diff --git a/ftgo-api-gateway/src/deployment/kubernetes/ftgo-api-gateway.yml b/ftgo-api-gateway/src/deployment/kubernetes/ftgo-api-gateway.yml index da9a31c7..d85da904 100644 --- a/ftgo-api-gateway/src/deployment/kubernetes/ftgo-api-gateway.yml +++ b/ftgo-api-gateway/src/deployment/kubernetes/ftgo-api-gateway.yml @@ -16,13 +16,16 @@ spec: # loadBalancerSourceRanges: # - 88.128.82.195/32 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: ftgo-api-gateway labels: application: ftgo spec: + selector: + matchLabels: + svc: ftgo-api-gateway replicas: 1 strategy: rollingUpdate: diff --git a/ftgo-consumer-service/src/deployment/kubernetes/ftgo-consumer-service.yml b/ftgo-consumer-service/src/deployment/kubernetes/ftgo-consumer-service.yml index 28a7e8a4..c4a7d2ce 100644 --- a/ftgo-consumer-service/src/deployment/kubernetes/ftgo-consumer-service.yml +++ b/ftgo-consumer-service/src/deployment/kubernetes/ftgo-consumer-service.yml @@ -9,13 +9,16 @@ spec: selector: svc: ftgo-consumer-service --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: ftgo-consumer-service labels: application: ftgo spec: + selector: + matchLabels: + svc: ftgo-consumer-service replicas: 1 strategy: rollingUpdate: diff --git a/ftgo-kitchen-service/src/deployment/kubernetes/ftgo-kitchen-service.yml b/ftgo-kitchen-service/src/deployment/kubernetes/ftgo-kitchen-service.yml index 341e6f8f..5c531efe 100644 --- a/ftgo-kitchen-service/src/deployment/kubernetes/ftgo-kitchen-service.yml +++ b/ftgo-kitchen-service/src/deployment/kubernetes/ftgo-kitchen-service.yml @@ -9,13 +9,16 @@ spec: selector: svc: ftgo-kitchen-service --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: ftgo-kitchen-service labels: application: ftgo spec: + selector: + matchLabels: + svc: ftgo-kitchen-service replicas: 1 strategy: rollingUpdate: diff --git a/ftgo-order-history-service/src/deployment/kubernetes/ftgo-order-history-service.yml b/ftgo-order-history-service/src/deployment/kubernetes/ftgo-order-history-service.yml index c77fe573..738f6a74 100644 --- a/ftgo-order-history-service/src/deployment/kubernetes/ftgo-order-history-service.yml +++ b/ftgo-order-history-service/src/deployment/kubernetes/ftgo-order-history-service.yml @@ -9,13 +9,16 @@ spec: selector: svc: ftgo-order-history-service --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: ftgo-order-history-service labels: application: ftgo spec: + selector: + matchLabels: + svc: ftgo-order-history-service replicas: 1 strategy: rollingUpdate: diff --git a/ftgo-order-service/src/deployment/kubernetes/ftgo-order-service.yml b/ftgo-order-service/src/deployment/kubernetes/ftgo-order-service.yml index 1258554b..4492fe74 100644 --- a/ftgo-order-service/src/deployment/kubernetes/ftgo-order-service.yml +++ b/ftgo-order-service/src/deployment/kubernetes/ftgo-order-service.yml @@ -17,13 +17,16 @@ spec: selector: svc: ftgo-order-service --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: ftgo-order-service labels: application: ftgo spec: + selector: + matchLabels: + svc: ftgo-order-service replicas: 1 strategy: rollingUpdate: diff --git a/ftgo-restaurant-service/src/deployment/kubernetes/ftgo-restaurant-service.yml b/ftgo-restaurant-service/src/deployment/kubernetes/ftgo-restaurant-service.yml index bf251277..8e498259 100644 --- a/ftgo-restaurant-service/src/deployment/kubernetes/ftgo-restaurant-service.yml +++ b/ftgo-restaurant-service/src/deployment/kubernetes/ftgo-restaurant-service.yml @@ -9,7 +9,7 @@ spec: selector: svc: ftgo-restaurant-service --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: ftgo-restaurant-service @@ -17,6 +17,9 @@ metadata: application: ftgo svc: ftgo-restaurant-service spec: + selector: + matchLabels: + svc: ftgo-restaurant-service replicas: 1 strategy: rollingUpdate: From b02a3606dc27f0041ee75977fe3a28031aa9f887 Mon Sep 17 00:00:00 2001 From: shinmatsuzaki Date: Wed, 3 Mar 2021 12:42:24 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=B7=E3=82=A7=E3=83=AB=E3=82=B9?= =?UTF-8?q?=E3=82=AF=E3=83=AA=E3=83=97=E3=83=88=E5=86=85=E3=81=AE=E3=83=91?= =?UTF-8?q?=E3=82=B9=E3=81=AE=E6=8C=87=E5=AE=9A=E3=83=9F=E3=82=B9=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3+debug=20mode=E3=82=92=E6=9C=89=E5=8A=B9?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment/kubernetes/cdc-service/ftgo-cdc-service.yml | 5 ++++- deployment/kubernetes/scripts/kubernetes-deploy-all.sh | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/deployment/kubernetes/cdc-service/ftgo-cdc-service.yml b/deployment/kubernetes/cdc-service/ftgo-cdc-service.yml index 449edef3..eca965c7 100644 --- a/deployment/kubernetes/cdc-service/ftgo-cdc-service.yml +++ b/deployment/kubernetes/cdc-service/ftgo-cdc-service.yml @@ -9,13 +9,16 @@ spec: selector: svc: ftgo-cdc-service --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: ftgo-cdc-service labels: application: ftgo spec: + selector: + matchLabels: + svc: ftgo-cdc-service replicas: 1 strategy: rollingUpdate: diff --git a/deployment/kubernetes/scripts/kubernetes-deploy-all.sh b/deployment/kubernetes/scripts/kubernetes-deploy-all.sh index 790cef24..d77e4fe5 100755 --- a/deployment/kubernetes/scripts/kubernetes-deploy-all.sh +++ b/deployment/kubernetes/scripts/kubernetes-deploy-all.sh @@ -1,9 +1,10 @@ #! /bin/bash -e +set -vx kubectl apply -f <(cat deployment/kubernetes/stateful-services/*.yml) ./deployment/kubernetes/scripts/kubernetes-wait-for-ready-pods.sh ftgo-mysql-0 ftgo-kafka-0 ftgo-dynamodb-local-0 ftgo-zookeeper-0 -kubectl apply -f <(cat deployment/kubernetes/cdc-services/*.yml) +kubectl apply -f <(cat deployment/kubernetes/cdc-service/*.yml) kubectl apply -f <(cat */src/deployment/kubernetes/*.yml)