Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new vhost path #427

Merged
merged 5 commits into from
Aug 3, 2018
Merged

Use new vhost path #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d466798
Use new vhost path
Aug 3, 2018
c39408f
Update nginx version in jsonnet manifest
Aug 3, 2018
78d918d
Use fixed tag to avoid breaking changes
Aug 3, 2018
d8cce2f
Adapt kubeapps-dashboard image as well
Aug 3, 2018
c69c963
Merge branch 'master' into nginxVhost
andresmgot Aug 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chart/kubeapps/templates/dashboard-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion chart/kubeapps/templates/kubeapps-frontend-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion chart/kubeapps/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dashboard/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion manifests/kubeapps-dashboard.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions manifests/nginx.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
},
Expand All @@ -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"},
},
},
},
Expand Down