Skip to content

Commit

Permalink
feat: add a new kubernetes cluster cijenkinsio-agents-2 with datadog …
Browse files Browse the repository at this point in the history
…as unique release (#6020)

as per
jenkins-infra/helpdesk#4319 (comment)

starting adding the new EKS cluster to infra.ci kubernetes-management

kubeconfig added as secrets here
jenkins-infra/charts-secrets@a24b1ec
and datadog api key here
jenkins-infra/charts-secrets@c7505e8

need #6021

⚠️ BEFORE merging this PR we need to create the `datadog` namespace
using : 

```
kubectl config use-context arn:aws:eks:us-east-2:326712726440:cluster/cijenkinsio-agents-2
kubectl create ns datadog
```
 

splitting in multiple PR:

this one is with the minimum release possible, so only datadog as a
start
  • Loading branch information
dduportal authored Dec 23, 2024
2 parents 575d8c8 + dfb762f commit 31cbf1d
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile_k8s
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pipeline {
axes {
axis {
name 'K8S_CLUSTER'
values 'privatek8s', 'publick8s', 'cijioagents1', 'infracijioagents1'
values 'privatek8s', 'publick8s', 'cijioagents1', 'cijioagents2', 'infracijioagents1'
}
} // axes
agent {
Expand Down
20 changes: 20 additions & 0 deletions clusters/cijioagents2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
helmDefaults:
atomic: true
force: false
timeout: 300
wait: true
repositories:
# https://github.com/DataDog/helm-charts/
- name: datadog
url: https://helm.datadoghq.com
releases:
- name: datadog
namespace: datadog
chart: datadog/datadog
version: 3.84.2 #todo update updatecli/updatecli.d/charts/datadog.yaml
values:
- "../config/datadog.yaml.gotmpl"
- "../config/datadog_cijenkinsio-agents-2.yaml"
secrets:
- "../secrets/config/datadog/cijenkinsio-agents-2-secrets.yaml"
35 changes: 35 additions & 0 deletions config/datadog_cijenkinsio-agents-2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
datadog:
clusterName: cijenkinsio-agents-2
env:
- name: DD_HOSTNAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
clusterAgent:
nodeSelector:
jenkins: ci.jenkins.io
role: applications
tolerations:
- key: "ci.jenkins.io/applications"
operator: "Equal"
value: "true"
effect: "NoSchedule"
agents:
tolerations:
# These tolerations are needed to run the agents on the bom node pool
- key: "ci.jenkins.io/bom"
operator: "Equal"
value: "true"
effect: "NoSchedule"
- key: "ci.jenkins.io/applications"
operator: "Equal"
value: "true"
effect: "NoSchedule"
- key: "ci.jenkins.io/agents"
operator: "Equal"
value: "true"
effect: "NoSchedule"
- key: "CriticalAddonsOnly"
operator: "Equal"
value: "true"
effect: "NoSchedule"
3 changes: 0 additions & 3 deletions config/datadog_cijioagents1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ datadog:
# Required as of Agent 7.35 because Kubelet certificates in AKS do not have a Subject Alternative Name (SAN) set.
tlsVerify: false
clusterAgent:
image:
pullSecrets:
- name: "dockerhub-credential"
nodeSelector:
kubernetes.io/arch: arm64
role: applications
Expand Down
3 changes: 0 additions & 3 deletions config/datadog_infracijioagents1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ datadog:
# Required as of Agent 7.35 because Kubelet certificates in AKS do not have a Subject Alternative Name (SAN) set.
tlsVerify: false
clusterAgent:
image:
pullSecrets:
- name: "dockerhub-credential"
nodeSelector:
kubernetes.io/arch: arm64
kubernetes.azure.com/mode: system
Expand Down

0 comments on commit 31cbf1d

Please sign in to comment.