Make container ports configurable to support unprivileged ports

airbytehq · Nov 20, 2023 · 32c80af · 32c80af
1 parent 7b8f7d1
commit 32c80af
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/airbyte-webapp/Dockerfile b/airbyte-webapp/Dockerfile
@@ -1,7 +1,7 @@
 ARG NGINX_IMAGE=nginx:alpine
 FROM ${NGINX_IMAGE}
 
-EXPOSE 80
-
 COPY bin/build /usr/share/nginx/html
 COPY bin/nginx/default.conf.template /etc/nginx/templates/default.conf.template
+
+
diff --git a/airbyte-webapp/nginx/default.conf.template b/airbyte-webapp/nginx/default.conf.template
@@ -11,8 +11,8 @@ upstream keycloak {
 }
 
 server {
-    listen       80;
-    listen  [::]:80;
+    listen       ${NGINX_PORT};
+    listen  [::]:${NGINX_PORT};
     server_name  localhost;
 
     add_header Content-Security-Policy "script-src * 'unsafe-inline'; worker-src 'self' blob:;";

diff --git a/charts/airbyte-connector-builder-server/templates/deployment.yaml b/charts/airbyte-connector-builder-server/templates/deployment.yaml
@@ -116,7 +116,7 @@ spec:
 
         ports:
         - name: http
-          containerPort: 80
+          containerPort: {{ .Values.ports.http }}
           protocol: TCP
         {{- if .Values.debug.enabled }}
         - name: debug 

diff --git a/charts/airbyte-connector-builder-server/values.yaml b/charts/airbyte-connector-builder-server/values.yaml
@@ -27,6 +27,10 @@ image:
   repository: airbyte/connector-builder-server
   pullPolicy: IfNotPresent
 
+## HTTP port of connector-builder-server container - option to switch to a non-privileged one
+ports:
+  http: 80
+
 ##  podAnnotations [object] Add extra annotations to the server pod
 ##
 podAnnotations: {}

diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml
@@ -141,7 +141,7 @@ spec:
         {{- end }}
         ports:
         - name: http
-          containerPort: 80
+          containerPort: {{ .Values.ports.http }}
           protocol: TCP
         {{- if .Values.resources }}
         resources: {{- toYaml .Values.resources | nindent 10 }}

diff --git a/charts/airbyte-webapp/values.yaml b/charts/airbyte-webapp/values.yaml
@@ -25,6 +25,10 @@ image:
   repository: airbyte/webapp
   pullPolicy: IfNotPresent
 
+## HTTP port of webapp container - option to switch to a non-privileged one
+ports:
+  http: 80
+
 ##  webapp.podAnnotations [object] Add extra annotations to the webapp pod(s)
 ##
 podAnnotations: {}