From cc6553121cf2110ce6f3b3fa120dbe6ecb370d33 Mon Sep 17 00:00:00 2001
From: Beltran Rueda <beltran@bitnami.com>
Date: Tue, 31 Jul 2018 07:05:49 +0000
Subject: [PATCH] Do not use volume for Nginx. Do not ship default SSL certs,
 only configure HTTP by default

---
 bitnami/nginx/Chart.yaml                | 4 ++--
 bitnami/nginx/README.md                 | 2 +-
 bitnami/nginx/templates/deployment.yaml | 8 +-------
 bitnami/nginx/templates/svc.yaml        | 3 ---
 bitnami/nginx/values.yaml               | 4 ++--
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/bitnami/nginx/Chart.yaml b/bitnami/nginx/Chart.yaml
index b26c672520..3a0f4771e2 100644
--- a/bitnami/nginx/Chart.yaml
+++ b/bitnami/nginx/Chart.yaml
@@ -1,6 +1,6 @@
 name: nginx
-version: 0.5.3
-appVersion: 1.14.0-ol-7
+version: 0.6.0
+appVersion: 1.14.0
 description: Chart for the nginx server
 keywords:
 - nginx
diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md
index ef6ef5d605..3fbd55ad4b 100644
--- a/bitnami/nginx/README.md
+++ b/bitnami/nginx/README.md
@@ -76,7 +76,7 @@ _custom-vhost.yaml_
 ```yaml
 vhost: |-
   server {
-    listen 0.0.0.0:80;
+    listen 0.0.0.0:8080;
     location / {
       return 200 "hello!";
     }
diff --git a/bitnami/nginx/templates/deployment.yaml b/bitnami/nginx/templates/deployment.yaml
index 887d37bb0c..f56658da74 100644
--- a/bitnami/nginx/templates/deployment.yaml
+++ b/bitnami/nginx/templates/deployment.yaml
@@ -30,8 +30,6 @@ spec:
         ports:
         - name: http
           containerPort: 8080
-        - name: https
-          containerPort: 8443
         livenessProbe:
           httpGet:
             path: /
@@ -47,15 +45,11 @@ spec:
           timeoutSeconds: 3
           periodSeconds: 5
         volumeMounts:
-        - name: nginx-data
-          mountPath: /bitnami/nginx
         {{- if .Values.vhost }}
         - name: nginx-vhost
-          mountPath: /bitnami/nginx/conf/vhosts
+          mountPath: /opt/bitnami/nginx/conf/vhosts
         {{- end }}
       volumes:
-      - name: nginx-data
-        emptyDir: {}
       {{- if .Values.vhost }}
       - name: nginx-vhost
         configMap:
diff --git a/bitnami/nginx/templates/svc.yaml b/bitnami/nginx/templates/svc.yaml
index 6736e04769..cf77abe82e 100644
--- a/bitnami/nginx/templates/svc.yaml
+++ b/bitnami/nginx/templates/svc.yaml
@@ -13,8 +13,5 @@ spec:
   - name: http
     port: 80
     targetPort: http
-  - name: https
-    port: 443
-    targetPort: https
   selector:
     app: {{ template "fullname" . }}
diff --git a/bitnami/nginx/values.yaml b/bitnami/nginx/values.yaml
index b4fda31bae..7f500b6162 100644
--- a/bitnami/nginx/values.yaml
+++ b/bitnami/nginx/values.yaml
@@ -4,7 +4,7 @@
 image:
   registry: docker.io
   repository: bitnami/nginx
-  tag: 1.14.0-ol-7
+  tag: 1.14.0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -25,7 +25,7 @@ serviceType: LoadBalancer
 # vhost: |-
 #   # example PHP-FPM vhost
 #   server {
-#     listen 0.0.0.0:80;
+#     listen 0.0.0.0:8080;
 #     root /app;
 #     location / {
 #       index index.html index.php;