From c0cb1b7e0e67d37fa26f4d0d9199c0ddfc4d53ff Mon Sep 17 00:00:00 2001 From: Katsuhiro Yamanaka Date: Tue, 22 Mar 2022 13:25:06 +0900 Subject: [PATCH 1/3] =?UTF-8?q?nautible-app=E3=82=92nautible-app-ms?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- base/order-deploy.yaml | 20 +++++++------- base/order-service.yaml | 14 +++++----- overlays/aws/dev/istio-network.yaml | 26 +++++++++---------- overlays/aws/dev/order-dapr-pubsub.yaml | 2 +- .../aws/dev/order-dapr-statestore-redis.yaml | 2 +- overlays/aws/dev/order-deploy.yaml | 8 +++--- overlays/aws/local-dev/order-dapr-pubsub.yaml | 2 +- .../aws/local-dev/order-dapr-statestore.yaml | 2 +- overlays/aws/local-dev/order-deploy.yaml | 6 ++--- overlays/aws/local-dev/order-localstack.yaml | 4 +-- overlays/aws/local-dev/order-redis.yaml | 4 +-- overlays/azure/dev/istio-network.yaml | 26 +++++++++---------- overlays/azure/dev/order-dapr-pubsub.yaml | 4 +-- .../dev/order-dapr-statestore-redis.yaml | 6 ++--- overlays/azure/dev/order-deploy.yaml | 12 ++++----- .../azure/local-dev/order-dapr-pubsub.yaml | 2 +- .../local-dev/order-dapr-statestore.yaml | 2 +- overlays/azure/local-dev/order-deploy.yaml | 8 +++--- overlays/azure/local-dev/order-mongo.yaml | 4 +-- overlays/azure/local-dev/order-redis.yaml | 4 +-- 21 files changed, 80 insertions(+), 80 deletions(-) diff --git a/README.md b/README.md index 89a5a4a..4d53387 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# nautible-app-order-manifest project +# nautible-app-ms-order-manifest project 注文サービスのマニフェストを管理するプロジェクト diff --git a/base/order-deploy.yaml b/base/order-deploy.yaml index 2f1a6fc..5f0d059 100644 --- a/base/order-deploy.yaml +++ b/base/order-deploy.yaml @@ -2,11 +2,11 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: nautible-app-order - namespace: nautible-app + name: nautible-app-ms-order + namespace: nautible-app-ms labels: - app.kubernetes.io/name: nautible-app-order - app.kubernetes.io/instance: nautible-app-order + app.kubernetes.io/name: nautible-app-ms-order + app.kubernetes.io/instance: nautible-app-ms-order app.kubernetes.io/version: 1.0.0 app.kubernetes.io/component: app app.kubernetes.io/part-of: nautible @@ -15,26 +15,26 @@ spec: replicas: 2 selector: matchLabels: - app.kubernetes.io/instance: nautible-app-order + app.kubernetes.io/instance: nautible-app-ms-order app.kubernetes.io/component: app template: metadata: labels: - app.kubernetes.io/name: nautible-app-order - app.kubernetes.io/instance: nautible-app-order + app.kubernetes.io/name: nautible-app-ms-order + app.kubernetes.io/instance: nautible-app-ms-order app.kubernetes.io/version: 1.0.0 app.kubernetes.io/component: app app.kubernetes.io/part-of: nautible app.kubernetes.io/managed-by: manual annotations: dapr.io/enabled: "true" - dapr.io/app-id: "nautible-app-order" + dapr.io/app-id: "nautible-app-ms-order" dapr.io/app-port: "8080" proxy.istio.io/config: '{ "holdApplicationUntilProxyStarts": true }' # https://github.com/dapr/dapr/issues/2657 spec: containers: - - name: nautible-app-order - image: public.ecr.aws/nautible/nautible-app-order:dummy + - name: nautible-app-ms-order + image: public.ecr.aws/nautible/nautible-app-ms-order:dummy ports: - containerPort: 8080 - containerPort: 9000 diff --git a/base/order-service.yaml b/base/order-service.yaml index 580d72d..9ccf1e5 100644 --- a/base/order-service.yaml +++ b/base/order-service.yaml @@ -1,23 +1,23 @@ apiVersion: v1 kind: Service metadata: - name: nautible-app-order - namespace: nautible-app + name: nautible-app-ms-order + namespace: nautible-app-ms labels: - app.kubernetes.io/name: nautible-app-order - app.kubernetes.io/instance: nautible-app-order + app.kubernetes.io/name: nautible-app-ms-order + app.kubernetes.io/instance: nautible-app-ms-order app.kubernetes.io/version: 1.0.0 app.kubernetes.io/component: app app.kubernetes.io/part-of: nautible app.kubernetes.io/managed-by: manual spec: selector: - app.kubernetes.io/instance: nautible-app-order + app.kubernetes.io/instance: nautible-app-ms-order app.kubernetes.io/component: app ports: - - name: http-nautible-app-order-port + - name: http-nautible-app-ms-order-port port: 8080 targetPort: 8080 - - name: grpc-nautible-app-order-port + - name: grpc-nautible-app-ms-order-port port: 9000 targetPort: 9000 diff --git a/overlays/aws/dev/istio-network.yaml b/overlays/aws/dev/istio-network.yaml index 8004055..66df34e 100644 --- a/overlays/aws/dev/istio-network.yaml +++ b/overlays/aws/dev/istio-network.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1alpha3 kind: Gateway metadata: - name: nautible-app-order-gateway - namespace: nautible-app + name: nautible-app-ms-order-gateway + namespace: nautible-app-ms labels: - app.kubernetes.io/name: nautible-app-order-gateway - app.kubernetes.io/instance: nautible-app-order-gateway + app.kubernetes.io/name: nautible-app-ms-order-gateway + app.kubernetes.io/instance: nautible-app-ms-order-gateway app.kubernetes.io/version: 1.0.0 app.kubernetes.io/component: gateway app.kubernetes.io/part-of: nautible @@ -24,11 +24,11 @@ spec: apiVersion: networking.istio.io/v1beta1 kind: VirtualService metadata: - name: nautible-app-order-vs - namespace: nautible-app + name: nautible-app-ms-order-vs + namespace: nautible-app-ms labels: - app.kubernetes.io/name: nautible-app-order-vs - app.kubernetes.io/instance: nautible-app-order-vs + app.kubernetes.io/name: nautible-app-ms-order-vs + app.kubernetes.io/instance: nautible-app-ms-order-vs app.kubernetes.io/version: 1.0.0 app.kubernetes.io/component: virtualservice app.kubernetes.io/part-of: nautible @@ -37,25 +37,25 @@ spec: hosts: - "*" gateways: - - nautible-app-order-gateway + - nautible-app-ms-order-gateway http: - match: - uri: - prefix: /api/v1.0/nautible-app/order + prefix: /api/v1.0/nautible-app-ms/order rewrite: uri: "/order" route: - destination: - host: nautible-app-order + host: nautible-app-ms-order port: number: 8080 - match: - uri: - prefix: /api/v1.0/nautible-app/cart + prefix: /api/v1.0/nautible-app-ms/cart rewrite: uri: "/cart" route: - destination: - host: nautible-app-order + host: nautible-app-ms-order port: number: 8080 diff --git a/overlays/aws/dev/order-dapr-pubsub.yaml b/overlays/aws/dev/order-dapr-pubsub.yaml index b90d716..25df096 100644 --- a/overlays/aws/dev/order-dapr-pubsub.yaml +++ b/overlays/aws/dev/order-dapr-pubsub.yaml @@ -2,7 +2,7 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: name: order-pubsub - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-pubsub app.kubernetes.io/instance: order-pubsub diff --git a/overlays/aws/dev/order-dapr-statestore-redis.yaml b/overlays/aws/dev/order-dapr-statestore-redis.yaml index 8a3771c..fe2349e 100644 --- a/overlays/aws/dev/order-dapr-statestore-redis.yaml +++ b/overlays/aws/dev/order-dapr-statestore-redis.yaml @@ -2,7 +2,7 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: name: order-statestore - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-statestore app.kubernetes.io/instance: order-statestore diff --git a/overlays/aws/dev/order-deploy.yaml b/overlays/aws/dev/order-deploy.yaml index 18db4fc..ae9be6a 100644 --- a/overlays/aws/dev/order-deploy.yaml +++ b/overlays/aws/dev/order-deploy.yaml @@ -2,14 +2,14 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: nautible-app-order - namespace: nautible-app + name: nautible-app-ms-order + namespace: nautible-app-ms spec: template: spec: containers: - - name: nautible-app-order - image: public.ecr.aws/nautible/nautible-app-order:a78505647d034b4c651368102c9facea05d4c988 + - name: nautible-app-ms-order + image: public.ecr.aws/nautible/nautible-app-ms-order:a78505647d034b4c651368102c9facea05d4c988 env: - name: QUARKUS_PROFILE value: aws-dev diff --git a/overlays/aws/local-dev/order-dapr-pubsub.yaml b/overlays/aws/local-dev/order-dapr-pubsub.yaml index c3224a4..5bcfa46 100644 --- a/overlays/aws/local-dev/order-dapr-pubsub.yaml +++ b/overlays/aws/local-dev/order-dapr-pubsub.yaml @@ -2,7 +2,7 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: name: order-pubsub - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-pubsub app.kubernetes.io/instance: order-pubsub diff --git a/overlays/aws/local-dev/order-dapr-statestore.yaml b/overlays/aws/local-dev/order-dapr-statestore.yaml index d484745..92dce65 100644 --- a/overlays/aws/local-dev/order-dapr-statestore.yaml +++ b/overlays/aws/local-dev/order-dapr-statestore.yaml @@ -2,7 +2,7 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: name: order-statestore - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-statestore app.kubernetes.io/instance: order-statestore diff --git a/overlays/aws/local-dev/order-deploy.yaml b/overlays/aws/local-dev/order-deploy.yaml index 89b5540..ebb7cde 100644 --- a/overlays/aws/local-dev/order-deploy.yaml +++ b/overlays/aws/local-dev/order-deploy.yaml @@ -1,14 +1,14 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: nautible-app-order - namespace: nautible-app + name: nautible-app-ms-order + namespace: nautible-app-ms spec: replicas: 1 template: spec: containers: - - name: nautible-app-order + - name: nautible-app-ms-order env: - name: QUARKUS_PROFILE value: aws-local-dev diff --git a/overlays/aws/local-dev/order-localstack.yaml b/overlays/aws/local-dev/order-localstack.yaml index 78addaa..62ceebc 100644 --- a/overlays/aws/local-dev/order-localstack.yaml +++ b/overlays/aws/local-dev/order-localstack.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: order-localstack - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-localstack app.kubernetes.io/instance: order-localstack @@ -59,7 +59,7 @@ apiVersion: v1 kind: Service metadata: name: order-localstack - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-localstack app.kubernetes.io/instance: order-localstack diff --git a/overlays/aws/local-dev/order-redis.yaml b/overlays/aws/local-dev/order-redis.yaml index 9e3165f..5170d33 100644 --- a/overlays/aws/local-dev/order-redis.yaml +++ b/overlays/aws/local-dev/order-redis.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: order-redis - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-redis app.kubernetes.io/instance: order-redis @@ -41,7 +41,7 @@ apiVersion: v1 kind: Service metadata: name: order-redis - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-redis app.kubernetes.io/instance: order-redis diff --git a/overlays/azure/dev/istio-network.yaml b/overlays/azure/dev/istio-network.yaml index 8004055..66df34e 100644 --- a/overlays/azure/dev/istio-network.yaml +++ b/overlays/azure/dev/istio-network.yaml @@ -1,11 +1,11 @@ apiVersion: networking.istio.io/v1alpha3 kind: Gateway metadata: - name: nautible-app-order-gateway - namespace: nautible-app + name: nautible-app-ms-order-gateway + namespace: nautible-app-ms labels: - app.kubernetes.io/name: nautible-app-order-gateway - app.kubernetes.io/instance: nautible-app-order-gateway + app.kubernetes.io/name: nautible-app-ms-order-gateway + app.kubernetes.io/instance: nautible-app-ms-order-gateway app.kubernetes.io/version: 1.0.0 app.kubernetes.io/component: gateway app.kubernetes.io/part-of: nautible @@ -24,11 +24,11 @@ spec: apiVersion: networking.istio.io/v1beta1 kind: VirtualService metadata: - name: nautible-app-order-vs - namespace: nautible-app + name: nautible-app-ms-order-vs + namespace: nautible-app-ms labels: - app.kubernetes.io/name: nautible-app-order-vs - app.kubernetes.io/instance: nautible-app-order-vs + app.kubernetes.io/name: nautible-app-ms-order-vs + app.kubernetes.io/instance: nautible-app-ms-order-vs app.kubernetes.io/version: 1.0.0 app.kubernetes.io/component: virtualservice app.kubernetes.io/part-of: nautible @@ -37,25 +37,25 @@ spec: hosts: - "*" gateways: - - nautible-app-order-gateway + - nautible-app-ms-order-gateway http: - match: - uri: - prefix: /api/v1.0/nautible-app/order + prefix: /api/v1.0/nautible-app-ms/order rewrite: uri: "/order" route: - destination: - host: nautible-app-order + host: nautible-app-ms-order port: number: 8080 - match: - uri: - prefix: /api/v1.0/nautible-app/cart + prefix: /api/v1.0/nautible-app-ms/cart rewrite: uri: "/cart" route: - destination: - host: nautible-app-order + host: nautible-app-ms-order port: number: 8080 diff --git a/overlays/azure/dev/order-dapr-pubsub.yaml b/overlays/azure/dev/order-dapr-pubsub.yaml index 58f972b..ebd1da6 100644 --- a/overlays/azure/dev/order-dapr-pubsub.yaml +++ b/overlays/azure/dev/order-dapr-pubsub.yaml @@ -2,7 +2,7 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: name: order-pubsub - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-pubsub app.kubernetes.io/instance: order-pubsub @@ -16,5 +16,5 @@ spec: metadata: - name: connectionString secretKeyRef: - name: secret-nautible-app-common + name: secret-nautible-app-ms-common key: SERVICE_BUS_CONNECTION_STRING diff --git a/overlays/azure/dev/order-dapr-statestore-redis.yaml b/overlays/azure/dev/order-dapr-statestore-redis.yaml index 46380e0..fc7daf0 100644 --- a/overlays/azure/dev/order-dapr-statestore-redis.yaml +++ b/overlays/azure/dev/order-dapr-statestore-redis.yaml @@ -2,7 +2,7 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: name: order-statestore - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-statestore app.kubernetes.io/instance: order-statestore @@ -16,11 +16,11 @@ spec: metadata: - name: redisHost secretKeyRef: - name: secret-nautible-app-order + name: secret-nautible-app-ms-order key: DAPR_STATESTORE_HOST - name: redisPassword secretKeyRef: - name: secret-nautible-app-order + name: secret-nautible-app-ms-order key: DAPR_STATESTORE_PW - name: enableTLS value: true \ No newline at end of file diff --git a/overlays/azure/dev/order-deploy.yaml b/overlays/azure/dev/order-deploy.yaml index f17fb10..582050a 100644 --- a/overlays/azure/dev/order-deploy.yaml +++ b/overlays/azure/dev/order-deploy.yaml @@ -2,24 +2,24 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: nautible-app-order - namespace: nautible-app + name: nautible-app-ms-order + namespace: nautible-app-ms spec: template: spec: containers: - - name: nautible-app-order - image: nautibledevacr.azurecr.io/nautible-app-order:a78505647d034b4c651368102c9facea05d4c988 + - name: nautible-app-ms-order + image: nautibledevacr.azurecr.io/nautible-app-ms-order:a78505647d034b4c651368102c9facea05d4c988 env: - name: QUARKUS_PROFILE value: azure-dev - name: DB_USER valueFrom: secretKeyRef: - name: secret-nautible-app-cosmosdb + name: secret-nautible-app-ms-cosmosdb key: DATABASE_USER - name: DB_PW valueFrom: secretKeyRef: - name: secret-nautible-app-cosmosdb + name: secret-nautible-app-ms-cosmosdb key: DATABASE_PW diff --git a/overlays/azure/local-dev/order-dapr-pubsub.yaml b/overlays/azure/local-dev/order-dapr-pubsub.yaml index b064a98..48d1081 100644 --- a/overlays/azure/local-dev/order-dapr-pubsub.yaml +++ b/overlays/azure/local-dev/order-dapr-pubsub.yaml @@ -2,7 +2,7 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: name: order-pubsub - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-pubsub app.kubernetes.io/instance: order-pubsub diff --git a/overlays/azure/local-dev/order-dapr-statestore.yaml b/overlays/azure/local-dev/order-dapr-statestore.yaml index d484745..92dce65 100644 --- a/overlays/azure/local-dev/order-dapr-statestore.yaml +++ b/overlays/azure/local-dev/order-dapr-statestore.yaml @@ -2,7 +2,7 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: name: order-statestore - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-statestore app.kubernetes.io/instance: order-statestore diff --git a/overlays/azure/local-dev/order-deploy.yaml b/overlays/azure/local-dev/order-deploy.yaml index 7dd4aef..4dd200d 100644 --- a/overlays/azure/local-dev/order-deploy.yaml +++ b/overlays/azure/local-dev/order-deploy.yaml @@ -1,15 +1,15 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: nautible-app-order - namespace: nautible-app + name: nautible-app-ms-order + namespace: nautible-app-ms spec: replicas: 1 template: spec: containers: - - name: nautible-app-order - image: nautibledevacr.azurecr.io/nautible-app-order:latest + - name: nautible-app-ms-order + image: nautibledevacr.azurecr.io/nautible-app-ms-order:latest env: - name: QUARKUS_PROFILE value: azure-local-dev diff --git a/overlays/azure/local-dev/order-mongo.yaml b/overlays/azure/local-dev/order-mongo.yaml index 6d03fef..4923ffb 100644 --- a/overlays/azure/local-dev/order-mongo.yaml +++ b/overlays/azure/local-dev/order-mongo.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: order-mongodb - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-mongodb app.kubernetes.io/instance: order-mongodb @@ -63,7 +63,7 @@ apiVersion: v1 kind: Service metadata: name: order-mongodb - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-mongodb app.kubernetes.io/instance: order-mongodb diff --git a/overlays/azure/local-dev/order-redis.yaml b/overlays/azure/local-dev/order-redis.yaml index 9e3165f..5170d33 100644 --- a/overlays/azure/local-dev/order-redis.yaml +++ b/overlays/azure/local-dev/order-redis.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: order-redis - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-redis app.kubernetes.io/instance: order-redis @@ -41,7 +41,7 @@ apiVersion: v1 kind: Service metadata: name: order-redis - namespace: nautible-app + namespace: nautible-app-ms labels: app.kubernetes.io/name: order-redis app.kubernetes.io/instance: order-redis From 8ec7d04879ec9ad7ba26cbe283edba3afda01a7f Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 22 Mar 2022 06:31:47 +0000 Subject: [PATCH 2/3] update manifest --- overlays/aws/dev/order-deploy.yaml | 2 +- overlays/azure/dev/order-deploy.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/overlays/aws/dev/order-deploy.yaml b/overlays/aws/dev/order-deploy.yaml index ae9be6a..58e9da2 100644 --- a/overlays/aws/dev/order-deploy.yaml +++ b/overlays/aws/dev/order-deploy.yaml @@ -9,7 +9,7 @@ spec: spec: containers: - name: nautible-app-ms-order - image: public.ecr.aws/nautible/nautible-app-ms-order:a78505647d034b4c651368102c9facea05d4c988 + image: public.ecr.aws/nautible/nautible-app-ms-order:52d412cfc7dfb052cd1290f4ca4c0031a5130b3b env: - name: QUARKUS_PROFILE value: aws-dev diff --git a/overlays/azure/dev/order-deploy.yaml b/overlays/azure/dev/order-deploy.yaml index 582050a..f974132 100644 --- a/overlays/azure/dev/order-deploy.yaml +++ b/overlays/azure/dev/order-deploy.yaml @@ -9,7 +9,7 @@ spec: spec: containers: - name: nautible-app-ms-order - image: nautibledevacr.azurecr.io/nautible-app-ms-order:a78505647d034b4c651368102c9facea05d4c988 + image: nautibledevacr.azurecr.io/nautible-app-ms-order:52d412cfc7dfb052cd1290f4ca4c0031a5130b3b env: - name: QUARKUS_PROFILE value: azure-dev From cafeae93d08f0170fcf1eff67f2a40c6272219a1 Mon Sep 17 00:00:00 2001 From: Katsuhiro Yamanaka Date: Mon, 28 Mar 2022 12:04:29 +0900 Subject: [PATCH 3/3] new line --- overlays/azure/dev/order-dapr-statestore-redis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlays/azure/dev/order-dapr-statestore-redis.yaml b/overlays/azure/dev/order-dapr-statestore-redis.yaml index fc7daf0..1ed7cbd 100644 --- a/overlays/azure/dev/order-dapr-statestore-redis.yaml +++ b/overlays/azure/dev/order-dapr-statestore-redis.yaml @@ -23,4 +23,4 @@ spec: name: secret-nautible-app-ms-order key: DAPR_STATESTORE_PW - name: enableTLS - value: true \ No newline at end of file + value: true