Merge pull request #51 from vector-im/gaelg/web-port

expose web http port

Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.6
+version: 0.4.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

configs/haproxy/haproxy.cfg

@@ -66,5 +66,5 @@ backend jitsi-meet
   # We don't use server-template here so as we want to use k8s to dispatch to an up nginx in the shard
   # If we used server-template we'd have web.replicas * shardCount nginxes
 {{- range $shard, $e := until (int $.Values.shardCount) }}
-  server shard{{ $shard }} shard-{{ $shard }}-{{ $.Values.web.name }}.{{ $.Values.namespace}}.svc.cluster.local:80 check resolvers kube-dns init-addr none
+  server shard{{ $shard }} shard-{{ $shard }}-{{ $.Values.web.name }}.{{ $.Values.namespace}}.svc.cluster.local:{{ $.Values.web.httpPort }} check resolvers kube-dns init-addr none
 {{- end }}

templates/web-deployment.yaml

@@ -40,7 +40,7 @@ spec:
         - name: DISABLE_HTTPS
           value: "1"
         - name: HTTP_PORT
-          value: "80"
+          value: "{{ $.Values.web.httpPort }}"
         - name: XMPP_SERVER
           value: shard-{{ $shard }}-{{ $.Values.prosody.name }}.{{ $.Release.Namespace }}.svc.cluster.local
         - name: JICOFO_AUTH_USER
@@ -76,7 +76,7 @@ spec:
         imagePullPolicy: {{ $.Values.web.imagePullPolicy }}
         name: web
         ports:
-        - containerPort: 80
+        - containerPort: {{ $.Values.web.httpPort }}
           protocol: TCP
           name: http
         readinessProbe:

templates/web-service.yaml

@@ -12,7 +12,7 @@ metadata:
 spec:
   ports:
   - name: http
-    port: 80
+    port: {{ $.Values.web.httpPort }}
     targetPort: http
   selector:
     k8s-app: {{ $.Values.web.name }}

values.yaml

@@ -104,6 +104,7 @@ web:
     requests:
       cpu: 400m
       memory: 300Mi
+  httpPort: 80
   extraEnvs: []
   extraPodSpec: {}
   extraVolumes: []