Merge pull request #196 from AccessibleAI/main

Merge operator upstream changes
AccessibleAI · Nov 13, 2024 · 1f631d9 · 1f631d9
2 parents f498aa6 + 4e113f3
commit 1f631d9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/api/v1/appdefaults.go b/api/v1/appdefaults.go
@@ -220,7 +220,7 @@ var pgDefault = Pg{
 var redisDefault = Redis{
 	Enabled:        false,
 	ServiceAccount: "redis",
-	Image:          "cnvrg-redis:v3.0.5.c2",
+	Image:          "cnvrg-redis:v7.0.0",
 	SvcName:        "redis",
 	Port:           6379,
 	StorageSize:    "10Gi",
@@ -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",
@@ -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",
@@ -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,

diff --git a/charts/mlops/values.yaml b/charts/mlops/values.yaml
@@ -89,7 +89,7 @@ controlPlane:
     readinessPeriodSeconds: 100
     readinessTimeoutSeconds: 60
   cnvrgScheduler:
-    enabled: true
+    enabled: false
     requests:
       cpu: 200m
       memory: 1000Mi
@@ -173,7 +173,7 @@ dbs:
   redis:
     enabled: true
     serviceAccount: redis
-    image: cnvrg-redis:v3.0.5.c2
+    image: cnvrg-redis:v7.0.0
     svcName: redis
     port: 6379
     storageSize: 10Gi
@@ -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
@@ -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
@@ -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

diff --git a/hack/scripts/paramsgen.js b/hack/scripts/paramsgen.js
@@ -230,7 +230,7 @@ let params = {
         "redis": {
             "enabled": true,
             "serviceAccount": "redis",
-            "image": "cnvrg-redis:v3.0.5.c2",
+            "image": "cnvrg-redis:v7.0.0",
             "svcName": "redis",
             "port": 6379,
             "storageSize": "10Gi",

diff --git a/pkg/desired/state.go b/pkg/desired/state.go
@@ -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