fix: some minor fixes for AWS deployment

papercups-io · Apr 4, 2021 · c53d0ad · c53d0ad
1 parent 959dab0
commit c53d0ad
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/charts/papercups/Chart.yaml b/charts/papercups/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart to deploy the papercups chat server to Kubernetes
 type: application
 
 # This is the chart version.
-version: 0.1.3
+version: 0.1.4
 
 # This is the version number of the application being deployed.
 appVersion: "latest"

diff --git a/charts/papercups/README.md.gotmpl b/charts/papercups/README.md.gotmpl
@@ -28,4 +28,8 @@ $ helm repo add bitnami https://charts.bitnami.com/bitnami
 $ helm install papercups-db bitnami/postgresql --set postgresqlUsername=papercups,postgresqlPassword=changeit,postgresqlDatabase=papercups
 ```
 
+## Deploying to AWS
+
+Read more at [https://docs.papercups.io/aws](https://docs.papercups.io/aws).
+
 {{ template "chart.valuesSection" . }}
diff --git a/charts/papercups/templates/ingress.yaml b/charts/papercups/templates/ingress.yaml
@@ -1,7 +1,9 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "papercups.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1

diff --git a/charts/papercups/values.yaml b/charts/papercups/values.yaml
@@ -50,18 +50,24 @@ securityContext: {}
   # runAsUser: 1000
 
 service:
-  type: ClusterIP
+  type: NodePort
   port: 4000
 
-# -- TODO: This is untested
 ingress:
+  # -- Enable using an Ingress controller.
   enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
+  # -- Specify Ingress controller's annotations.
+  annotations:
+    # AWS annotations - Read more at https://docs.papercups.io/aws
+    kubernetes.io/ingress.class: alb
+    alb.ingress.kubernetes.io/scheme: internet-facing
+    alb.ingress.kubernetes.io/target-type: instance
+  # -- Specify what hosts the listener will listen for.
+  # -- If external-dns is enabled, then create DNS records for each host entry
   hosts:
-    - host: papercups.example.com
-      paths: []
+    - host: "*"
+      paths:
+        - /
   tls: []
   #  - secretName: papercups-example-com-tls
   #    hosts: