Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix npm for autopilot and GDC #1679

Merged
merged 7 commits into from
Feb 7, 2025
Merged

Fix npm for autopilot and GDC #1679

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e28196
fix npm and autopilot and gdc
fanny-jiang Jan 30, 2025
a455437
fix ci
fanny-jiang Jan 30, 2025
07cf779
newline
fanny-jiang Jan 30, 2025
0cf675c
Merge branch 'hasan.mahmood/system-probe-autopilot' into fanny/CECO-1…
fanny-jiang Jan 30, 2025
207a496
bump chart version and update baselines
fanny-jiang Jan 30, 2025
f75dc05
Merge branch 'hasan.mahmood/system-probe-autopilot' into fanny/CECO-1…
fanny-jiang Feb 7, 2025
f5b5a77
Merge branch 'hasan.mahmood/system-probe-autopilot' into fanny/CECO-1…
fanny-jiang Feb 7, 2025
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
18 changes: 11 additions & 7 deletions charts/datadog/templates/NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,27 +404,31 @@ The option is overriden to avoid mounting volumes that are not allowed which wou

{{- end }}

{{- if .Values.datadog.networkMonitoring.enabled }}
{{- end }}

{{- if or .Values.providers.gke.autopilot .Values.providers.gke.gdc }}

{{- if or .Values.datadog.sbom.containerImage.enabled .Values.datadog.sbom.host.enabled }}

#######################################################################################
#### WARNING: Network Performance Monitoring is not supported on GKE Autopilot ####
#### WARNING: SBOM Monitoring is not supported on GKE Autopilot ####
#######################################################################################

{{- fail "On GKE Autopilot environments, Network Performance Monitoring is not supported. The option 'datadog.networkMonitoring.enabled' must be set to 'false'" }}
On GKE Autopilot environments, SBOM Monitoring is not supported. The options 'datadog.sbom.containerImage.enabled' and 'datadog.sbom.host.enabled' must be set to 'false'.

{{- end }}

{{- end }}

{{- if or .Values.providers.gke.autopilot .Values.providers.gke.gdc }}
{{- if .Values.providers.gke.gdc }}

{{- if or .Values.datadog.sbom.containerImage.enabled .Values.datadog.sbom.host.enabled }}
{{- if .Values.datadog.networkMonitoring.enabled }}

#######################################################################################
#### WARNING: SBOM Monitoring is not supported on GKE Autopilot ####
#### WARNING: Network Performance Monitoring is not supported on GKE GDC ####
#######################################################################################

On GKE Autopilot environments, SBOM Monitoring is not supported. The options 'datadog.sbom.containerImage.enabled' and 'datadog.sbom.host.enabled' must be set to 'false'.
{{- fail "On GKE GDC environments, Network Performance Monitoring is not supported. The option 'datadog.networkMonitoring.enabled' must be set to 'false'" }}

{{- end }}

Expand Down
8 changes: 5 additions & 3 deletions charts/datadog/templates/_container-host-release-volumemounts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{{- define "linux-container-host-release-volumemounts" -}}
{{- if or .Values.datadog.osReleasePath .Values.datadog.systemProbe.osReleasePath }}
{{- if and (eq (include "should-enable-system-probe" .) "true") (not .Values.providers.gke.gdc) }}
{{- if not .Values.providers.gke.gdc }}
{{- if eq (include "should-enable-system-probe" .) "true" }}
- name: os-release-file
mountPath: /host{{ .Values.datadog.systemProbe.osReleasePath | default .Values.datadog.osReleasePath }}
readOnly: true
{{- else if .Values.datadog.osReleasePath }}
{{- else if .Values.datadog.osReleasePath }}
- name: os-release-file
mountPath: /host{{ .Values.datadog.osReleasePath }}
readOnly: true
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion test/datadog/baseline/agent-clusterchecks-deployment_default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:

