Skip to content

Commit

Permalink
fix configuration issues on ingress
Browse files Browse the repository at this point in the history
Signed-off-by: Fotis Nikolaidis <[email protected]>
  • Loading branch information
fnikolai committed Jun 22, 2023
1 parent d0d5745 commit 2539b93
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 19 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- Upgrade to Grafana v9.4.7 in order to avoid issues with locking database (https://github.com/grafana/grafana/issues/60703)
- Change Grafana requirements to 2 CPU and 14 Gi memory.
- Separate the timeouts for Kubernetes API, Grafana, and Interactions (logs, reports).
- Disable Kubernetes dashboard by default.
- ...

### New Features & Functionality
Expand Down
36 changes: 18 additions & 18 deletions charts/platform/templates/ingress.yml
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
{{- if .Values.chaos.enabled }}
---
{{- if .Values.dashboard.enabled}}
# https://stackoverflow.com/questions/54506269/simple-ingress-from-host-with-microk8s
# https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: chaos-dashboard
name: dashboard
annotations:
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
nginx.ingress.kubernetes.io/ssl-redirect: "true"
nginx.ingress.kubernetes.io/ssl-passthrough: "true"
spec:
ingressClassName: {{.Values.global.ingressClass}}
rules:

- host: chaos-frisbee.{{.Values.global.domainName}}
- host: dashboard-frisbee.{{.Values.global.domainName}}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: chaos-dashboard
name: {{.Release.Name}}-kubernetes-dashboard
port:
number: 2333
number: 443
{{- end}}
---
# https://stackoverflow.com/questions/54506269/simple-ingress-from-host-with-microk8s
# https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/
{{- if .Values.chaos.enabled }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: dashboard
annotations:
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
nginx.ingress.kubernetes.io/ssl-redirect: "true"
nginx.ingress.kubernetes.io/ssl-passthrough: "true"
name: chaos-dashboard
spec:
ingressClassName: {{.Values.global.ingressClass}}
rules:
{{- if .Values.dashboard.enabled}}
- host: dashboard-frisbee.{{.Values.global.domainName}}

- host: chaos-frisbee.{{.Values.global.domainName}}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: {{.Release.Name}}-kubernetes-dashboard
name: chaos-dashboard
port:
number: 443
{{- end}}
number: 2333
{{- end}}
2 changes: 1 addition & 1 deletion charts/platform/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ chaos-mesh:

## @param dashboard.enabled Whether to enable Dashboard
dashboard:
enabled: true
enabled: false

0 comments on commit 2539b93

Please sign in to comment.