diff --git a/deployment.yaml b/deployment.yaml index 6cd1ca5..4e0dfa7 100644 --- a/deployment.yaml +++ b/deployment.yaml @@ -1,13 +1,10 @@ -# kubectl create namespace memelord-laurivosandi -# kubectl diff -n memelord-laurivosandi -f memelord.yaml -# kubectl apply -n memelord-laurivosandi -f memelord.yaml --- apiVersion: apps/v1 -kind: Deployment # see on stateless rakenduste jaoks +kind: Deployment metadata: name: memelord spec: - replicas: 1 + replicas: 2 selector: matchLabels: app: memelord @@ -15,21 +12,15 @@ spec: metadata: labels: app: memelord - spec: # SEE ON PODI LOOMISE SPEKK - - + spec: containers: - name: memelord -# image: codemowers/memelord:latest image: ghcr.io/l4rm4nd/memelord:latest imagePullPolicy: Always - ports: - name: http containerPort: 8000 env: - - name: AWS_S3_ADDRESSING_STYLE - value: path - name: DOMAIN value: memelord-laurivosandi.ee-lte-1.codemowers.io - name: DB_ENGINE @@ -61,8 +52,10 @@ spec: key: redis-password - name: STORAGE_BACKEND value: s3 - - + - name: CSP_IMG_SRC_EXTRA + value: https://minio.ee-lte-1.codemowers.io + - name: AWS_QUERYSTRING_AUTH + value: "true" # S3/MinIO Storage Configuration - name: STORAGE_BACKEND value: "s3" @@ -76,21 +69,20 @@ spec: secretKeyRef: name: memelord-laurivosandi-bucket key: secretKey - - name: AWS_S3_CUSTOM_DOMAIN - value: minio.ee-lte-1.codemowers.io - name: AWS_STORAGE_BUCKET_NAME value: "memelord-laurivosandi" - - name: AWS_S3_ENDPOINT_URL - value: "https://minio.ee-lte-1.codemowers.io" - name: AWS_S3_REGION_NAME value: "ee-lte-1" - - + - name: AWS_S3_ENDPOINT_URL + value: "https://minio.ee-lte-1.codemowers.io" + - name: AWS_LOCATION + value: "" # why is this set to 'media' in original? + - name: AWS_S3_ADDRESSING_STYLE + value: path - name: DEBUG value: "True" - name: SECURE_COOKIES value: "True" - - name: OIDC_ENABLED value: "True" - name: OIDC_RP_SIGN_ALGO diff --git a/ingress.yaml b/ingress.yaml index 1c81b9f..f57bf4a 100644 --- a/ingress.yaml +++ b/ingress.yaml @@ -51,7 +51,7 @@ metadata: name: memelord-laurivosandi spec: displayName: Memelord laurivosandi - uri: https://memelord-laurivosandi.ee-lte-1.codemowers.io/ + uri: https://memelord-laurivosandi.ee-lte-1.codemowers.io/oidc/authenticate/ redirectUris: - https://memelord-laurivosandi.ee-lte-1.codemowers.io/oidc/callback/ grantTypes: diff --git a/postgres.yaml b/postgres.yaml index 81bf91c..0700b55 100644 --- a/postgres.yaml +++ b/postgres.yaml @@ -18,7 +18,7 @@ kind: Cluster metadata: name: memelord-laurivosandi-database spec: - instances: 1 + instances: 2 imageName: ghcr.io/cloudnative-pg/postgresql:17 storage: size: 1Gi diff --git a/redis.yaml b/redis.yaml index 942a681..33a9bd4 100644 --- a/redis.yaml +++ b/redis.yaml @@ -18,7 +18,7 @@ spec: passwordFromSecret: name: memelord-laurivosandi-redis key: redis-password - replicas: 1 + replicas: 2 resources: requests: cpu: 500m