CHG configurable ports

Author: wabscale

k8s/chart/templates/ingress.yml

@@ -164,7 +164,7 @@ spec:
     match: Host(`about.{{ .Values.marketing.domain }}`)
     services:
     - name: {{ include "chart.fullname" . }}-marketing-web
-      port: 3000
+      port: {{ .Values.marketing.port }}
   {{- if not .Values.debug }}
   tls:
     certResolver: le
@@ -192,7 +192,7 @@ spec:
     match: Host(`{{ .Values.pincer.domain }}`)
     services:
     - name: {{ include "chart.fullname" . }}-pincer-web
-      port: 8000
+      port: {{ .Values.pincer.port }}
   {{- if not .Values.debug }}
   tls:
     certResolver: le

k8s/chart/templates/marketing-web.yml

@@ -40,11 +40,11 @@ spec:
             cpu: 100m
             memory: 200Mi
           limits:
-            cpu: 2
+            cpu: 2000m
             memory: 500Mi
         ports:
         - name: web
-          containerPort: 3000
+          containerPort: {{ .Values.marketing.port }}
         {{- if .Values.healthChecks }}
         startupProbe:
           httpGet:
@@ -83,6 +83,6 @@ spec:
     component: marketing-web
   ports:
   - name: web
-    port: 3000
-    targetPort: 3000
+    port: {{ .Values.marketing.port }}
+    targetPort: {{ .Values.marketing.port }}
 {{- end }}

k8s/chart/templates/pincer-web.yml

@@ -44,7 +44,7 @@ spec:
             memory: 500Mi
         ports:
         - name: web
-          containerPort: 3000
+          containerPort: {{ .Values.pincer.port }}
         {{- if .Values.healthChecks }}
         startupProbe:
           httpGet:
@@ -83,6 +83,6 @@ spec:
     component: pincer-web
   ports:
   - name: web
-    port: 8000
-    targetPort: 8000
+    port: {{ .Values.pincer.port }}
+    targetPort: {{ .Values.pincer.port }}
 {{- end }}

k8s/chart/values.yaml

@@ -97,14 +97,16 @@ discord_bot:
 
 marketing:
   enable: true
-  domain: "anubis-lms.io"
+  domain: "about.anubis-lms.io"
+  port: 3000
   image: "registry.digitalocean.com/anubis/marketing-site"
   tag: "latest"
   replicas: 1
 
 pincer:
   enable: true
   domain: "pincer.anubis-lms.io"
+  port: 8000
   image: "registry.digitalocean.com/anubis/pincer"
   tag: "latest"
   replicas: 1