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

#OBS-I436 velero and loki fixes #227

Merged
merged 1 commit into from
Dec 30, 2024
Merged

#OBS-I436 velero and loki fixes #227

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
13 changes: 4 additions & 9 deletions helmcharts/global-cloud-values-aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
9 changes: 1 addition & 8 deletions helmcharts/global-cloud-values-azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions helmcharts/global-cloud-values-gcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions helmcharts/obsrv/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2799,6 +2799,8 @@ loki:
sidecar:
rules:
enabled: false
singleBinary:
replicas: 1
test:
enabled: false
write:
Expand Down