Skip to content

Commit

Permalink
feat(cijenkinsio-agents-2) initial installation of ACP (#6073)
Browse files Browse the repository at this point in the history
Related to
jenkins-infra/helpdesk#4319 (comment)

This PR introduces ACP in the AWS EKS cluster `cijenkinsio-agents-2`.
it's the first set of hypothesis (EBS persistence on gp3)
  • Loading branch information
dduportal authored Jan 3, 2025
2 parents 74c9277 + c038a14 commit 0e04137
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 0 deletions.
10 changes: 10 additions & 0 deletions clusters/cijioagents2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ repositories:
# https://github.com/DataDog/helm-charts/
- name: datadog
url: https://helm.datadoghq.com
# https://github.com/jenkins-infra/helm-charts/
- name: jenkins-infra
url: https://jenkins-infra.github.io/helm-charts
releases:
- name: datadog
namespace: datadog
Expand All @@ -18,3 +21,10 @@ releases:
- "../config/datadog_cijenkinsio-agents-2.yaml"
secrets:
- "../secrets/config/datadog/cijenkinsio-agents-2-secrets.yaml"
- name: artifact-caching-proxy
namespace: artifact-caching-proxy
chart: jenkins-infra/artifact-caching-proxy
# TODO: track with updatecli
version: 1.6.2
values:
- "../config/artifact-caching-proxy_azure-cijenkinsio-agents-2.yaml"
45 changes: 45 additions & 0 deletions config/artifact-caching-proxy_azure-cijenkinsio-agents-2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
persistence:
enabled: true
size: 100
# TODO: track with updatecli (from https://github.com/jenkins-infra/terraform-aws-sponsorship/blob/47a0758f6f414fa12a2e8be54bd66e921f8a942a/eks-cijenkinsio-agents-2.tf#L217)
storageClass: ebs-csi-premium-retain-us-east-2a

# TODO: track with updatecli (from https://reports.jenkins.io/jenkins-infra-data-reports/aws-sponsorship.json)
nodeSelector:
kubernetes.io/arch: arm64
jenkins: ci.jenkins.io
role: applications

# TODO: track with updatecli (from https://reports.jenkins.io/jenkins-infra-data-reports/aws-sponsorship.json)
tolerations:
- key: "ci.jenkins.io/applications"
operator: "Equal"
value: "true"
effect: "NoSchedule"

# We should never have 2 ACP replicas in the same host
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
matchExpressions:
- key: "app.kubernetes.io/name"
operator: In
values:
- artifact-caching-proxy
topologyKey: "kubernetes.io/hostname"

## TODO: enable LB with a private endpoint

resources:
limits:
# No CPU limit to avoid throttling
memory: 8192Mi
requests:
cpu: 2
memory: 8192Mi

replicaCount: 2

proxy:
dnsResolver: "kube-dns.kube-system.svc.cluster.local 9.9.9.9"
3 changes: 3 additions & 0 deletions config/datadog_cijenkinsio-agents-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,18 @@ datadog:
fieldRef:
fieldPath: spec.nodeName
clusterAgent:
# TODO: track with updatecli (from https://reports.jenkins.io/jenkins-infra-data-reports/aws-sponsorship.json)
nodeSelector:
jenkins: ci.jenkins.io
role: applications
# TODO: track with updatecli (from https://reports.jenkins.io/jenkins-infra-data-reports/aws-sponsorship.json)
tolerations:
- key: "ci.jenkins.io/applications"
operator: "Equal"
value: "true"
effect: "NoSchedule"
agents:
# TODO: track with updatecli (from https://reports.jenkins.io/jenkins-infra-data-reports/aws-sponsorship.json)
tolerations:
# These tolerations are needed to run the agents on the bom node pool
- key: "ci.jenkins.io/bom"
Expand Down

0 comments on commit 0e04137

Please sign in to comment.