Merge pull request #4 from nautible/feature/issue88

nautible/issues#88
nautible · Dec 1, 2022 · 832b336 · 832b336
2 parents 2b588cc + 4b173f3
commit 832b336
Show file tree

Hide file tree

Showing 11 changed files with 245 additions and 2 deletions.
diff --git a/base/delivery-cronjob.yaml b/base/delivery-cronjob.yaml
@@ -5,8 +5,13 @@ metadata:
   namespace: nautible-app-ms
 spec:
   schedule: "*/2 * * * *" # 2分おき
+  concurrencyPolicy: Forbid # 多重起動禁止
+  successfulJobsHistoryLimit: 3
+  failedJobsHistoryLimit: 1
   jobTemplate:
     spec:
+      backoffLimit: 0 # リトライなし
+      ttlSecondsAfterFinished: 30 # 終了後のPodを削除
       template:
         spec:
           containers:
@@ -19,4 +24,4 @@ spec:
             - 'date; curl -v
                -X "POST"
                http://nautible-app-ms-delivery:8080/delivery/confirmShipping/'
-          restartPolicy: OnFailure
+          restartPolicy: Never
diff --git a/overlays/aws/dev/delivery-deploy.yaml b/overlays/aws/dev/delivery-deploy.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
       - name: nautible-app-ms-delivery
-        image: public.ecr.aws/nautible/nautible-app-ms-delivery:4b7921d6feb05fa325c6eee5c16edcc9c1766a4a
+        image: public.ecr.aws/nautible/nautible-app-ms-delivery:022b37005603d970040b910b61245fcef4fdac91
         env:
         - name: QUARKUS_PROFILE
           value: aws-dev

