Merge pull request #3 from nautible/feature/modify_name

構成変更対応
nautible · Apr 5, 2022 · 57042d5 · 57042d5
2 parents e689287 + 453c11c
commit 57042d5
Show file tree

Hide file tree

Showing 21 changed files with 81 additions and 81 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:52d412cfc7dfb052cd1290f4ca4c0031a5130b3b
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+    value: true
diff --git 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:52d412cfc7dfb052cd1290f4ca4c0031a5130b3b
         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
@@ -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