Use new vhost path (#427)

* Use new vhost path * Update nginx version in jsonnet manifest * Use fixed tag to avoid breaking changes * Adapt kubeapps-dashboard image as well
vmware-tanzu · Aug 3, 2018 · 78b2d87 · 78b2d87
1 parent ed8f2b2
commit 78b2d87
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/chart/kubeapps/templates/dashboard-deployment.yaml b/chart/kubeapps/templates/dashboard-deployment.yaml
@@ -30,7 +30,7 @@ spec:
 {{ toYaml .Values.dashboard.readinessProbe | indent 10 }}
         volumeMounts:
         - name: vhost
-          mountPath: /bitnami/nginx/conf/vhosts
+          mountPath: /opt/bitnami/nginx/conf/vhosts
         - name: config
           mountPath: /app/config.json
           subPath: config.json

diff --git a/chart/kubeapps/templates/kubeapps-frontend-deployment.yaml b/chart/kubeapps/templates/kubeapps-frontend-deployment.yaml
@@ -30,7 +30,7 @@ spec:
 {{ toYaml .Values.frontend.readinessProbe | indent 10 }}
         volumeMounts:
         - name: vhost
-          mountPath: /bitnami/nginx/conf/vhosts
+          mountPath: /opt/bitnami/nginx/conf/vhosts
         ports:
         - name: http
           containerPort: 8080

diff --git a/chart/kubeapps/values.yaml b/chart/kubeapps/values.yaml
@@ -86,7 +86,7 @@ frontend:
   image:
     registry: docker.io
     repository: bitnami/nginx
-    tag: 1.14
+    tag: 1.14.0-r27
   service:
     port: 80
     type: ClusterIP

diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile
@@ -7,5 +7,5 @@ RUN yarn install --frozen-lockfile
 COPY . /app
 RUN yarn run build
 
-FROM bitnami/nginx
+FROM bitnami/nginx:1.14.0-r27
 COPY --from=build /app/build /app
diff --git a/manifests/kubeapps-dashboard.jsonnet b/manifests/kubeapps-dashboard.jsonnet
@@ -50,7 +50,7 @@ local HashedConfigMap(name) = kube.ConfigMap(name) {
                   timeoutSeconds: 5,
                 },
                 volumeMounts_+: {
-                  vhost: {mountPath: "/bitnami/nginx/conf/vhosts"},
+                  vhost: {mountPath: "/opt/bitnami/nginx/conf/vhosts"},
                 },
               },
             },

diff --git a/manifests/nginx.jsonnet b/manifests/nginx.jsonnet
@@ -33,7 +33,7 @@ local HashedConfigMap(name) = kube.ConfigMap(name) {
         spec+: {
           containers_+: {
             default: kube.Container("nginx") {
-              image: "bitnami/nginx:1.12",
+              image: "bitnami/nginx:1.14.0-r27",
               ports_: {
                 http: {containerPort: 8080, protocol: "TCP"},
               },
@@ -50,7 +50,7 @@ local HashedConfigMap(name) = kube.ConfigMap(name) {
                 timeoutSeconds: 5,
               },
               volumeMounts_+: {
-                vhost: {mountPath: "/bitnami/nginx/conf/vhosts"},
+                vhost: {mountPath: "/opt/bitnami/nginx/conf/vhosts"},
               },
             },
           },