Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into hasan.mahmood/system-…
Browse files Browse the repository at this point in the history
…probe-autopilot
  • Loading branch information
hmahmood committed Jan 30, 2025
2 parents b0dc898 + 43810e6 commit 4a8cf81
Show file tree
Hide file tree
Showing 15 changed files with 182 additions and 177 deletions.
1 change: 1 addition & 0 deletions charts/datadog/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 3.90.0

* Enable `system-probe` container on GKE Autopilot
* Set default `Agent` and `Cluster-Agent` version to `7.62.0`.

## 3.89.0

Expand Down
6 changes: 3 additions & 3 deletions charts/datadog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ helm install <RELEASE_NAME> \
| agents.image.pullPolicy | string | `"IfNotPresent"` | Datadog Agent image pull policy |
| agents.image.pullSecrets | list | `[]` | Datadog Agent repository pullSecret (ex: specify docker registry credentials) |
| agents.image.repository | string | `nil` | Override default registry + image.name for Agent |
| agents.image.tag | string | `"7.61.0"` | Define the Agent version to use |
| agents.image.tag | string | `"7.62.0"` | Define the Agent version to use |
| agents.image.tagSuffix | string | `""` | Suffix to append to Agent tag |
| agents.localService.forceLocalServiceEnabled | bool | `false` | Force the creation of the internal traffic policy service to target the agent running on the local node. By default, the internal traffic service is created only on Kubernetes 1.22+ where the feature became beta and enabled by default. This option allows to force the creation of the internal traffic service on kubernetes 1.21 where the feature was alpha and required a feature gate to be explicitly enabled. |
| agents.localService.overrideName | string | `""` | Name of the internal traffic service to target the agent running on the local node |
Expand Down Expand Up @@ -607,7 +607,7 @@ helm install <RELEASE_NAME> \
| clusterAgent.image.pullPolicy | string | `"IfNotPresent"` | Cluster Agent image pullPolicy |
| clusterAgent.image.pullSecrets | list | `[]` | Cluster Agent repository pullSecret (ex: specify docker registry credentials) |
| clusterAgent.image.repository | string | `nil` | Override default registry + image.name for Cluster Agent |
| clusterAgent.image.tag | string | `"7.61.0"` | Cluster Agent image tag to use |
| clusterAgent.image.tag | string | `"7.62.0"` | Cluster Agent image tag to use |
| clusterAgent.kubernetesApiserverCheck.disableUseComponentStatus | bool | `false` | Set this to true to disable use_component_status for the kube_apiserver integration. |
| clusterAgent.livenessProbe | object | Every 15s / 6 KO / 1 OK | Override default Cluster Agent liveness probe settings |
| clusterAgent.metricsProvider.aggregator | string | `"avg"` | Define the aggregator the cluster agent will use to process the metrics. The options are (avg, min, max, sum) |
Expand Down Expand Up @@ -662,7 +662,7 @@ helm install <RELEASE_NAME> \
| clusterChecksRunner.image.pullPolicy | string | `"IfNotPresent"` | Datadog Agent image pull policy |
| clusterChecksRunner.image.pullSecrets | list | `[]` | Datadog Agent repository pullSecret (ex: specify docker registry credentials) |
| clusterChecksRunner.image.repository | string | `nil` | Override default registry + image.name for Cluster Check Runners |
| clusterChecksRunner.image.tag | string | `"7.61.0"` | Define the Agent version to use |
| clusterChecksRunner.image.tag | string | `"7.62.0"` | Define the Agent version to use |
| clusterChecksRunner.image.tagSuffix | string | `""` | Suffix to append to Agent tag |
| clusterChecksRunner.livenessProbe | object | Every 15s / 6 KO / 1 OK | Override default agent liveness probe settings |
| clusterChecksRunner.networkPolicy.create | bool | `false` | If true, create a NetworkPolicy for the cluster checks runners. DEPRECATED. Use datadog.networkPolicy.create instead |
Expand Down
6 changes: 3 additions & 3 deletions charts/datadog/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ clusterAgent:
name: cluster-agent

# clusterAgent.image.tag -- Cluster Agent image tag to use
tag: 7.61.0
tag: 7.62.0

# clusterAgent.image.digest -- Cluster Agent image digest to use, takes precedence over tag if specified
digest: ""
Expand Down Expand Up @@ -1550,7 +1550,7 @@ agents:
name: agent

# agents.image.tag -- Define the Agent version to use
tag: 7.61.0
tag: 7.62.0

# agents.image.digest -- Define Agent image digest to use, takes precedence over tag if specified
digest: ""
Expand Down Expand Up @@ -2056,7 +2056,7 @@ clusterChecksRunner:
name: agent

# clusterChecksRunner.image.tag -- Define the Agent version to use
tag: 7.61.0
tag: 7.62.0

# clusterChecksRunner.image.digest -- Define Agent image digest to use, takes precedence over tag if specified
digest: ""
Expand Down
4 changes: 4 additions & 0 deletions charts/observability-pipelines-worker/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.3.0

* Official image `2.3.0`