name: datadog-clusterchecks
annotations:
checksum/clusteragent_token: 7a191b46e37210282a7d889d0f025945b63970d0d4d9de96d286c3b73b5b4cf7
checksum/clusteragent_token: 830171bd7adb7f38b3ee771229356d14f34ed931d25bec73c358553f5b56b0db
checksum/install_info: 3b9b3e85592ca511f47e6f39152d86a2c22f1ecc6fe577f4a9f78fa7e78097a4
spec:
serviceAccountName: datadog-cluster-checks
Expand Down
2 changes: 1 addition & 1 deletion test/datadog/baseline/cluster-agent-deployment_default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: facb8dd79b211ff3953c8958ae1f70ee76fc2adc10ee080c91a204c6a7e88491
checksum/clusteragent_token: 717472db2cafa6f30f5eb2185fd2189e12e0f3015e6feb87d540c34a016f386e
checksum/clusteragent-configmap: b80db4e65821dd6bcd24691a57341dbf840b5ac2c7e635060f0e8ae83f6597c1
checksum/api_key: e8756335f64a19cdbc31bf5c1e01c7cc4fa57310bf1a1739384243a8adada70c
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
Expand Down
2 changes: 1 addition & 1 deletion test/datadog/baseline/cluster-agent-deployment_default_advanced_AC_injection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: 0c3539cd7055e84dd64879bb3ff326700a5a2ec3f3b0d722e7071968ee8f0fd8
checksum/clusteragent_token: 92a785c7a795f3701ad5e2b5a4ca5534c4b54ee1ddd1dbf70a1e1f86e42ef9e9
checksum/clusteragent-configmap: b80db4e65821dd6bcd24691a57341dbf840b5ac2c7e635060f0e8ae83f6597c1
checksum/api_key: e8756335f64a19cdbc31bf5c1e01c7cc4fa57310bf1a1739384243a8adada70c
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
Expand Down
2 changes: 1 addition & 1 deletion test/datadog/baseline/cluster-agent-deployment_default_minimal_AC_injection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: e477034b230a96cc5f27d29d160d9cb80e6f4f9d6c49fb28713126fefddcbe62
checksum/clusteragent_token: 462e1a7bb966e864c54259a1be71cecdcf41eeeab12364577ec1ca498895ebef
checksum/clusteragent-configmap: b80db4e65821dd6bcd24691a57341dbf840b5ac2c7e635060f0e8ae83f6597c1
checksum/api_key: e8756335f64a19cdbc31bf5c1e01c7cc4fa57310bf1a1739384243a8adada70c
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
Expand Down
2 changes: 1 addition & 1 deletion test/datadog/baseline/daemonset_default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:

name: datadog
annotations:
checksum/clusteragent_token: 54012c1a4ce0a6149663e8f4454f1990609e504b55a4d40dfaea08fa08c9620b
checksum/clusteragent_token: af2668507c555fcef4371bbe0e4f66af3a019cf6afbeed9fd02c495db74b7144
checksum/install_info: 3b9b3e85592ca511f47e6f39152d86a2c22f1ecc6fe577f4a9f78fa7e78097a4
checksum/autoconf-config: 74234e98afe7498fb5daf1f36ac2d78acc339464f950703b8c019892f982b90b
checksum/confd-config: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
Expand Down
5 changes: 1 addition & 4 deletions test/datadog/baseline/gdc_daemonset_default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
env.datadoghq.com/kind: gke-gdc
name: datadog
annotations:
checksum/clusteragent_token: 5c598c4c593e57447477b1697c7a2b0c633a749417879a7f924b43ee99e29a6a
checksum/clusteragent_token: 925cd1bb3d66a77e8cc660590389799112cf62c36b397d2366b5d896806ba000
checksum/install_info: 3b9b3e85592ca511f47e6f39152d86a2c22f1ecc6fe577f4a9f78fa7e78097a4
checksum/autoconf-config: 74234e98afe7498fb5daf1f36ac2d78acc339464f950703b8c019892f982b90b
checksum/confd-config: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
Expand Down Expand Up @@ -146,9 +146,6 @@ spec:
mountPath: /tmp
readOnly: false # Need RW to write to /tmp directory

