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

Priority Class and More Resource Requests #2541

Merged
merged 5 commits into from
May 20, 2024
Merged

Priority Class and More Resource Requests #2541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8f1384
adding a priority class for aws-es-proxy and adding larger requests f…
EliseCastle23 May 8, 2024
3573ff3
increasing requests and resources for cronjob too
EliseCastle23 May 8, 2024
c7a929a
adding quotes
EliseCastle23 May 8, 2024
ea2fc66
missed that the jobs already had a limit. Fixed the syntax error.
EliseCastle23 May 8, 2024
103aa2a
reducing memory
EliseCastle23 May 8, 2024
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
1 change: 1 addition & 0 deletions gen3/bin/kube-setup-aws-es-proxy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ if g3kubectl get secrets/aws-es-proxy > /dev/null 2>&1; then
if ES_ENDPOINT="$(aws es describe-elasticsearch-domains --domain-names ${envname}-gen3-metadata-2 --query "DomainStatusList[*].Endpoints" --output text)" \
&& [[ -n "${ES_ENDPOINT}" && -n "${envname}" ]]; then
gen3 roll aws-es-proxy GEN3_ES_ENDPOINT "${ES_ENDPOINT}"
g3kubectl apply -f "${GEN3_HOME}/kube/services/aws-es-proxy/aws-es-proxy-priority-class.yaml"
g3kubectl apply -f "${GEN3_HOME}/kube/services/aws-es-proxy/aws-es-proxy-service.yaml"
gen3_log_info "kube-setup-aws-es-proxy" "The aws-es-proxy service has been deployed onto the k8s cluster."
else
Expand Down
1 change: 1 addition & 0 deletions kube/services/aws-es-proxy/aws-es-proxy-deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ spec:
- name: credentials
secret:
secretName: "aws-es-proxy"
priorityClassName: aws-es-proxy-high-priority
containers:
- name: esproxy
GEN3_AWS-ES-PROXY_IMAGE|-image: quay.io/cdis/aws-es-proxy:0.8-|
Expand Down
7 changes: 7 additions & 0 deletions kube/services/aws-es-proxy/aws-es-proxy-priority-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
name: aws-es-proxy-high-priority
value: 1000000
globalDefault: false
description: "Priority class for aws-es-proxy service"
4 changes: 3 additions & 1 deletion kube/services/jobs/etl-cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,10 @@ spec:
subPath: user.yaml
resources:
limits:
cpu: 1
cpu: 2
memory: 10Gi
requests:
cpu: 2
command: ["/bin/bash"]
args:
- "-c"
Expand Down
4 changes: 3 additions & 1 deletion kube/services/jobs/etl-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ spec:
subPath: user.yaml
resources:
limits:
cpu: 1
cpu: 2
memory: 10Gi
requests:
cpu: 2
command: ["/bin/bash" ]
args:
- "-c"
Expand Down
Loading