Making it so the nginx sidecar is always deployed

uc-cdis · Sep 14, 2023 · de10727 · de10727
1 parent cfffb60
commit de10727
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/helm/indexd/README.md b/helm/indexd/README.md
@@ -95,8 +95,7 @@ A Helm chart for gen3 indexd
 | serviceAccount.annotations | map | `{}` | Annotations to add to the service account. |
 | serviceAccount.create | bool | `false` | Specifies whether a service account should be created. |
 | serviceAccount.name | string | `""` | The name of the service account |
-| sidecar | map | `{"enabled":true,"image":"quay.io/cdis/nginx","pullPolicy":"Always","tag":"master"}` | Configuration for Nginx sidecar container to be deployed with gunicorn. |
-| sidecar.enabled | bool | `true` | Whether to enable the nginx sidecar image. |
+| sidecar | map | `{"image":"quay.io/cdis/nginx","pullPolicy":"Always","tag":"master"}` | Configuration for Nginx sidecar container to be deployed with gunicorn. |
 | sidecar.image | string | `"quay.io/cdis/nginx"` | The Docker image repository for nginx |
 | sidecar.pullPolicy | string | `"Always"` | When to pull the image. |
 | sidecar.tag | string | `"master"` | Image tag. |

diff --git a/helm/indexd/templates/_helpers.tpl b/helm/indexd/templates/_helpers.tpl
@@ -101,15 +101,4 @@ Create the name of the service account to use
 */}}
 {{- define "indexd-gateway-creds" -}}
 {{- default (randAlphaNum 32) .Values.secrets.userdb.gateway }}
-{{- end }}
-
-{{/*
-Port for Gunicorn to bind to depending on if nginx sidecar is deployed.
-*/}}
-{{- define "indexd.gunicornPort" -}}
-{{- if .Values.sidecar.enabled}}
-{{- default 8000 }}
-{{- else }}
-{{- default 80}}
-{{- end }}
 {{- end }}
diff --git a/helm/indexd/templates/wsgi.yaml b/helm/indexd/templates/wsgi.yaml
@@ -5,7 +5,7 @@ metadata:
 data:
   gunicorn.conf.py: |
     wsgi_app = "deployment.wsgi.wsgi:application"
-    bind = "0.0.0.0:{{ include "indexd.gunicornPort" . }}"
+    bind = "0.0.0.0:8000"
     workers = 1
     user = 'appuser'
     group = 'appuser'
diff --git a/helm/indexd/values.yaml b/helm/indexd/values.yaml
@@ -100,8 +100,6 @@ image:
 
 # -- (map) Configuration for Nginx sidecar container to be deployed with gunicorn.
 sidecar:
-  # -- (bool) Whether to enable the nginx sidecar image.
-  enabled: true
   # -- (string) The Docker image repository for nginx
   image: quay.io/cdis/nginx
   # -- (string) When to pull the image.