## 2.2.3

* Official image `2.2.3`
Expand Down
4 changes: 2 additions & 2 deletions charts/observability-pipelines-worker/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: observability-pipelines-worker
version: "2.2.3"
version: "2.3.0"
description: Observability Pipelines Worker
type: application
keywords:
Expand All @@ -13,7 +13,7 @@ icon: https://datadog-live.imgix.net/img/dd_logo_70x75.png
maintainers:
- name: Datadog
email: [email protected]
appVersion: "2.2.3"
appVersion: "2.3.0"
annotations:
artifacthub.io/links: |
- name: Chart Source
Expand Down
4 changes: 2 additions & 2 deletions charts/observability-pipelines-worker/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Observability Pipelines Worker

![Version: 2.2.3](https://img.shields.io/badge/Version-2.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)
![Version: 2.3.0](https://img.shields.io/badge/Version-2.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square)

## How to use Datadog Helm repository

Expand Down Expand Up @@ -110,7 +110,7 @@ The command removes all the Kubernetes components associated with the chart and
| image.pullPolicy | string | `"IfNotPresent"` | Specify the [pullPolicy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy). |
| image.pullSecrets | list | `[]` | Specify the [imagePullSecrets](https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod). |
| image.repository | string | `"gcr.io/datadoghq"` | Specify the image repository to use. |
| image.tag | string | `"2.2.3"` | Specify the image tag to use. |
| image.tag | string | `"2.3.0"` | Specify the image tag to use. |
| ingress.annotations | object | `{}` | Specify annotations for the Ingress. |
| ingress.className | string | `""` | Specify the [ingressClassName](https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress), requires Kubernetes >= 1.18. |
| ingress.enabled | bool | `false` | If **true**, create an Ingress resource. |
Expand Down
2 changes: 1 addition & 1 deletion charts/observability-pipelines-worker/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ image:
# image.name -- Specify the image name to use (relative to `image.repository`).
name: observability-pipelines-worker
# image.tag -- Specify the image tag to use.
tag: 2.2.3
tag: 2.3.0
# image.digest -- (string) Specify the image digest to use; takes precedence over `image.tag`.
digest:
## Currently, we offer images at:
Expand Down
20 changes: 10 additions & 10 deletions test/datadog/baseline/agent-clusterchecks-deployment_default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: "7"
app.kubernetes.io/component: clusterchecks-agent

spec:
replicas: 2
revisionHistoryLimit: 10
Expand All @@ -33,10 +33,10 @@ spec:
app.kubernetes.io/component: clusterchecks-agent
admission.datadoghq.com/enabled: "false"
app: datadog-clusterchecks

name: datadog-clusterchecks
annotations:
checksum/clusteragent_token: 7a191b46e37210282a7d889d0f025945b63970d0d4d9de96d286c3b73b5b4cf7
checksum/clusteragent_token: a4c4f992728ab92c056e58623747a4937611a96e617e9369bbbd09486a83aaa4
checksum/install_info: 3b9b3e85592ca511f47e6f39152d86a2c22f1ecc6fe577f4a9f78fa7e78097a4
spec:
serviceAccountName: datadog-cluster-checks
Expand All @@ -45,7 +45,7 @@ spec:
[]
initContainers:
- name: init-volume
image: "gcr.io/datadoghq/agent:7.61.0"
image: "gcr.io/datadoghq/agent:7.62.0"
imagePullPolicy: IfNotPresent
command: ["bash", "-c"]
args:
Expand All @@ -57,7 +57,7 @@ spec:
resources:
{}
- name: init-config
image: "gcr.io/datadoghq/agent:7.61.0"
image: "gcr.io/datadoghq/agent:7.62.0"
imagePullPolicy: IfNotPresent
command: ["bash", "-c"]
args:
Expand All @@ -70,13 +70,13 @@ spec:
{}
containers:
- name: agent
image: "gcr.io/datadoghq/agent:7.61.0"
image: "gcr.io/datadoghq/agent:7.62.0"
command: ["bash", "-c"]
args:
- find /etc/datadog-agent/conf.d/ -name "*.yaml.default" -type f -delete && touch /etc/datadog-agent/datadog.yaml && exec agent run
imagePullPolicy: IfNotPresent
env:

- name: KUBERNETES
value: "yes"
- name: DD_API_KEY
Expand Down Expand Up @@ -129,8 +129,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName


resources:
{}
volumeMounts:
Expand Down Expand Up @@ -189,4 +189,4 @@ spec:
app: datadog-clusterchecks
topologyKey: kubernetes.io/hostname
nodeSelector:
kubernetes.io/os: linux
kubernetes.io/os: linux
20 changes: 10 additions & 10 deletions test/datadog/baseline/cluster-agent-deployment_default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: "7"
app.kubernetes.io/component: cluster-agent

spec:
replicas: 1
revisionHistoryLimit: 10
Expand All @@ -33,10 +33,10 @@ spec:
app.kubernetes.io/component: cluster-agent
admission.datadoghq.com/enabled: "false"
app: datadog-cluster-agent

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: facb8dd79b211ff3953c8958ae1f70ee76fc2adc10ee080c91a204c6a7e88491
checksum/clusteragent_token: 7de9189e8b09b0220e39687e09632b5f9c164bab572826f08c467143a74f5fdd
checksum/clusteragent-configmap: b80db4e65821dd6bcd24691a57341dbf840b5ac2c7e635060f0e8ae83f6597c1
checksum/api_key: e8756335f64a19cdbc31bf5c1e01c7cc4fa57310bf1a1739384243a8adada70c
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
Expand All @@ -46,7 +46,7 @@ spec:
automountServiceAccountToken: true
initContainers:
- name: init-volume
image: "gcr.io/datadoghq/cluster-agent:7.61.0"
image: "gcr.io/datadoghq/cluster-agent:7.62.0"
imagePullPolicy: IfNotPresent
command:
- cp
Expand All @@ -59,7 +59,7 @@ spec:
mountPath: /opt/datadog-agent
containers:
- name: cluster-agent
image: "gcr.io/datadoghq/cluster-agent:7.61.0"
image: "gcr.io/datadoghq/cluster-agent:7.62.0"
imagePullPolicy: IfNotPresent
resources:
{}
Expand Down Expand Up @@ -90,7 +90,7 @@ spec:
name: "datadog"
key: api-key
optional: true

- name: KUBERNETES
value: "yes"
- name: DD_LANGUAGE_DETECTION_ENABLED
Expand Down Expand Up @@ -119,8 +119,8 @@ spec:
value: "8000"
- name: DD_ADMISSION_CONTROLLER_CONTAINER_REGISTRY
value: "gcr.io/datadoghq"


- name: DD_REMOTE_CONFIGURATION_ENABLED
value: "false"
- name: DD_CLUSTER_CHECKS_ENABLED
Expand Down Expand Up @@ -183,7 +183,7 @@ spec:
configMapKeyRef:
name: datadog-kpi-telemetry-configmap
key: install_type

livenessProbe:
failureThreshold: 6
httpGet:
Expand Down Expand Up @@ -268,4 +268,4 @@ spec:
app: datadog-cluster-agent
topologyKey: kubernetes.io/hostname
nodeSelector:
kubernetes.io/os: linux
kubernetes.io/os: linux
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: "7"
app.kubernetes.io/component: cluster-agent

spec:
replicas: 1
revisionHistoryLimit: 10
Expand All @@ -33,10 +33,10 @@ spec:
app.kubernetes.io/component: cluster-agent
admission.datadoghq.com/enabled: "false"
app: datadog-cluster-agent

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: 0c3539cd7055e84dd64879bb3ff326700a5a2ec3f3b0d722e7071968ee8f0fd8
checksum/clusteragent_token: 2e89c377e0aaca3b109a0e88bfd037558ed48fb189b5fa93fce66965c2f5775a
checksum/clusteragent-configmap: b80db4e65821dd6bcd24691a57341dbf840b5ac2c7e635060f0e8ae83f6597c1
checksum/api_key: e8756335f64a19cdbc31bf5c1e01c7cc4fa57310bf1a1739384243a8adada70c
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
Expand All @@ -46,7 +46,7 @@ spec:
automountServiceAccountToken: true
initContainers:
- name: init-volume
image: "gcr.io/datadoghq/cluster-agent:7.61.0"
image: "gcr.io/datadoghq/cluster-agent:7.62.0"
imagePullPolicy: IfNotPresent
command:
- cp
Expand All @@ -59,7 +59,7 @@ spec:
mountPath: /opt/datadog-agent
containers:
- name: cluster-agent
image: "gcr.io/datadoghq/cluster-agent:7.61.0"
image: "gcr.io/datadoghq/cluster-agent:7.62.0"
imagePullPolicy: IfNotPresent
resources:
{}
Expand Down Expand Up @@ -90,7 +90,7 @@ spec:
name: "datadog"
key: api-key
optional: true

- name: KUBERNETES
value: "yes"
- name: DD_LANGUAGE_DETECTION_ENABLED
Expand Down Expand Up @@ -119,8 +119,8 @@ spec:
value: "8000"
- name: DD_ADMISSION_CONTROLLER_CONTAINER_REGISTRY
value: "gcr.io/datadoghq"


- name: DD_ADMISSION_CONTROLLER_AGENT_SIDECAR_ENABLED
value: "true"
- name: DD_ADMISSION_CONTROLLER_AGENT_SIDECAR_CLUSTER_AGENT_ENABLED
Expand Down Expand Up @@ -197,7 +197,7 @@ spec:
configMapKeyRef:
name: datadog-kpi-telemetry-configmap
key: install_type

livenessProbe:
failureThreshold: 6
httpGet:
Expand Down Expand Up @@ -282,4 +282,4 @@ spec:
app: datadog-cluster-agent
topologyKey: kubernetes.io/hostname
nodeSelector:
kubernetes.io/os: linux
kubernetes.io/os: linux
Loading

0 comments on commit 4a8cf81

Please sign in to comment.