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

Run dashboard in a dedicated deployment with helm chart #18093

Merged
merged 8 commits into from
Oct 19, 2020
Merged

Run dashboard in a dedicated deployment with helm chart #18093

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9817965
Run dashboard in a dedicated deployment
sleshchenko Oct 12, 2020
dd7bc79
fixup! Run dashboard in a dedicated deployment
sleshchenko Oct 12, 2020
f7ceca9
configure dashboard probes to requests /dashboard/ to detect packagin…
sleshchenko Oct 12, 2020
8d49e54
Apply the same probes configuration as registries apache servers has
sleshchenko Oct 12, 2020
74b0ae3
fixup! Apply the same probes configuration as registries apache serve…
sleshchenko Oct 12, 2020
837a91e
Add end slash to dashboard path to continue support redirects
sleshchenko Oct 13, 2020
2fa1570
Bump che dashboard version in helm charts on release
sleshchenko Oct 13, 2020
0c18486
Clean up references to removed deploy_che.sh
sleshchenko Oct 19, 2020
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
1 change: 1 addition & 0 deletions .ci/set_tag_version_images_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ sed -i "s/che-devfile-registry:.*/che-devfile-registry:$1/g" ../deploy/kubernete
sed -i "s/che-postgres:.*/che-postgres:$1/g" ../deploy/kubernetes/helm/che/custom-charts/che-postgres/values.yaml
sed -i "s/che-keycloak:.*/che-keycloak:$1/g" ../deploy/kubernetes/helm/che/custom-charts/che-keycloak/values.yaml
sed -i "s/eclipse\/che-server:.*/eclipse\/che-server:$1/g" ../deploy/kubernetes/helm/che/values.yaml
sed -i "s/eclipse\/che-dashboard:.*/eclipse\/che-dashboard:$1/g" ../deploy/kubernetes/helm/che/values.yaml
sleshchenko marked this conversation as resolved.
Show resolved Hide resolved

sed -i "s/che-endpoint-watcher:nightly/che-endpoint-watcher:$1/g" ../deploy/kubernetes/helm/che/custom-charts/che-keycloak/templates/deployment.yaml
sed -i "s/che-endpoint-watcher:nightly/che-endpoint-watcher:$1/g" ../deploy/kubernetes/helm/che/templates/deployment.yaml
1 change: 1 addition & 0 deletions .ci/set_tag_version_images_macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ sed -i '' "s/che-devfile-registry:nightly/che-devfile-registry:$1/g" ../deploy/k
sed -i '' "s/che-postgres:nightly/che-postgres:$1/g" ../deploy/kubernetes/helm/che/custom-charts/che-postgres/values.yaml
sed -i '' "s/che-keycloak:nightly/che-keycloak:$1/g" ../deploy/kubernetes/helm/che/custom-charts/che-keycloak/values.yaml
sed -i '' "s/eclipse\/che-server:nightly/eclipse\/che-server:$1/g" ../deploy/kubernetes/helm/che/values.yaml
sed -i '' "s/eclipse\/che-dashboard:next/eclipse\/che-dashboard:$1/g" ../deploy/kubernetes/helm/che/values.yaml


61 changes: 61 additions & 0 deletions deploy/kubernetes/helm/che/templates/dashboard-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
#
# Copyright (c) 2012-2018 Red Hat, Inc.
# This program and the accompanying materials are made
# available under the terms of the Eclipse Public License 2.0
# which is available at https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#

apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: che
component: che-dashboard
name: che-dashboard
spec:
replicas: 1
revisionHistoryLimit: 2
selector:
matchLabels:
app: che
component: che-dashboard
strategy:
type: RollingUpdate
template:
metadata:
labels:
app: che
component: che-dashboard
spec:
containers:
- name: che-dashboard
image: {{ .Values.dashboard.image }}
imagePullPolicy: {{ .Values.dashboard.imagePullPolicy }}
ports:
- containerPort: 8080
name: http
resources:
limits:
memory: {{ .Values.dashboard.memoryLimit }}
cpu: {{ .Values.dashboard.cpuLimit }}
requests:
sleshchenko marked this conversation as resolved.
Show resolved Hide resolved
memory: {{ .Values.dashboard.memoryRequest }}
cpu: {{ .Values.dashboard.cpuRequest }}
livenessProbe:
httpGet:
path: /dashboard/
port: 8080
scheme: HTTP
initialDelaySeconds: 30
periodSeconds: 10
timeoutSeconds: 3
readinessProbe:
httpGet:
path: /dashboard/
port: 8080
scheme: HTTP
initialDelaySeconds: 3
periodSeconds: 10
timeoutSeconds: 3
47 changes: 47 additions & 0 deletions deploy/kubernetes/helm/che/templates/dashboard-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#
# Copyright (c) 2012-2019 Red Hat, Inc.
# This program and the accompanying materials are made
# available under the terms of the Eclipse Public License 2.0
# which is available at https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#

