Merge branch 'feat/v1.29.2' into feature-prometheus-agent

sighupio · Jul 31, 2024 · 94714bf · 94714bf
2 parents f863a40 + 02c22fa
commit 94714bf
Show file tree

Hide file tree

Showing 34 changed files with 409 additions and 13,389 deletions.
diff --git a/defaults/ekscluster-kfd-v1alpha2.yaml b/defaults/ekscluster-kfd-v1alpha2.yaml
@@ -134,6 +134,10 @@ data:
             disableAuth: false
             host: ""
             ingressClass: ""
+          grafanaBasicAuth:
+            disableAuth: false
+            host: ""
+            ingressClass: ""
           minio:
             disableAuth: false
             host: ""
@@ -163,6 +167,8 @@ data:
         rootUser:
           username: minio
           password: minio123
+      grafana:
+        basicAuthIngress: false
     # tracing module configuration
     tracing:
       overrides:

diff --git a/defaults/kfddistribution-kfd-v1alpha2.yaml b/defaults/kfddistribution-kfd-v1alpha2.yaml
@@ -127,6 +127,10 @@ data:
             disableAuth: false
             host: ""
             ingressClass: ""
+          grafanaBasicAuth:
+            disableAuth: false
+            host: ""
+            ingressClass: ""
           minio:
             disableAuth: false
             host: ""
@@ -156,6 +160,8 @@ data:
         rootUser:
           username: minio
           password: minio123
+      grafana:
+        basicAuthIngress: false
     # tracing module configuration
     tracing:
       overrides:

diff --git a/defaults/onpremises-kfd-v1alpha2.yaml b/defaults/onpremises-kfd-v1alpha2.yaml
@@ -127,6 +127,10 @@ data:
             disableAuth: false
             host: ""
             ingressClass: ""
+          grafanaBasicAuth:
+            disableAuth: false
+            host: ""
+            ingressClass: ""
           minio:
             disableAuth: false
             host: ""
@@ -156,6 +160,8 @@ data:
         rootUser:
           username: minio
           password: minio123
+      grafana:
+        basicAuthIngress: false
     # tracing module configuration
     tracing:
       overrides:

diff --git a/pkg/apis/ekscluster/v1alpha2/private/schema.go b/pkg/apis/ekscluster/v1alpha2/private/schema.go
diff --git a/pkg/apis/ekscluster/v1alpha2/public/schema.go b/pkg/apis/ekscluster/v1alpha2/public/schema.go
diff --git a/pkg/apis/kfddistribution/v1alpha2/public/schema.go b/pkg/apis/kfddistribution/v1alpha2/public/schema.go