Added forgotten camo, rabbitmq container to the kubernetes deployment file

This commit is contained in:
Alexander Trost
2015-10-20 10:15:58 +02:00
parent 4fa5464ab8
commit 3592466631
2 changed files with 22 additions and 5 deletions

View File

@@ -38,7 +38,7 @@ zulip:
REDIS_HOST: "redis" REDIS_HOST: "redis"
RABBITMQ_HOST: "rabbitmq" RABBITMQ_HOST: "rabbitmq"
ZULIP_USER_EMAIL: "example@example.com" ZULIP_USER_EMAIL: "example@example.com"
ZULIP_USER_DOMAIN: "zerbytes.net" ZULIP_USER_DOMAIN: "example.com"
ZULIP_AUTHENTICATION_BACKENDS_EmailAuthBackend: "EmailAuthBackend" ZULIP_AUTHENTICATION_BACKENDS_EmailAuthBackend: "EmailAuthBackend"
ZULIP_SECRETS_email_password: "12345" ZULIP_SECRETS_email_password: "12345"
ZULIP_SECRETS_rabbitmq_password: "zulip" ZULIP_SECRETS_rabbitmq_password: "zulip"

View File

@@ -32,11 +32,28 @@ spec:
limits: limits:
cpu: 75m cpu: 75m
memory: 768Mi memory: 768Mi
- name: rabbitmq
image: docker.io/rabbitmq:3.5.5
resources:
limits:
cpu: 75m
memory: 768Mi
env:
- name: RABBITMQ_DEFAULT_USER
value: "zulip"
- name: RABBITMQ_DEFAULT_PASS
value: "zulip"
- name: camo
image: quay.io/galexrt/camo:latest
resources:
limits:
cpu: 75m
memory: 512Mi
- name: postgresql - name: postgresql
image: quay.io/galexrt/zulip-postgresql-tsearchextras:latest image: quay.io/galexrt/zulip-postgresql-tsearchextras:latest
resources: resources:
limits: limits:
cpu: 50m cpu: 80m
memory: 768Mi memory: 768Mi
env: env:
- name: DB_NAME - name: DB_NAME
@@ -52,8 +69,8 @@ spec:
image: quay.io/galexrt/zulip:3.1.6 image: quay.io/galexrt/zulip:3.1.6
resources: resources:
limits: limits:
cpu: 95m cpu: 100m
memory: 1536Mi memory: 3584Mi
env: env:
- name: DB_HOST - name: DB_HOST
value: "database" value: "database"
@@ -66,7 +83,7 @@ spec:
- name: ZULIP_USER_EMAIL - name: ZULIP_USER_EMAIL
value: "example@example.com" value: "example@example.com"
- name: ZULIP_USER_DOMAIN - name: ZULIP_USER_DOMAIN
value: "zerbytes.net" value: "example.com"
- name: ZULIP_AUTHENTICATION_BACKENDS_EmailAuthBackend - name: ZULIP_AUTHENTICATION_BACKENDS_EmailAuthBackend
value: "EmailAuthBackend" value: "EmailAuthBackend"
- name: ZULIP_SECRETS_email_password - name: ZULIP_SECRETS_email_password