imfreedom/k8s-cluster

Update reviewboard to 4.0.4, move to the official image and add an nginx container to the pod to serve static files

2021-08-06, Gary Kramlich
66b0fe78a92d
Parents dce5d1764d28
Children 41ff7f91d3e2
Update reviewboard to 4.0.4, move to the official image and add an nginx container to the pod to serve static files
3 files changed, 86 insertions(+), 12 deletions(-)
  • +9 -0
    50-reviews.imfreedom.org/reviewboard/kustomization.yaml
  • +42 -12
    50-reviews.imfreedom.org/reviewboard/manifest.yaml
  • +35 -0
    50-reviews.imfreedom.org/reviewboard/nginx/rb.conf
    • --- a/50-reviews.imfreedom.org/reviewboard/kustomization.yaml Fri Aug 06 07:29:04 2021 -0500
    +++ b/50-reviews.imfreedom.org/reviewboard/kustomization.yaml Fri Aug 06 07:29:33 2021 -0500
    @@ -3,6 +3,15 @@
    commonLabels:
    app: reviews
    role: reviewboard
    +configMapGenerator:
    + - name: reviews-nginx
    + files:
    + - nginx/rb.conf
    + options:
    + disableNameSuffixHash: true
    + labels:
    + app: reviews
    + role: reviewboard
    resources:
    - manifest.yaml
    ---
    --- a/50-reviews.imfreedom.org/reviewboard/manifest.yaml Fri Aug 06 07:29:04 2021 -0500
    +++ b/50-reviews.imfreedom.org/reviewboard/manifest.yaml Fri Aug 06 07:29:33 2021 -0500
    @@ -11,7 +11,7 @@
    kind: Rule
    services:
    - name: reviews-reviewboard
    - port: 8000
    + port: 8081
    middlewares:
    - name: https-redirect
    ---
    @@ -27,7 +27,7 @@
    kind: Rule
    services:
    - name: reviews-reviewboard
    - port: 8000
    + port: 8081
    middlewares:
    - name: common-headers
    - name: hsts-headers
    @@ -52,7 +52,7 @@
    name: reviews-reviewboard
    spec:
    ports:
    - - port: 8000
    + - port: 8081
    protocol: TCP
    name: http
    selector:
    @@ -104,31 +104,37 @@
    spec:
    containers:
    - name: reviewboard
    - image: rwgrim/reviewboard:latest
    + image: rwgrim/reviewboard-app:latest
    imagePullPolicy: Always
    env:
    - - name: PGUSER
    + - name: DOMAIN
    + value: reviews.imfreedom.org
    + - name: COMPANY
    + value: Instant Messaging Freedom
    + - name: DATABASE_TYPE
    + value: postgresql
    + - name: DATABASE_SERVER
    + value: reviews-postgres
    + - name: DATABASE_USERNAME
    valueFrom:
    secretKeyRef:
    name: reviews-postgres
    key: username
    - - name: PGPASSWORD
    + - name: DATABASE_PASSWORD
    valueFrom:
    secretKeyRef:
    name: reviews-postgres
    key: password
    - - name: PGDB
    + - name: DATABASE_NAME
    valueFrom:
    secretKeyRef:
    name: reviews-postgres
    key: db
    - - name: PGHOST
    - value: reviews-postgres
    - - name: MEMCACHED
    + - name: MEMCACHED_SERVER
    value: reviews-memcached
    ports:
    - name: http
    - containerPort: 8000
    + containerPort: 8080
    resources:
    limits:
    cpu: 500m
    @@ -137,7 +143,28 @@
    cpu: 250m
    memory: 256Mi
    volumeMounts:
    - - mountPath: /var/www/
    + - mountPath: /site
    + name: reviews-reviewboard
    + readOnly: false
    + subPath: reviewboard
    + - name: nginx
    + image: rwgrim/reviewboard-nginx:latest
    + imagePullPolicy: Always
    + ports:
    + - name: http
    + containerPort: 8081
    + resources:
    + limits:
    + cpu: 100m
    + memory: 128Mi
    + requests:
    + cpu: 50m
    + memory: 64Mi
    + volumeMounts:
    + - mountPath: /etc/nginx/conf.d
    + name: reviews-nginx
    + readOnly: true
    + - mountPath: /site
    name: reviews-reviewboard
    readOnly: false
    subPath: reviewboard
    @@ -145,6 +172,9 @@
    - name: reviews-reviewboard
    persistentVolumeClaim:
    claimName: reviews-reviewboard
    + - name: reviews-nginx
    + configMap:
    + name: reviews-nginx
    ---
    apiVersion: v1
    kind: PersistentVolumeClaim
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/50-reviews.imfreedom.org/reviewboard/nginx/rb.conf Fri Aug 06 07:29:33 2021 -0500
    @@ -0,0 +1,35 @@
    +upstream reviewboard {
    + server 127.0.0.1:8080;
    +}
    +
    +server {
    + server_name reviews.imfreedom.org;
    + listen 8081;
    +
    + root /site/htdocs;
    +
    + location / {
    + proxy_pass http://reviewboard;
    + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
    + proxy_set_header Host $host;
    + proxy_redirect off;
    + }
    +
    + location /media/ {
    + alias /site/htdocs/media/;
    + add_header Access-Control-Allow-Origin *;
    + expires max;
    +
    + location ~ \.([sp]?html?|php\d?|phtm?|phps|pl|py|f?cgi|jsp|sh|rb) {
    + types {}
    + default_type text/plain;
    + }
    + }
    +
    + location /static/ {
    + alias /site/htdocs/static/;
    + add_header Access-Control-Allow-Origin *;
    + expires max;
    + }
    +}
    +