From dfb762f4ffcd9457dbc701f17f7caa81ad337a7e Mon Sep 17 00:00:00 2001
From: smerle33 <stephane.merle+jenkins@gmail.com>
Date: Mon, 16 Dec 2024 14:19:06 +0100
Subject: [PATCH] feat: add a new kubernetes cluster `cijenkinsio-agents-2`
 with datadog as unique release

---
 Jenkinsfile_k8s                          |  2 +-
 clusters/cijioagents2.yaml               | 20 ++++++++++++++
 config/datadog_cijenkinsio-agents-2.yaml | 35 ++++++++++++++++++++++++
 config/datadog_cijioagents1.yaml         |  3 --
 config/datadog_infracijioagents1.yaml    |  3 --
 5 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 clusters/cijioagents2.yaml
 create mode 100644 config/datadog_cijenkinsio-agents-2.yaml

diff --git a/Jenkinsfile_k8s b/Jenkinsfile_k8s
index 490185cd3e..178222c8d2 100644
--- a/Jenkinsfile_k8s
+++ b/Jenkinsfile_k8s
@@ -27,7 +27,7 @@ pipeline {
         axes {
           axis {
             name 'K8S_CLUSTER'
-            values 'privatek8s', 'publick8s', 'cijioagents1', 'infracijioagents1'
+            values 'privatek8s', 'publick8s', 'cijioagents1', 'cijioagents2', 'infracijioagents1'
           }
         } // axes
         agent {
diff --git a/clusters/cijioagents2.yaml b/clusters/cijioagents2.yaml
new file mode 100644
index 0000000000..2a4d68114e
--- /dev/null
+++ b/clusters/cijioagents2.yaml
@@ -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"
diff --git a/config/datadog_cijenkinsio-agents-2.yaml b/config/datadog_cijenkinsio-agents-2.yaml
new file mode 100644
index 0000000000..420ad7d774
--- /dev/null
+++ b/config/datadog_cijenkinsio-agents-2.yaml
@@ -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"
diff --git a/config/datadog_cijioagents1.yaml b/config/datadog_cijioagents1.yaml
index 6228a434a9..428fef7f08 100644
--- a/config/datadog_cijioagents1.yaml
+++ b/config/datadog_cijioagents1.yaml
@@ -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
diff --git a/config/datadog_infracijioagents1.yaml b/config/datadog_infracijioagents1.yaml
index f099a21b1c..4d8039e02b 100644
--- a/config/datadog_infracijioagents1.yaml
+++ b/config/datadog_infracijioagents1.yaml
@@ -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