From d466798f4735c58434f05e0b35dfdb1b1d7fa5bb Mon Sep 17 00:00:00 2001 From: Andres Date: Fri, 3 Aug 2018 11:25:40 +0200 Subject: [PATCH 1/4] Use new vhost path --- chart/kubeapps/templates/kubeapps-frontend-deployment.yaml | 2 +- manifests/nginx.jsonnet | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/kubeapps/templates/kubeapps-frontend-deployment.yaml b/chart/kubeapps/templates/kubeapps-frontend-deployment.yaml index 8d7bcaf47c1..f32bb8f3294 100644 --- 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/manifests/nginx.jsonnet b/manifests/nginx.jsonnet index 1f9c53095cd..41508e6488f 100644 --- a/manifests/nginx.jsonnet +++ b/manifests/nginx.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"}, }, }, }, From c39408fbf62c08a65d277801c9bc4f2ca57c8032 Mon Sep 17 00:00:00 2001 From: Andres Date: Fri, 3 Aug 2018 11:37:09 +0200 Subject: [PATCH 2/4] Update nginx version in jsonnet manifest --- manifests/nginx.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/nginx.jsonnet b/manifests/nginx.jsonnet index 41508e6488f..4e831914b5e 100644 --- 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", ports_: { http: {containerPort: 8080, protocol: "TCP"}, }, From 78d918d32b9b7625072a5c4d28e239541eba1acf Mon Sep 17 00:00:00 2001 From: Andres Date: Fri, 3 Aug 2018 11:41:36 +0200 Subject: [PATCH 3/4] Use fixed tag to avoid breaking changes --- chart/kubeapps/values.yaml | 2 +- manifests/nginx.jsonnet | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/kubeapps/values.yaml b/chart/kubeapps/values.yaml index c598f5a168d..f50920ea96b 100644 --- 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/manifests/nginx.jsonnet b/manifests/nginx.jsonnet index 4e831914b5e..265173ead9f 100644 --- 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.14", + image: "bitnami/nginx:1.14.0-r27", ports_: { http: {containerPort: 8080, protocol: "TCP"}, }, From d8cce2f6eec13b9ab6e916a839d2cf14b0e410c1 Mon Sep 17 00:00:00 2001 From: Andres Date: Fri, 3 Aug 2018 12:02:46 +0200 Subject: [PATCH 4/4] Adapt kubeapps-dashboard image as well --- chart/kubeapps/templates/dashboard-deployment.yaml | 2 +- dashboard/Dockerfile | 2 +- manifests/kubeapps-dashboard.jsonnet | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chart/kubeapps/templates/dashboard-deployment.yaml b/chart/kubeapps/templates/dashboard-deployment.yaml index bf78a9d6a3a..ca9e8b06680 100644 --- 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/dashboard/Dockerfile b/dashboard/Dockerfile index 19c59ed1d97..be1b7d132db 100644 --- 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 index c36fee05c57..3d58808f50b 100644 --- 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"}, }, }, },