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

grafana, kibana, es upgrade #181

Merged
merged 1 commit into from
Jul 29, 2024
Merged

grafana, kibana, es upgrade #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions api/v1/appdefaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ var esDefault = Es{
Enabled: false,
ServiceAccount: "es",
Replicas: 1,
Image: "cnvrg-es:7.17.5",
Image: "cnvrg-es:v7.17.22",
Port: 9200,
StorageSize: "80Gi",
SvcName: "elasticsearch",
Expand Down Expand Up @@ -270,7 +270,7 @@ var esDefault = Es{
ServiceAccount: "kibana",
SvcName: "kibana",
Port: 8080,
Image: "kibana-oss:7.8.1",
Image: "cnvrg/kibana:7.11.2",
NodePort: 30601,
Requests: Requests{
Cpu: "100m",
Expand Down Expand Up @@ -322,7 +322,7 @@ var promDefaults = Prom{
StorageSize: "50Gi",
Grafana: Grafana{
Enabled: false,
Image: "grafana-oss:9.1.7",
Image: "grafana/grafana-oss:9.5.20",
SvcName: "grafana",
Port: 8080,
NodePort: 30012,
Expand Down
8 changes: 4 additions & 4 deletions charts/mlops/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ dbs:
es:
enabled: true
serviceAccount: es
image: cnvrg-es:7.17.5
image: cnvrg-es:v7.17.22
port: 9200
storageSize: 80Gi
svcName: elasticsearch
Expand All @@ -234,7 +234,7 @@ dbs:
serviceAccount: kibana
svcName: kibana
port: 8080
image: kibana-oss:7.8.1
image: cnvrg/kibana:7.11.2
nodePort: 30601
requests:
cpu: 100m
Expand Down Expand Up @@ -270,7 +270,7 @@ dbs:
storageSize: 50Gi
grafana:
enabled: true
image: grafana-oss:9.1.7
image: grafana/grafana-oss:9.5.20
svcName: grafana
port: 8080
nodePort: 30012
Expand Down Expand Up @@ -360,4 +360,4 @@ cvatdbs:
enabled: false
mpi:
enabled: false
scc: false
scc: false
11 changes: 10 additions & 1 deletion pkg/desired/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,23 @@ server:
name: kibana
host: %s
port: %s
status:
allowAnonymous: true
xpack.security.authc.providers:
anonymous.anonymous1:
order: 0
credentials:
username: %s
password: %s

elasticsearch:
hosts:
- %s
username: %s
password: %s
customHeaders:
Authorization: "Basic %s"
`, host, port, esHost, esUser, esPass, esBasicAuth)
`, host, port, esUser, esPass, esHost, esUser, esPass, esBasicAuth)
},

"isTrue": func(boolPointer bool) bool { // this is legacy function and should be removed in the future
Expand Down
Loading