- name: os-release-file
mountPath: /host/etc/os-release
readOnly: true
- name: config
mountPath: /etc/datadog-agent
readOnly: false # Need RW to mount to config path
Expand Down
5 changes: 1 addition & 4 deletions test/datadog/baseline/gdc_daemonset_logs_collection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
env.datadoghq.com/kind: gke-gdc
name: datadog
annotations:
checksum/clusteragent_token: c0200d78f6e8dba93ae6568c787f31b4700c6637877be9155afc3197a091223b
checksum/clusteragent_token: a7b75f778e3fe606f77aefda809d56a57e0f3a6c2335222759f9331d681d320f
checksum/install_info: 3b9b3e85592ca511f47e6f39152d86a2c22f1ecc6fe577f4a9f78fa7e78097a4
checksum/autoconf-config: 74234e98afe7498fb5daf1f36ac2d78acc339464f950703b8c019892f982b90b
checksum/confd-config: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
Expand Down Expand Up @@ -146,9 +146,6 @@ spec:
mountPath: /tmp
readOnly: false # Need RW to write to /tmp directory

- name: os-release-file
mountPath: /host/etc/os-release
readOnly: true
- name: config
mountPath: /etc/datadog-agent
readOnly: false # Need RW to mount to config path
Expand Down
12 changes: 6 additions & 6 deletions test/datadog/baseline/other_default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ metadata:
app.kubernetes.io/version: "7"
type: Opaque
data:
token: "V2dVVFg2SjRiVUhYQWFnQXlUNFE4UlU0M1JMaTc1VGY="
token: "dHl0SWJWczM4dTNGTEhyVmFYMUo4bjRHdmNHaHZNZTU="
---
# Source: datadog/templates/cluster-agent-confd-configmap.yaml
apiVersion: v1
Expand Down Expand Up @@ -193,8 +193,8 @@ metadata:
app.kubernetes.io/version: "7"
data:
install_type: k8s_manual
install_id: "c6025e5d-8497-4177-8ec0-a9506c773e6e"
install_time: "1738191091"
install_id: "dabf1457-ccee-4dff-a456-6b94979fc85a"
install_time: "1738256708"
---
# Source: datadog/templates/cluster-agent-rbac.yaml
apiVersion: "rbac.authorization.k8s.io/v1"
Expand Down Expand Up @@ -834,7 +834,7 @@ spec:

name: datadog
annotations:
checksum/clusteragent_token: 16409ccac7f428b887e61144e9ed9e925af8aa8977e81fd556f96399129ef33a
checksum/clusteragent_token: abbaa5d3de64156e8d15456128c290d0dfa851b06802f4c5057a84021e60867f
checksum/install_info: 3b9b3e85592ca511f47e6f39152d86a2c22f1ecc6fe577f4a9f78fa7e78097a4
checksum/autoconf-config: 74234e98afe7498fb5daf1f36ac2d78acc339464f950703b8c019892f982b90b
checksum/confd-config: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
Expand Down Expand Up @@ -1268,7 +1268,7 @@ spec:

name: datadog-clusterchecks
annotations:
checksum/clusteragent_token: ba6a09ff415c3872456aa9ca91676c5f84c4cfa2991904a7116965df80d0bc41
checksum/clusteragent_token: 09743e3c6336140e81593cbd8ed1c7c1b2c6b638eb62f07c68762ea94d5052ba
checksum/install_info: 3b9b3e85592ca511f47e6f39152d86a2c22f1ecc6fe577f4a9f78fa7e78097a4
spec:
serviceAccountName: datadog-cluster-checks
Expand Down Expand Up @@ -1460,7 +1460,7 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: d565ff0ebd0b384ad4f538c6039a5c240c919bc0e08f62e02b5aee52e58d7114
checksum/clusteragent_token: 8428aa548af16824b68108d325213f0a2fa846cbf923fd9dccc4f475b5aabbe3
checksum/clusteragent-configmap: 84fd9626779d2b7fc64dc85cfbfa1cea1edb062f6e8cdba7dcf88d4637b73fa5
checksum/install_info: 3b9b3e85592ca511f47e6f39152d86a2c22f1ecc6fe577f4a9f78fa7e78097a4
spec:
Expand Down
Loading