From 72970df116efa53ab6f52a7e776fc46ed0eb1a94 Mon Sep 17 00:00:00 2001
From: Ravi Mula <ravismula@users.noreply.github.com>
Date: Mon, 30 Dec 2024 12:28:20 +0530
Subject: [PATCH] #OBS-I436 velero and loki fixes

---
 helmcharts/global-cloud-values-aws.yaml   | 13 ++++---------
 helmcharts/global-cloud-values-azure.yaml |  9 +--------
 helmcharts/global-cloud-values-gcp.yaml   |  7 -------
 helmcharts/obsrv/values.yaml              |  2 ++
 4 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/helmcharts/global-cloud-values-aws.yaml b/helmcharts/global-cloud-values-aws.yaml
index cc28da74..892aa03f 100644
--- a/helmcharts/global-cloud-values-aws.yaml
+++ b/helmcharts/global-cloud-values-aws.yaml
@@ -17,7 +17,7 @@ global:
     '{"identity":"name","credential":"key","region":"region-name"}'
 
   spark_cloud_bucket: ""
-  storage_class_name: &storage_class_name "gp2"
+  storage_class_name: &storage_class_name "gp3"
   spark_service_account_arn: ""
   secor_backup_bucket: &secor_backup_bucket "<fill-value>" # Update with secor bucket name
   checkpoint_bucket: &checkpoint_bucket "s3://<fill-value>" # Update with checkpoint bucket name
@@ -147,18 +147,20 @@ velero-backup: &velero-backup
       create: *create_sa
       name: velero-backup-sa
       annotations:
-        eks.amazonaws.com/role-arn: *velero_sa_annotation
+        <<: *velero_sa_annotation
       labels:
   credentials:
     useSecret: false
   configuration:
     provider: *cloud_storage_provider
     backupStorageLocation:
+      provider: *cloud_storage_provider
       bucket: *velero_backup_cloud_bucket
       config:
         region: *cloud_storage_region
     volumeSnapshotLocation:
       name: default
+      namespace: velero
       config:
         region: *cloud_storage_region
   initContainers:
@@ -260,13 +262,6 @@ druid-raw-cluster:
   s3_secret_key: ""
   <<: *druid-raw-service-account
 
-loki:
-  storage:
-    type: *storage_class_name
-  compactor:
-    retention_enabled: true
-    working_directory: /var/loki/compactor/retention
-
 lakehouse-connector:
   hadoop_core_site:
       fs.s3a.imp: org.apache.hadoop.fs.s3a.S3AFileSystem
diff --git a/helmcharts/global-cloud-values-azure.yaml b/helmcharts/global-cloud-values-azure.yaml
index 1abed1a2..30505dba 100644
--- a/helmcharts/global-cloud-values-azure.yaml
+++ b/helmcharts/global-cloud-values-azure.yaml
@@ -174,7 +174,7 @@ dataset-api-service-account: &dataset-api-service-account
 config-api-service-account: &config-api-service-account
   serviceAccount:
     create: *create_sa
-    annotations: {}  
+    annotations: {}
 
 dataset-api:
   <<: *dataset-api-service-account
@@ -246,13 +246,6 @@ kong:
     annotations: {}
     type: LoadBalancer
 
-loki:
-  storage:
-    type: *storage_class_name
-  compactor:
-    retention_enabled: true
-    working_directory: /var/loki/compactor/retention
-
 postgres-backup-service-account: &postgres-backup-service-account
   serviceAccount:
     create: *create_sa
diff --git a/helmcharts/global-cloud-values-gcp.yaml b/helmcharts/global-cloud-values-gcp.yaml
index 35de63a0..feb956db 100644
--- a/helmcharts/global-cloud-values-gcp.yaml
+++ b/helmcharts/global-cloud-values-gcp.yaml
@@ -210,13 +210,6 @@ druid-raw-cluster:
   gcs_bucket: *cloud_storage_bucket
   <<: *druid-raw-service-account
 
-loki:
-  storage:
-    type: *storage_class
-  compactor:
-    retention_enabled: true
-    working_directory: /var/loki/compactor/retention
-
 postgresql-backup:
   <<: *postgres-backup-service-account
   GS_BACKUP_BUCKET: *backups_bucket
diff --git a/helmcharts/obsrv/values.yaml b/helmcharts/obsrv/values.yaml
index 3e8e6fb3..5fe66f74 100644
--- a/helmcharts/obsrv/values.yaml
+++ b/helmcharts/obsrv/values.yaml
@@ -2799,6 +2799,8 @@ loki:
   sidecar:
     rules:
       enabled: false
+  singleBinary:
+    replicas: 1
   test:
     enabled: false
   write: