diff --git a/template/postgres/cn-cluster.template.yaml b/template/postgres/cn-cluster.template.yaml index 97f65ea..0ce2949 100644 --- a/template/postgres/cn-cluster.template.yaml +++ b/template/postgres/cn-cluster.template.yaml @@ -4,7 +4,7 @@ metadata: name: postgres-cn-cluster namespace: portfolio spec: - instances: 3 + instances: 1 primaryUpdateStrategy: unsupervised imageName: ghcr.io/cloudnative-pg/postgresql:14.10-18 diff --git a/template/storage/storage-processor.template.yaml b/template/storage/storage-processor.template.yaml index 2e6f835..3c9dd92 100644 --- a/template/storage/storage-processor.template.yaml +++ b/template/storage/storage-processor.template.yaml @@ -18,7 +18,6 @@ spec: containers: - name: storage-processor image: yoshiunfriendly/storage-hideyoshi.com:latest - command: ["./run-queue.sh"] args: ["-q"] imagePullPolicy: "Always" resources: @@ -29,7 +28,25 @@ spec: memory: "256Mi" cpu: "250m" env: - - name: REDIS_BASE_URL + - name: ALLOWED_ORIGINS + valueFrom: + secretKeyRef: + name: frontend-secret + key: backendUrl + + - name: EXPIRES_IN + valueFrom: + secretKeyRef: + name: backend-secret + key: accessTokenDuration + + - name: SERVER_PORT + valueFrom: + configMapKeyRef: + name: storage-config + key: storage_port + + - name: REDIS_HOST valueFrom: configMapKeyRef: name: redis-config @@ -47,9 +64,6 @@ spec: name: redis-secret key: redisPassword - - name: REDIS_URL - value: "redis://:$(REDIS_PASSWORD)@$(REDIS_BASE_URL):$(REDIS_PORT)/rq" - - name: STORAGE_TYPE valueFrom: secretKeyRef: