Skip to content

Commit db494ac

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #8589 from upodroid/datadog-gke-one
deploy datadog to gke clusters
2 parents d6b893b + d2cdc6f commit db494ac

File tree

22 files changed

+386
-8
lines changed

22 files changed

+386
-8
lines changed

‎infra/gcp/terraform/kubernetes-public/iam.tf‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ module "iam" {
2323
mode = "authoritative"
2424

2525
bindings = {
26+
"roles/container.admin" = [
27+
"serviceAccount:[email protected]",
28+
]
2629
"roles/secretmanager.secretAccessor" = [
2730
"serviceAccount:kubernetes-external-secrets@kubernetes-public.iam.gserviceaccount.com",
2831
"principal://iam.googleapis.com/projects/16065310909/locations/global/workloadIdentityPools/k8s-infra-prow.svc.id.goog/subject/ns/external-secrets/sa/external-secrets",

‎kubernetes/eks-prow-kops/datadog/kustomization.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ helmCharts:
66
- name: datadog
77
repo: https://helm.datadoghq.com
88
releaseName: datadog
9-
version: 3.118.0
10-
kubeVersion: "1.29"
9+
version: 3.135.4
10+
kubeVersion: "1.30"
1111
valuesFile: values.yaml
1212

1313
resources:

‎kubernetes/eks-prow-kops/datadog/values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ datadog:
2424
uncompressedLayersSupport: true
2525
host:
2626
enabled: true
27+
apm:
28+
instrumentation:
29+
skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
2730
clusterAgent:
2831
tokenExistingSecret: datadog-secret
2932
agents:

‎kubernetes/gke-aaa/datadog/kustomization.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
namespace: datadog
4+
5+
helmCharts:
6+
- name: datadog
7+
repo: https://helm.datadoghq.com
8+
releaseName: datadog
9+
version: 3.118.0
10+
valuesFile: values.yaml
11+
12+
resources:
13+
- secrets.yaml

‎kubernetes/gke-aaa/datadog/secrets.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: external-secrets.io/v1beta1
2+
kind: ExternalSecret
3+
metadata:
4+
name: datadog-secret
5+
spec:
6+
dataFrom:
7+
- extract:
8+
key: datadog-secrets
9+
secretStoreRef:
10+
kind: ClusterSecretStore
11+
name: k8s-infra-prow-build

‎kubernetes/gke-aaa/datadog/values.yaml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
registry: gcr.io/datadoghq
2+
datadog:
3+
apiKeyExistingSecret: datadog-secret
4+
appKeyExistingSecret: datadog-secret
5+
site: us5.datadoghq.com
6+
clusterName: aaa
7+
logs:
8+
enabled: true
9+
containerCollectAll: true
10+
prometheusScrape:
11+
enabled: true
12+
serviceEndpoints: true
13+
# COS specific https://docs.datadoghq.com/containers/kubernetes/distributions?tab=helm#GKE
14+
systemProbe:
15+
enableDefaultKernelHeadersPaths: false
16+
kubeStateMetricsCore:
17+
enabled: true
18+
networkMonitoring:
19+
enabled: true
20+
processAgent:
21+
enabled: true
22+
processCollection: true
23+
sbom:
24+
enabled: true
25+
containerImage:
26+
enabled: true
27+
uncompressedLayersSupport: true
28+
host:
29+
enabled: true
30+
apm:
31+
instrumentation:
32+
skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
33+
clusterAgent:
34+
tokenExistingSecret: datadog-secret
35+
agents:
36+
tolerations: # datadog supports arm64
37+
- key: kubernetes.io/arch
38+
operator: Equal
39+
value: arm64
40+
effect: NoSchedule

‎kubernetes/gke-aaa/helm/external-secrets.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
extraObjects:
2+
- apiVersion: external-secrets.io/v1beta1
3+
kind: ClusterSecretStore
4+
metadata:
5+
name: kubernetes-public
6+
spec:
7+
provider:
8+
gcpsm:
9+
projectID: kubernetes-public
10+
- apiVersion: external-secrets.io/v1beta1
11+
kind: ClusterSecretStore
12+
metadata:
13+
name: k8s-infra-prow-build
14+
spec:
15+
provider:
16+
gcpsm:
17+
projectID: k8s-infra-prow-build

‎kubernetes/gke-prow-build-trusted/datadog/kustomization.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
namespace: datadog
4+
5+
helmCharts:
6+
- name: datadog
7+
repo: https://helm.datadoghq.com
8+
releaseName: datadog
9+
version: 3.135.4
10+
valuesFile: values.yaml
11+
12+
resources:
13+
- secrets.yaml

‎kubernetes/gke-prow-build-trusted/datadog/secrets.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: external-secrets.io/v1beta1
2+
kind: ExternalSecret
3+
metadata:
4+
name: datadog-secret
5+
spec:
6+
dataFrom:
7+
- extract:
8+
key: datadog-secrets
9+
secretStoreRef:
10+
kind: ClusterSecretStore
11+
name: k8s-infra-prow-build

‎kubernetes/gke-prow-build-trusted/datadog/values.yaml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
registry: gcr.io/datadoghq
2+
datadog:
3+
apiKeyExistingSecret: datadog-secret
4+
appKeyExistingSecret: datadog-secret
5+
site: us5.datadoghq.com
6+
clusterName: k8s-infra-prow-build-trusted
7+
logs:
8+
enabled: true
9+
containerCollectAll: true
10+
prometheusScrape:
11+
enabled: true
12+
serviceEndpoints: true
13+
kubeStateMetricsCore:
14+
enabled: true
15+
networkMonitoring:
16+
enabled: true
17+
processAgent:
18+
enabled: true
19+
processCollection: true
20+
sbom:
21+
enabled: true
22+
containerImage:
23+
enabled: true
24+
uncompressedLayersSupport: true
25+
host:
26+
enabled: true
27+
apm:
28+
instrumentation:
29+
skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
30+
clusterAgent:
31+
tokenExistingSecret: datadog-secret
32+
agents:
33+
tolerations: # datadog supports arm64
34+
- key: kubernetes.io/arch
35+
operator: Equal
36+
value: arm64
37+
effect: NoSchedule

0 commit comments

Comments
 (0)