Skip to content

Commit 5e1ac67

Browse files
done require changes for resource limit and request
1 parent df58d28 commit 5e1ac67

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

examples/complete/aws/helm/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ primary:
2828
cpu: 100m
2929
memory: 256Mi
3030
requests:
31-
cpu: 55m
32-
memory: 156Mi
31+
cpu: 50m
32+
memory: 128Mi
3333

3434
secondary:
3535
affinity:
@@ -62,8 +62,8 @@ secondary:
6262
cpu: 100m
6363
memory: 256Mi
6464
requests:
65-
cpu: 55m
66-
memory: 156Mi
65+
cpu: 50m
66+
memory: 128Mi
6767

6868
metrics:
6969
resources:

main.tf

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ resource "helm_release" "mysqldb_backup" {
5454
azure_storage_account_key = var.bucket_provider_type == "azure" ? var.azure_storage_account_key : ""
5555
azure_container_name = var.bucket_provider_type == "azure" ? var.azure_container_name : ""
5656
annotations = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn: ${var.iam_role_arn_backup}" : "iam.gke.io/gcp-service-account: ${var.service_account_backup}"
57-
})
57+
}),
58+
var.mysqldb_config.values_yaml
5859
]
5960
}
6061

@@ -78,6 +79,7 @@ resource "helm_release" "mysqldb_restore" {
7879
azure_storage_account_key = var.bucket_provider_type == "azure" ? var.azure_storage_account_key : ""
7980
azure_container_name = var.bucket_provider_type == "azure" ? var.azure_container_name : ""
8081
annotations = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn: ${var.iam_role_arn_restore}" : "iam.gke.io/gcp-service-account: ${var.service_account_restore}"
81-
})
82+
}),
83+
var.mysqldb_config.values_yaml
8284
]
8385
}

modules/backup/templates/cronjob.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,5 @@ spec:
4343
value: "s3"
4444
- name: AWS_DEFAULT_REGION
4545
value: {{ .Values.backup.aws_default_region }}
46-
resources: {{ .Values.backupjob.resources | toYaml | nindent 12 }}
46+
resources:
47+
{{- toYaml .Values.backupjob.resources | nindent 14 }}

modules/restore/templates/job.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ spec:
3232
value: {{ .Values.bucket_provider_type}}
3333
- name: AWS_DEFAULT_REGION
3434
value: {{ .Values.restore.aws_default_region}}
35-
resources: {{ .Values.restorejob.resources | toYaml | nindent 12 }}
35+
resources:
36+
{{- toYaml .Values.restorejob.resources | nindent 14 }}
3637
restartPolicy: Never
3738
backoffLimit: 4

0 commit comments

Comments
 (0)