diff --git a/ente-photos/ente-deployment.yaml b/ente-photos/ente-deployment.yaml index 6249848..34a6b99 100644 --- a/ente-photos/ente-deployment.yaml +++ b/ente-photos/ente-deployment.yaml @@ -16,22 +16,30 @@ spec: spec: containers: - env: - - name: ENTE_CREDENTIALS_FILE - value: /credentials/credentials.yaml + - name: ENTE_DB_HOST + value: helm-postgresql + - name: ENTE_DB_PORT + value: 5432 + - name: ENTE_DB_NAME + value: ente_db + - name: ENTE_DB_USER + value: pguser + - name: ENTE_DB_PASSWORD + valueFrom: + secretKeyRef: + name: ente-photos-config + key: pgpass image: ghcr.io/ente-io/server name: museum - command: [ "sh", "-c"] - # loop forever, outputting "yo" every 5 seconds - args: ["while true; do echo 'yo' && sleep 5; done;"] + # command: [ "sh", "-c"] + # # loop forever, outputting "yo" every 5 seconds + # args: ["while true; do echo 'yo' && sleep 5; done;"] ports: - containerPort: 8080 protocol: TCP - containerPort: 2112 protocol: TCP volumeMounts: - - name: credentials - mountPath: /credentials - readOnly: true - mountPath: /var/logs name: custom-logs - mountPath: /museum.yaml @@ -47,9 +55,6 @@ spec: # name: socat restartPolicy: Always volumes: - - name: credentials - secret: - secretName: ente-photos-config - name: custom-logs persistentVolumeClaim: claimName: custom-logs diff --git a/ente-photos/ente-photos-es.yaml b/ente-photos/ente-photos-es.yaml index cdb0168..feb1be8 100644 --- a/ente-photos/ente-photos-es.yaml +++ b/ente-photos/ente-photos-es.yaml @@ -9,33 +9,12 @@ spec: kind: ClusterSecretStore target: name: ente-photos-config - template: - engineVersion: v2 - data: - credentials.yaml: | - db: - host: helm-postgresql - port: 5432 - name: ente_db - user: pguser - password: "{{ .pgpass }}" - sslmode: disable - - s3: - are_local_buckets: false - ente-photos: - key: ente-photos-user - secret: {{ .entepass }} - endpoint: minio.hensen.io:3200 - region: nl - bucket: ente-photos - data: - secretKey: pgpass remoteRef: key: ente-photos-postgres property: password - - secretKey: entepass + - secretKey: miniopass remoteRef: key: minio-ente-photos-user property: password