From 2bcb494f7e76b7f4b0503596635840bfa60e33da Mon Sep 17 00:00:00 2001
From: Timo <flecno@flecno.de>
Date: Mon, 26 Jun 2017 22:18:36 +0200
Subject: [PATCH] [stable/sentry] Fix sentry defaults (#1318)

* remove wrong static default port from ingress

* update defaults and readme to stable chart names
---
 stable/sentry/README.md              | 16 +++++++++-------
 stable/sentry/templates/ingress.yaml |  2 +-
 stable/sentry/values.yaml            |  5 +++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/stable/sentry/README.md b/stable/sentry/README.md
index 6e90f7ffe6..f8eed41001 100644
--- a/stable/sentry/README.md
+++ b/stable/sentry/README.md
@@ -5,7 +5,7 @@
 ## TL;DR;
 
 ```console
-$ helm install --wait incubator/sentry
+$ helm install --wait stable/sentry
 ```
 
 ## Introduction
@@ -19,6 +19,7 @@ It also packages the [PostgreSQL](https://github.com/kubernetes/charts/tree/mast
 ## Prerequisites
 
 - Kubernetes 1.4+ with Beta APIs enabled
+- helm >= v2.3.0 to run "weighted" hooks in right order.
 - PV provisioner support in the underlying infrastructure (with persistence storage enabled)
 
 ## Installing the Chart
@@ -26,7 +27,7 @@ It also packages the [PostgreSQL](https://github.com/kubernetes/charts/tree/mast
 To install the chart with the release name `my-release`:
 
 ```console
-$ helm install --name my-release --wait incubator/sentry
+$ helm install --name my-release --wait stable/sentry
 ```
 
 > **Note**: We have to use the --wait flag for initial creation because the database creationg takes longer than the default 300 seconds
@@ -74,12 +75,13 @@ The following tables lists the configurable parameters of the Sentry chart and t
 | `service.externalPort`               | Kubernetes external service port           | `9000`                                                     |
 | `service.internalPort`               | Kubernetes internal service port           | `9000`                                                     |
 | `ingress.enabled`                    | Enable ingress controller resource         | `false`                                                    |
-| `ingress.hostname`                   | URL to address your Sentry installation    | `sentry.local`                                          |
-| `ingress.tls`                        | Ingress TLS configuration                  | `[]`                                          |
+| `ingress.annotations`                | Ingress annotations                        | `{}`                                                       |
+| `ingress.hostname`                   | URL to address your Sentry installation    | `sentry.local`                                             |
+| `ingress.tls`                        | Ingress TLS configuration                  | `[]`                                                       |
 | `persistence.enabled`                | Enable persistence using PVC               | `true`                                                     |
 | `persistence.storageClass`           | PVC Storage Class                          | `nil` (uses alpha storage class annotation)                |
 | `persistence.accessMode`             | PVC Access Mode                            | `ReadWriteOnce`                                            |
-| `persistence.size`                   | PVC Storage Request                        | `10Gi`                                                      |                                              |
+| `persistence.size`                   | PVC Storage Request                        | `10Gi`                                                     |
 
 Dependent charts can also have values overwritten. Preface values with postgresql.* or redis.*
 
@@ -88,13 +90,13 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
 ```console
 $ helm install --name my-release \
   --set persistence.enabled=false,email.host=email \
-    incubator/sentry
+    stable/sentry
 ```
 
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
 
 ```console
-$ helm install --name my-release -f values.yaml incubator/sentry
+$ helm install --name my-release -f values.yaml stable/sentry
 ```
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
diff --git a/stable/sentry/templates/ingress.yaml b/stable/sentry/templates/ingress.yaml
index ef7c7b8722..a8ac294524 100644
--- a/stable/sentry/templates/ingress.yaml
+++ b/stable/sentry/templates/ingress.yaml
@@ -20,7 +20,7 @@ spec:
           - path: /
             backend:
               serviceName: {{ template "fullname" . }}
-              servicePort: 80
+              servicePort: {{ .Values.service.externalPort }}
 {{- if .Values.ingress.tls }}
   tls:
 {{ toYaml .Values.ingress.tls | indent 4 }}
diff --git a/stable/sentry/values.yaml b/stable/sentry/values.yaml
index 1b11efc1d8..2767a0c452 100644
--- a/stable/sentry/values.yaml
+++ b/stable/sentry/values.yaml
@@ -89,13 +89,14 @@ ingress:
 
   ## Ingress annotations
   ##
-  # annotations:
+  annotations: {}
   #   kubernetes.io/ingress.class: nginx
+  #   kubernetes.io/tls-acme: 'true'
 
   ## Ingress TLS configuration
   ## Secrets must be manually created in the namespace
   ##
-  # tls:
+  tls: []
   #   - secretName: sentry.local-tls
   #     hosts:
   #       - sentry.local