# If single-host powered by gateway is configured - the corresponding gateway configmap is expexted to be created
# but not this ingress
{{- if not (and (eq .Values.global.serverStrategy "single-host") (eq .Values.global.singleHostExposure "gateway")) }}

apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: che-dashboard-ingress
annotations:
kubernetes.io/ingress.class: "nginx"
{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-read-timeout: "3600"
{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/proxy-connect-timeout: "3600"
{{- if and .Values.global.tls .Values.global.tls.enabled }}
{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/ssl-redirect: "true"
{{- else }}
{{ .Values.global.ingressAnnotationsPrefix }}ingress.kubernetes.io/ssl-redirect: "false"
{{- end }}
spec:
{{- if .Values.global.tls.enabled }}
tls:
- hosts:
- {{ template "cheHost" . }}
secretName: {{ .Values.global.tls.secretName }}
{{- end }}
rules:
{{- if ne .Values.global.serverStrategy "default-host" }}
- host: {{ template "cheHost" . }}
http:
{{- else }}
- http:
{{- end }}
paths:
# The path rule for Che Dashboard
- path: /dashboard/
backend:
serviceName: che-dashboard
servicePort: 8080
{{- end }}
25 changes: 25 additions & 0 deletions deploy/kubernetes/helm/che/templates/dashboard-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#
# Copyright (c) 2012-2019 Red Hat, Inc.
# This program and the accompanying materials are made
# available under the terms of the Eclipse Public License 2.0
# which is available at https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#

apiVersion: v1
kind: Service
metadata:
labels:
app: che
component: che-dashboard
name: che-dashboard
spec:
ports:
- name: http
port: 8080
protocol: TCP
targetPort: 8080
selector:
app: che
component: che-dashboard
32 changes: 32 additions & 0 deletions deploy/kubernetes/helm/che/templates/dashboard-traefik-gateway-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#
# Copyright (c) 2012-2018 Red Hat, Inc.
# This program and the accompanying materials are made
# available under the terms of the Eclipse Public License 2.0
# which is available at https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
#

{{- if and (eq .Values.global.serverStrategy "single-host") (eq .Values.global.singleHostExposure "gateway") }}

apiVersion: v1
kind: ConfigMap
metadata:
labels:
app: che
component: che-gateway-config
name: che-gateway-route-dashboard
data:
dashboard.yml: |
http:
routers:
che-dashboard:
rule: "PathPrefix(`/dashboard/`)"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does it work without end slash?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checking, I assume that if we miss end slash, then we'll get broken redirects, like /dashboardanythings -> /dashboard since it's currently done by Che Server.

Copy link
Member Author

@sleshchenko sleshchenko Oct 13, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot_20201013_103025

First Dashboard ingress with end /, the second without. Do you see any issue with end slash?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added end slash to ingress http path as well.

service: che-dashboard
priority: 10
services:
che-dashboard:
loadBalancer:
servers:
- url: 'http://che-dashboard:8080'
{{- end }}
18 changes: 13 additions & 5 deletions deploy/kubernetes/helm/che/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,19 @@ spec:
- http:
{{- end }}
paths:
- path: /
backend:
{{- if and (eq .Values.global.serverStrategy "single-host") (eq .Values.global.singleHostExposure "gateway") }}
serviceName: che-gateway
- path: /
backend:
serviceName: che-gateway
servicePort: 8080
{{- else }}
serviceName: che-host
- path: /
backend:
serviceName: che-host
servicePort: 8080
# The path rule for Che Dashboard next hosted by Che Server. It should be removed after https://github.com/eclipse/che/issues/17647 is fixed
- path: /dashboard/next
backend:
serviceName: che-host
servicePort: 8080
{{- end }}
servicePort: 8080
5 changes: 5 additions & 0 deletions deploy/kubernetes/helm/che/templates/traefik-gateway-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ data:
rule: "PathPrefix(`/`)"
service: che
priority: 1
# The path rule for Che Dashboard next hosted by Che Server. It should be removed after https://github.com/eclipse/che/issues/17647 is fixed
dashboard-next:
rule: "PathPrefix(`/dashboard/next`)"
service: che
priority: 20
services:
che:
loadBalancer:
Expand Down
8 changes: 8 additions & 0 deletions deploy/kubernetes/helm/che/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,14 @@ che:
disableProbes: false
logLevel: "INFO"

dashboard:
image: quay.io/eclipse/che-dashboard:next
imagePullPolicy: "Always"
memoryRequest: 16Mi
memoryLimit: 256Mi
cpuRequest: 50m
cpuLimit: 500m

cheDevfileRegistry:
deploy: true

Expand Down
1 change: 0 additions & 1 deletion deploy/kubernetes/helm/che/values/multi-user.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@

global:
multiuser: true