diff --git a/overlays/azure/dev/delivery-dapr-pubsub.yaml b/overlays/azure/dev/delivery-dapr-pubsub.yaml
@@ -0,0 +1,20 @@
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: delivery-pubsub
+  namespace: nautible-app-ms
+  labels:
+    app.kubernetes.io/name: delivery-pubsub
+    app.kubernetes.io/instance: delivery-pubsub
+    app.kubernetes.io/version: 1.0.0
+    app.kubernetes.io/component: pubsub
+    app.kubernetes.io/part-of: nautible
+    app.kubernetes.io/managed-by: manual
+spec:
+  type: pubsub.azure.servicebus
+  version: v1
+  metadata:
+  - name: connectionString
+    secretKeyRef:
+      name: secret-nautible-app-ms-common
+      key: SERVICE_BUS_CONNECTION_STRING
diff --git a/overlays/azure/dev/delivery-deploy.yaml b/overlays/azure/dev/delivery-deploy.yaml
@@ -0,0 +1,25 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nautible-app-ms-delivery
+  namespace: nautible-app-ms
+spec:
+  template:
+    spec:
+      containers:
+      - name: nautible-app-ms-delivery
+        image: nautibledevacr.azurecr.io/nautible-app-ms-delivery:022b37005603d970040b910b61245fcef4fdac91
+        env:
+        - name: QUARKUS_PROFILE
+          value: azure-dev
+        - name: DB_USER
+          valueFrom:
+            secretKeyRef:
+              name: secret-nautible-app-ms-cosmosdb
+              key: DATABASE_USER
+        - name: DB_PW
+          valueFrom:
+            secretKeyRef:
+              name: secret-nautible-app-ms-cosmosdb
+              key: DATABASE_PW
diff --git a/overlays/azure/dev/kustomization.yaml b/overlays/azure/dev/kustomization.yaml
@@ -0,0 +1,6 @@
+bases:
+  - ../../../base
+patchesStrategicMerge:
+  - delivery-deploy.yaml
+# resources:
+#   - delivery-dapr-pubsub.yaml
diff --git a/overlays/azure/local-dev/delivery-dapr-pubsub.yaml b/overlays/azure/local-dev/delivery-dapr-pubsub.yaml
@@ -0,0 +1,20 @@
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: delivery-pubsub
+  namespace: nautible-app-ms
+  labels:
+    app.kubernetes.io/name: delivery-pubsub
+    app.kubernetes.io/instance: delivery-pubsub
+    app.kubernetes.io/version: 1.0.0
+    app.kubernetes.io/component: pubsub
+    app.kubernetes.io/part-of: nautible
+    app.kubernetes.io/managed-by: manual
+spec:
+  type: pubsub.redis
+  version: v1
+  metadata:
+  - name: redisHost
+    value: delivery-redis:6379
+  - name: redisPassword
+    value: password
diff --git a/overlays/azure/local-dev/delivery-deploy.yaml b/overlays/azure/local-dev/delivery-deploy.yaml
@@ -0,0 +1,17 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nautible-app-ms-delivery
+  namespace: nautible-app-ms
+spec:
+  replicas: 1
+  template:
+    spec:
+      containers:
+      - name: nautible-app-ms-delivery
+        image: nautibledevacr.azurecr.io/nautible-app-ms-delivery:latest
+        env:
+        - name: QUARKUS_PROFILE
+          value: azure-local-dev
+        # - name: JAVA_VERSION
+        #   value: "11"
diff --git a/overlays/azure/local-dev/dependencies/delivery-mongo.yaml b/overlays/azure/local-dev/dependencies/delivery-mongo.yaml
@@ -0,0 +1,82 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: delivery-mongodb
+  namespace: nautible-app-ms
+  labels:
+    app.kubernetes.io/name: delivery-mongodb
+    app.kubernetes.io/instance: delivery-mongodb
+    app.kubernetes.io/version: 1.0.0
+    app.kubernetes.io/component: delivery-mongodb
+    app.kubernetes.io/part-of: nautible
+    app.kubernetes.io/managed-by: manual
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: delivery-mongodb
+      app.kubernetes.io/component: delivery-mongodb
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: delivery-mongodb
+        app.kubernetes.io/instance: delivery-mongodb
+        app.kubernetes.io/version: 1.0.0
+        app.kubernetes.io/component: delivery-mongodb
+        app.kubernetes.io/part-of: nautible
+        app.kubernetes.io/managed-by: manual
+    spec:
+      containers:
+      - name: delivery-mongodb
+        image: mongo
+        ports:
+          - containerPort: 27017
+        env:
+        - name: MONGO_INITDB_ROOT_USERNAME
+          value: root
+        - name: MONGO_INITDB_ROOT_PASSWORD
+          value: password
+        lifecycle:
+          postStart:
+            exec:
+              command:
+                - sh
+                - -c
+                - "for i in `seq 1 60`; do mongostat mongodb://root:password@localhost:27017/?authSource=admin -n 1 && break || true; sleep 5; done \
+                   && mongosh mongodb://root:password@localhost:27017/Common?authSource=admin --eval 'db.getSiblingDB(\"Common\").createCollection(\"Sequence\");' \
+                   && mongosh mongodb://root:password@localhost:27017/Delivery?authSource=admin --eval 'db.getSiblingDB(\"Delivery\").createCollection(\"Delivery\");' \
+                   && mongosh mongodb://root:password@localhost:27017/Common?authSource=admin --eval 'db.Sequence.insertOne( { _id: \"Delivery\", SequenceNumber: NumberInt(0) } );'"
+      - name: delivery-mongodb-express
+        image: mongo-express
+        ports:
+          - containerPort: 8081
+        env:
+        - name: ME_CONFIG_MONGODB_ADMINUSERNAME
+          value: root
+        - name: ME_CONFIG_MONGODB_ADMINPASSWORD
+          value: password
+        - name: ME_CONFIG_MONGODB_SERVER
+          value: localhost
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: delivery-mongodb
+  namespace: nautible-app-ms
+  labels:
+    app.kubernetes.io/name: delivery-mongodb
+    app.kubernetes.io/instance: delivery-mongodb
+    app.kubernetes.io/version: 1.0.0
+    app.kubernetes.io/component: delivery-mongodb
+    app.kubernetes.io/part-of: nautible
+    app.kubernetes.io/managed-by: manual
+spec:
+  selector:
+    app.kubernetes.io/instance: delivery-mongodb
+    app.kubernetes.io/component: delivery-mongodb
+  ports:
+  - name: delivery-mongodb
+    port: 27017
+  - name: delivery-mongodb-express
+    port: 8081
diff --git a/overlays/azure/local-dev/dependencies/delivery-redis.yaml b/overlays/azure/local-dev/dependencies/delivery-redis.yaml
@@ -0,0 +1,59 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: delivery-redis
+  namespace: nautible-app-ms
+  labels:
+    app.kubernetes.io/name: delivery-redis
+    app.kubernetes.io/instance: delivery-redis
+    app.kubernetes.io/version: 1.0.0
+    app.kubernetes.io/component: redis
+    app.kubernetes.io/part-of: nautible
+    app.kubernetes.io/managed-by: manual
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: delivery-redis
+      app.kubernetes.io/component: redis
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: delivery-redis
+        app.kubernetes.io/instance: delivery-redis
+        app.kubernetes.io/version: 1.0.0
+        app.kubernetes.io/component: redis
+        app.kubernetes.io/part-of: nautible
+        app.kubernetes.io/managed-by: manual
+    spec:
+      containers:
+      - name: delivery-redis
+        image: redis:latest
+        ports:
+        - containerPort: 6379
+        env:
+          - name: REDIS_PASSWORD
+            value: password
+        command: ["redis-server"]
+        args: ["--requirepass $(REDIS_PASSWORD)"]
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: delivery-redis
+  namespace: nautible-app-ms
+  labels:
+    app.kubernetes.io/name: delivery-redis
+    app.kubernetes.io/instance: delivery-redis
+    app.kubernetes.io/version: 1.0.0
+    app.kubernetes.io/component: redis
+    app.kubernetes.io/part-of: nautible
+    app.kubernetes.io/managed-by: manual
+spec:
+  selector:
+    app.kubernetes.io/instance: delivery-redis
+    app.kubernetes.io/component: redis
+  ports:
+  - name: delivery-redis-port
+    port: 6379
+    targetPort: 6379
diff --git a/overlays/azure/local-dev/dependencies/kustomization.yaml b/overlays/azure/local-dev/dependencies/kustomization.yaml
@@ -0,0 +1,3 @@
+resources:
+  - delivery-mongo.yaml
+  - delivery-redis.yaml
diff --git a/overlays/azure/local-dev/kustomization.yaml b/overlays/azure/local-dev/kustomization.yaml
@@ -0,0 +1,6 @@
+bases:
+  - ../../../base
+patchesStrategicMerge:
+  - delivery-deploy.yaml
+# resources:
+#   - delivery-dapr-pubsub.yaml