diff --git a/k8s/base/api.yaml b/k8s/base/api.yaml index c8714c33..96df3ae7 100644 --- a/k8s/base/api.yaml +++ b/k8s/base/api.yaml @@ -7,12 +7,9 @@ metadata: app: api spec: accessModes: - - ReadWriteOnce + - ReadWriteMany capacity: storage: 0Mi - storageClassName: standard - hostPath: - path: /data/files --- apiVersion: v1 kind: PersistentVolumeClaim @@ -22,7 +19,7 @@ metadata: app: api spec: accessModes: - - ReadWriteOnce + - ReadWriteMany resources: requests: storage: 0Mi @@ -47,8 +44,6 @@ spec: spec: containers: - name: api - image: kazirashid/file-server:latest - imagePullPolicy: Always env: - name: RATE_LIMIT_PROVIDER value: redis @@ -72,7 +67,7 @@ spec: name: mongodb key: MONGODB_DATABASE - name: MONGODB_URI - value: mongodb://${MONGODB_USERNAME}:${MONGODB_PASSWORD}@mongodb:27017/${MONGODB_DATABASE} + value: mongodb://$(MONGODB_USERNAME):$(MONGODB_PASSWORD)@mongodb:27017/$(MONGODB_DATABASE) - name: STORAGE_TEMP_LOCATION value: /temp - name: STORAGE_PROVIDER @@ -138,4 +133,4 @@ spec: ports: - protocol: TCP port: 3002 - nodePort: 30101 + nodePort: 30100 diff --git a/k8s/base/mongodb.yaml b/k8s/base/mongodb.yaml index b3deff93..de8481bd 100644 --- a/k8s/base/mongodb.yaml +++ b/k8s/base/mongodb.yaml @@ -7,12 +7,9 @@ metadata: app: mongodb spec: accessModes: - - ReadWriteOnce + - ReadWriteMany capacity: storage: 0Mi - storageClassName: standard - hostPath: - path: /data/mongodb --- apiVersion: v1 kind: PersistentVolumeClaim @@ -22,7 +19,7 @@ metadata: app: mongodb spec: accessModes: - - ReadWriteOnce + - ReadWriteMany resources: requests: storage: 0Mi @@ -36,6 +33,12 @@ metadata: app: mongodb data: MONGODB_DATABASE: file_share + init-mongodb.js: | + db.createUser({ + user: 'admin', + pwd: 'secret', + roles: ['dbOwner'] + }); --- apiVersion: v1 kind: Secret @@ -63,9 +66,6 @@ spec: containers: - name: mongodb image: mongo:6.0.2-focal - command: - - mongod - - --auth env: - name: MONGO_INITDB_ROOT_USERNAME valueFrom: @@ -92,12 +92,20 @@ spec: ports: - containerPort: 27017 volumeMounts: + - name: init-script + mountPath: /docker-entrypoint-initdb.d - name: mongodb mountPath: /data/db volumes: - name: mongodb persistentVolumeClaim: claimName: mongodb + - name: init-script + configMap: + name: mongodb + items: + - key: init-mongodb.js + path: init-mongodb.js --- apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler diff --git a/k8s/base/redis.yaml b/k8s/base/redis.yaml index 12014131..423c899e 100644 --- a/k8s/base/redis.yaml +++ b/k8s/base/redis.yaml @@ -7,12 +7,9 @@ metadata: app: redis spec: accessModes: - - ReadWriteOnce + - ReadWriteMany capacity: storage: 0Mi - storageClassName: standard - hostPath: - path: /data/redis --- apiVersion: v1 kind: PersistentVolumeClaim @@ -22,7 +19,7 @@ metadata: app: redis spec: accessModes: - - ReadWriteOnce + - ReadWriteMany resources: requests: storage: 0Mi diff --git a/k8s/overlays/development/api.yaml b/k8s/overlays/development/api.yaml index 43331f78..8e15e9fe 100644 --- a/k8s/overlays/development/api.yaml +++ b/k8s/overlays/development/api.yaml @@ -5,7 +5,11 @@ metadata: name: files spec: capacity: - storage: 128Mi + storage: 2Gi + hostPath: + path: /data/files + persistentVolumeReclaimPolicy: Delete + storageClassName: standard --- apiVersion: v1 kind: PersistentVolumeClaim @@ -14,7 +18,7 @@ metadata: spec: resources: requests: - storage: 128Mi + storage: 2Gi --- apiVersion: apps/v1 kind: StatefulSet @@ -25,6 +29,8 @@ spec: spec: containers: - name: api + image: kazirashid/file-server:latest + imagePullPolicy: Always resources: requests: cpu: 256m diff --git a/k8s/overlays/development/mongodb.yaml b/k8s/overlays/development/mongodb.yaml index 788d2b07..c835728d 100644 --- a/k8s/overlays/development/mongodb.yaml +++ b/k8s/overlays/development/mongodb.yaml @@ -6,6 +6,10 @@ metadata: spec: capacity: storage: 128Mi + hostPath: + path: /data/mongodb + persistentVolumeReclaimPolicy: Delete + storageClassName: standard --- apiVersion: v1 kind: PersistentVolumeClaim @@ -27,11 +31,11 @@ spec: - name: mongodb resources: requests: - cpu: 64m - memory: 64Mi - limits: - cpu: 128m + cpu: 256m memory: 256Mi + limits: + cpu: 512m + memory: 512Mi --- apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler diff --git a/k8s/overlays/development/redis.yaml b/k8s/overlays/development/redis.yaml index 53d90271..96993b58 100644 --- a/k8s/overlays/development/redis.yaml +++ b/k8s/overlays/development/redis.yaml @@ -6,6 +6,10 @@ metadata: spec: capacity: storage: 8Mi + hostPath: + path: /data/redis + persistentVolumeReclaimPolicy: Delete + storageClassName: standard --- apiVersion: v1 kind: PersistentVolumeClaim