Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions infra/gcp/terraform/kubernetes-public/iam.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ module "iam" {
mode = "authoritative"

bindings = {
"roles/container.admin" = [
"serviceAccount:argocd@k8s-infra-prow.iam.gserviceaccount.com",
]
"roles/secretmanager.secretAccessor" = [
"serviceAccount:kubernetes-external-secrets@kubernetes-public.iam.gserviceaccount.com",
"principal://iam.googleapis.com/projects/16065310909/locations/global/workloadIdentityPools/k8s-infra-prow.svc.id.goog/subject/ns/external-secrets/sa/external-secrets",
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/eks-prow-kops/datadog/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ helmCharts:
- name: datadog
repo: https://helm.datadoghq.com
releaseName: datadog
version: 3.118.0
kubeVersion: "1.29"
version: 3.135.4
kubeVersion: "1.30"
valuesFile: values.yaml

resources:
Expand Down
3 changes: 3 additions & 0 deletions kubernetes/eks-prow-kops/datadog/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ datadog:
uncompressedLayersSupport: true
host:
enabled: true
apm:
instrumentation:
skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
clusterAgent:
tokenExistingSecret: datadog-secret
agents:
Expand Down
13 changes: 13 additions & 0 deletions kubernetes/gke-aaa/datadog/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: datadog

helmCharts:
- name: datadog
repo: https://helm.datadoghq.com
releaseName: datadog
version: 3.118.0
valuesFile: values.yaml

resources:
- secrets.yaml
11 changes: 11 additions & 0 deletions kubernetes/gke-aaa/datadog/secrets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: datadog-secret
spec:
dataFrom:
- extract:
key: datadog-secrets
secretStoreRef:
kind: ClusterSecretStore
name: k8s-infra-prow-build
40 changes: 40 additions & 0 deletions kubernetes/gke-aaa/datadog/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
registry: gcr.io/datadoghq
datadog:
apiKeyExistingSecret: datadog-secret
appKeyExistingSecret: datadog-secret
site: us5.datadoghq.com
clusterName: aaa
logs:
enabled: true
containerCollectAll: true
prometheusScrape:
enabled: true
serviceEndpoints: true
# COS specific https://docs.datadoghq.com/containers/kubernetes/distributions?tab=helm#GKE
systemProbe:
enableDefaultKernelHeadersPaths: false
kubeStateMetricsCore:
enabled: true
networkMonitoring:
enabled: true
processAgent:
enabled: true
processCollection: true
sbom:
enabled: true
containerImage:
enabled: true
uncompressedLayersSupport: true
host:
enabled: true
apm:
instrumentation:
skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
clusterAgent:
tokenExistingSecret: datadog-secret
agents:
tolerations: # datadog supports arm64
- key: kubernetes.io/arch
operator: Equal
value: arm64
effect: NoSchedule
17 changes: 17 additions & 0 deletions kubernetes/gke-aaa/helm/external-secrets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
extraObjects:
- apiVersion: external-secrets.io/v1beta1
kind: ClusterSecretStore
metadata:
name: kubernetes-public
spec:
provider:
gcpsm:
projectID: kubernetes-public
- apiVersion: external-secrets.io/v1beta1
kind: ClusterSecretStore
metadata:
name: k8s-infra-prow-build
spec:
provider:
gcpsm:
projectID: k8s-infra-prow-build
13 changes: 13 additions & 0 deletions kubernetes/gke-prow-build-trusted/datadog/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: datadog

helmCharts:
- name: datadog
repo: https://helm.datadoghq.com
releaseName: datadog
version: 3.135.4
valuesFile: values.yaml

resources:
- secrets.yaml
11 changes: 11 additions & 0 deletions kubernetes/gke-prow-build-trusted/datadog/secrets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: datadog-secret
spec:
dataFrom:
- extract:
key: datadog-secrets
secretStoreRef:
kind: ClusterSecretStore
name: k8s-infra-prow-build
37 changes: 37 additions & 0 deletions kubernetes/gke-prow-build-trusted/datadog/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
registry: gcr.io/datadoghq
datadog:
apiKeyExistingSecret: datadog-secret
appKeyExistingSecret: datadog-secret
site: us5.datadoghq.com
clusterName: k8s-infra-prow-build-trusted
logs:
enabled: true
containerCollectAll: true
prometheusScrape:
enabled: true
serviceEndpoints: true
kubeStateMetricsCore:
enabled: true
networkMonitoring:
enabled: true
processAgent:
enabled: true
processCollection: true
sbom:
enabled: true
containerImage:
enabled: true
uncompressedLayersSupport: true
host:
enabled: true
apm:
instrumentation:
skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
clusterAgent:
tokenExistingSecret: datadog-secret
agents:
tolerations: # datadog supports arm64
- key: kubernetes.io/arch
operator: Equal
value: arm64
effect: NoSchedule
8 changes: 8 additions & 0 deletions kubernetes/gke-prow-build-trusted/helm/external-secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ extraObjects:
provider:
gcpsm:
projectID: k8s-infra-prow-build-trusted
- apiVersion: external-secrets.io/v1beta1
kind: ClusterSecretStore
metadata:
name: k8s-infra-prow-build
spec:
provider:
gcpsm:
projectID: k8s-infra-prow-build
- apiVersion: monitoring.googleapis.com/v1
kind: PodMonitoring
metadata:
Expand Down
13 changes: 13 additions & 0 deletions kubernetes/gke-prow-build/datadog/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: datadog

helmCharts:
- name: datadog
repo: https://helm.datadoghq.com
releaseName: datadog
version: 3.135.4
valuesFile: values.yaml

resources:
- secrets.yaml
11 changes: 11 additions & 0 deletions kubernetes/gke-prow-build/datadog/secrets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: datadog-secret
spec:
dataFrom:
- extract:
key: datadog-secrets
secretStoreRef:
kind: ClusterSecretStore
name: k8s-infra-prow-build
40 changes: 40 additions & 0 deletions kubernetes/gke-prow-build/datadog/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
registry: gcr.io/datadoghq
datadog:
apiKeyExistingSecret: datadog-secret
appKeyExistingSecret: datadog-secret
site: us5.datadoghq.com
clusterName: k8s-infra-prow-build
logs:
enabled: true
containerCollectAll: true
prometheusScrape:
enabled: true
serviceEndpoints: true
# COS specific https://docs.datadoghq.com/containers/kubernetes/distributions?tab=helm#GKE
systemProbe:
enableDefaultKernelHeadersPaths: false
kubeStateMetricsCore:
enabled: true
networkMonitoring:
enabled: true
processAgent:
enabled: true
processCollection: true
sbom:
enabled: true
containerImage:
enabled: true
uncompressedLayersSupport: true
host:
enabled: true
apm:
instrumentation:
skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
clusterAgent:
tokenExistingSecret: datadog-secret
agents:
tolerations: # datadog supports arm64
- key: kubernetes.io/arch
operator: Equal
value: arm64
effect: NoSchedule
13 changes: 13 additions & 0 deletions kubernetes/gke-prow/datadog/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: datadog

helmCharts:
- name: datadog
repo: https://helm.datadoghq.com
releaseName: datadog
version: 3.135.4
valuesFile: values.yaml

resources:
- secrets.yaml
11 changes: 11 additions & 0 deletions kubernetes/gke-prow/datadog/secrets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: datadog-secret
spec:
dataFrom:
- extract:
key: datadog-secrets
secretStoreRef:
kind: ClusterSecretStore
name: k8s-infra-prow-build
40 changes: 40 additions & 0 deletions kubernetes/gke-prow/datadog/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
registry: gcr.io/datadoghq
datadog:
apiKeyExistingSecret: datadog-secret
appKeyExistingSecret: datadog-secret
site: us5.datadoghq.com
clusterName: k8s-infra-prow
logs:
enabled: true
containerCollectAll: true
prometheusScrape:
enabled: true
serviceEndpoints: true
# COS specific https://docs.datadoghq.com/containers/kubernetes/distributions?tab=helm#GKE
systemProbe:
enableDefaultKernelHeadersPaths: false
kubeStateMetricsCore:
enabled: true
networkMonitoring:
enabled: true
processAgent:
enabled: true
processCollection: true
sbom:
enabled: true
containerImage:
enabled: true
uncompressedLayersSupport: true
host:
enabled: true
apm:
instrumentation:
skipKPITelemetry: true # https://github.com/DataDog/helm-charts/issues/1395
clusterAgent:
tokenExistingSecret: datadog-secret
agents:
tolerations: # datadog supports arm64
- key: kubernetes.io/arch
operator: Equal
value: arm64
effect: NoSchedule
20 changes: 14 additions & 6 deletions kubernetes/gke-prow/helm/external-secrets.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
extraObjects:
- apiVersion: external-secrets.io/v1beta1
- apiVersion: external-secrets.io/v1beta1
kind: ClusterSecretStore
metadata:
name: k8s-infra-prow
spec:
provider:
gcpsm:
projectID: k8s-infra-prow
- apiVersion: external-secrets.io/v1beta1
- apiVersion: external-secrets.io/v1beta1
kind: ClusterSecretStore
metadata:
name: k8s-infra-prow-build
spec:
provider:
gcpsm:
projectID: k8s-infra-prow-build
- apiVersion: external-secrets.io/v1beta1
kind: ClusterSecretStore
metadata:
name: kubernetes-public
spec:
provider:
gcpsm:
projectID: kubernetes-public
- apiVersion: external-secrets.io/v1beta1
- apiVersion: external-secrets.io/v1beta1
kind: ClusterSecretStore
metadata:
name: k8s-infra-prow-build-trusted
spec:
provider:
gcpsm:
projectID: k8s-infra-prow-build-trusted
- apiVersion: monitoring.googleapis.com/v1
- apiVersion: monitoring.googleapis.com/v1
kind: PodMonitoring
metadata:
labels:
Expand All @@ -34,5 +42,5 @@ extraObjects:
matchLabels:
app.kubernetes.io/name: external-secrets
endpoints:
- port: metrics
interval: 30s
- port: metrics
interval: 30s
Loading