Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
celenechang committed Sep 25, 2024
1 parent dbf0d50 commit 0e81823
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 93 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: datadog-clusterchecks
namespace: datadog-agent
labels:
helm.sh/chart: 'datadog-3.69.3'
helm.sh/chart: 'datadog-3.73.0'
app.kubernetes.io/name: "datadog"
app.kubernetes.io/instance: "datadog"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -36,16 +36,16 @@ spec:

name: datadog-clusterchecks
annotations:
checksum/clusteragent_token: 898b7de0d59fe1803c9e99f2010332dae52edfc36ef050f7f77c7ab12b8709c5
checksum/install_info: 88c52cd7ef5158f4eb2738b4c3b575985b7d139c6b2a25213c46c5a6266e22e7
checksum/clusteragent_token: e95c3aa09253f021e31a1ac5c7ee014e6454d2d5fee0482b0f253e12dab68afd
checksum/install_info: 4431ead135ce20065fbe40abb5a6e6324fb9e43978cfd3ef1857d9fcaa613aa8
spec:
serviceAccountName: datadog-cluster-checks
automountServiceAccountToken: true
imagePullSecrets:
[]
initContainers:
- name: init-volume
image: "gcr.io/datadoghq/agent:7.55.2"
image: "gcr.io/datadoghq/agent:7.57.2"
imagePullPolicy: IfNotPresent
command: ["bash", "-c"]
args:
Expand All @@ -57,7 +57,7 @@ spec:
resources:
{}
- name: init-config
image: "gcr.io/datadoghq/agent:7.55.2"
image: "gcr.io/datadoghq/agent:7.57.2"
imagePullPolicy: IfNotPresent
command: ["bash", "-c"]
args:
Expand All @@ -70,7 +70,7 @@ spec:
{}
containers:
- name: agent
image: "gcr.io/datadoghq/agent:7.55.2"
image: "gcr.io/datadoghq/agent:7.57.2"
command: ["bash", "-c"]
args:
- rm -rf /etc/datadog-agent/conf.d && touch /etc/datadog-agent/datadog.yaml && exec agent run
Expand Down
16 changes: 9 additions & 7 deletions test/datadog/baseline/cluster-agent-deployment_default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: datadog-cluster-agent
namespace: datadog-agent
labels:
helm.sh/chart: 'datadog-3.69.3'
helm.sh/chart: 'datadog-3.73.0'
app.kubernetes.io/name: "datadog"
app.kubernetes.io/instance: "datadog"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -36,17 +36,17 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: 1e89899244fb44ae50129b361b512027fd59eeec723dc4e43ec8c54084de2f92
checksum/clusteragent-configmap: fa5c139d4a60573ab9b4ecd4827360c3718bde0bcaaf5c9f1eae8ae24ff48edf
checksum/api_key: 43fd540dba2ec5835bddb0920a960e152d63d0dc44c95cdb376dfd5c8c39bdd4
checksum/clusteragent_token: d786ae722980a2b7f91d4be2bf9eebfb9997a1fd85c3a0368c360cb060ed54fc
checksum/clusteragent-configmap: a4b18a57220d8a10e808c1d1fb842d71eb6b72c99041c603784aecdd4d8003cc
checksum/api_key: fee83544b853e02ebb8f3fc57ab8c3a39bec4379bd187f18a27a58bbaca57208
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/install_info: 88c52cd7ef5158f4eb2738b4c3b575985b7d139c6b2a25213c46c5a6266e22e7
checksum/install_info: 4431ead135ce20065fbe40abb5a6e6324fb9e43978cfd3ef1857d9fcaa613aa8
spec:
serviceAccountName: datadog-cluster-agent
automountServiceAccountToken: true
initContainers:
- name: init-volume
image: "gcr.io/datadoghq/cluster-agent:7.55.2"
image: "gcr.io/datadoghq/cluster-agent:7.57.2"
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.55.2"
image: "gcr.io/datadoghq/cluster-agent:7.57.2"
imagePullPolicy: IfNotPresent
resources:
{}
Expand Down Expand Up @@ -237,6 +237,8 @@ spec:
items:
- key: kubernetes_state_core.yaml.default
path: kubernetes_state_core.yaml.default
- key: kubernetes_apiserver.yaml
path: kubernetes_apiserver.yaml
- name: config
emptyDir: {}
affinity:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: datadog-cluster-agent
namespace: datadog-agent
labels:
helm.sh/chart: 'datadog-3.69.3'
helm.sh/chart: 'datadog-3.73.0'
app.kubernetes.io/name: "datadog"
app.kubernetes.io/instance: "datadog"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -36,17 +36,17 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: 7991408bb52fa0f7419e6e11edf9a98b11a769fe9fd4574652c99d896a836f3a
checksum/clusteragent-configmap: fa5c139d4a60573ab9b4ecd4827360c3718bde0bcaaf5c9f1eae8ae24ff48edf
checksum/api_key: 43fd540dba2ec5835bddb0920a960e152d63d0dc44c95cdb376dfd5c8c39bdd4
checksum/clusteragent_token: 146a7a7f2e304ae7637352cb1ecd1fd9b92739626753086c8a562b3a848904fa
checksum/clusteragent-configmap: a4b18a57220d8a10e808c1d1fb842d71eb6b72c99041c603784aecdd4d8003cc
checksum/api_key: fee83544b853e02ebb8f3fc57ab8c3a39bec4379bd187f18a27a58bbaca57208
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/install_info: 88c52cd7ef5158f4eb2738b4c3b575985b7d139c6b2a25213c46c5a6266e22e7
checksum/install_info: 4431ead135ce20065fbe40abb5a6e6324fb9e43978cfd3ef1857d9fcaa613aa8
spec:
serviceAccountName: datadog-cluster-agent
automountServiceAccountToken: true
initContainers:
- name: init-volume
image: "gcr.io/datadoghq/cluster-agent:7.55.2"
image: "gcr.io/datadoghq/cluster-agent:7.57.2"
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.55.2"
image: "gcr.io/datadoghq/cluster-agent:7.57.2"
imagePullPolicy: IfNotPresent
resources:
{}
Expand Down Expand Up @@ -251,6 +251,8 @@ spec:
items:
- key: kubernetes_state_core.yaml.default
path: kubernetes_state_core.yaml.default
- key: kubernetes_apiserver.yaml
path: kubernetes_apiserver.yaml
- name: config
emptyDir: {}
affinity:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: datadog-cluster-agent
namespace: datadog-agent
labels:
helm.sh/chart: 'datadog-3.69.3'
helm.sh/chart: 'datadog-3.73.0'
app.kubernetes.io/name: "datadog"
app.kubernetes.io/instance: "datadog"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -36,17 +36,17 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: 1c7f1ed04182e5250ad3cdd92f5e0549d68b792b85514efd1343d473b4b0ed31
checksum/clusteragent-configmap: fa5c139d4a60573ab9b4ecd4827360c3718bde0bcaaf5c9f1eae8ae24ff48edf
checksum/api_key: 43fd540dba2ec5835bddb0920a960e152d63d0dc44c95cdb376dfd5c8c39bdd4
checksum/clusteragent_token: 5df33a65f728b7353527940691335906c2e2a4837cf2545fc465c3ccbdecb7cd
checksum/clusteragent-configmap: a4b18a57220d8a10e808c1d1fb842d71eb6b72c99041c603784aecdd4d8003cc
checksum/api_key: fee83544b853e02ebb8f3fc57ab8c3a39bec4379bd187f18a27a58bbaca57208
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/install_info: 88c52cd7ef5158f4eb2738b4c3b575985b7d139c6b2a25213c46c5a6266e22e7
checksum/install_info: 4431ead135ce20065fbe40abb5a6e6324fb9e43978cfd3ef1857d9fcaa613aa8
spec:
serviceAccountName: datadog-cluster-agent
automountServiceAccountToken: true
initContainers:
- name: init-volume
image: "gcr.io/datadoghq/cluster-agent:7.55.2"
image: "gcr.io/datadoghq/cluster-agent:7.57.2"
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.55.2"
image: "gcr.io/datadoghq/cluster-agent:7.57.2"
imagePullPolicy: IfNotPresent
resources:
{}
Expand Down Expand Up @@ -119,7 +119,7 @@ spec:
- name: DD_ADMISSION_CONTROLLER_AGENT_SIDECAR_IMAGE_NAME
value: agent
- name: DD_ADMISSION_CONTROLLER_AGENT_SIDECAR_IMAGE_TAG
value: 7.55.2
value: 7.57.2
- name: DD_REMOTE_CONFIGURATION_ENABLED
value: "false"
- name: DD_CLUSTER_CHECKS_ENABLED
Expand Down Expand Up @@ -247,6 +247,8 @@ spec:
items:
- key: kubernetes_state_core.yaml.default
path: kubernetes_state_core.yaml.default
- key: kubernetes_apiserver.yaml
path: kubernetes_apiserver.yaml
- name: config
emptyDir: {}
affinity:
Expand Down
16 changes: 8 additions & 8 deletions test/datadog/baseline/daemonset_default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: datadog
namespace: datadog-agent
labels:
helm.sh/chart: 'datadog-3.69.3'
helm.sh/chart: 'datadog-3.73.0'
app.kubernetes.io/name: "datadog"
app.kubernetes.io/instance: "datadog"
app.kubernetes.io/managed-by: Helm
Expand All @@ -30,8 +30,8 @@ spec:

name: datadog
annotations:
checksum/clusteragent_token: de542da9e3ea422b2ed413961187c1fe5bd28d1608c78a8bb16a4bc64b508e9b
checksum/install_info: 88c52cd7ef5158f4eb2738b4c3b575985b7d139c6b2a25213c46c5a6266e22e7
checksum/clusteragent_token: 6b801cdee7b458f8dc8cf101150135babecf647416c222dcf109ae6517afefc4
checksum/install_info: 4431ead135ce20065fbe40abb5a6e6324fb9e43978cfd3ef1857d9fcaa613aa8
checksum/autoconf-config: 74234e98afe7498fb5daf1f36ac2d78acc339464f950703b8c019892f982b90b
checksum/confd-config: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
checksum/checksd-config: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
Expand All @@ -42,7 +42,7 @@ spec:
hostPID: true
containers:
- name: agent
image: "gcr.io/datadoghq/agent:7.55.2"
image: "gcr.io/datadoghq/agent:7.57.2"
imagePullPolicy: IfNotPresent
command: ["agent", "run"]

Expand Down Expand Up @@ -202,7 +202,7 @@ spec:
successThreshold: 1
timeoutSeconds: 5
- name: trace-agent
image: "gcr.io/datadoghq/agent:7.55.2"
image: "gcr.io/datadoghq/agent:7.57.2"
imagePullPolicy: IfNotPresent
command: ["trace-agent", "-config=/etc/datadog-agent/datadog.yaml"]
resources:
Expand Down Expand Up @@ -308,7 +308,7 @@ spec:
port: 8126
timeoutSeconds: 5
- name: process-agent
image: "gcr.io/datadoghq/agent:7.55.2"
image: "gcr.io/datadoghq/agent:7.57.2"
imagePullPolicy: IfNotPresent
command: ["process-agent", "--cfgpath=/etc/datadog-agent/datadog.yaml"]
resources:
Expand Down Expand Up @@ -405,7 +405,7 @@ spec:

- name: init-volume

image: "gcr.io/datadoghq/agent:7.55.2"
image: "gcr.io/datadoghq/agent:7.57.2"
imagePullPolicy: IfNotPresent
command: ["bash", "-c"]
args:
Expand All @@ -418,7 +418,7 @@ spec:
{}
- name: init-config

image: "gcr.io/datadoghq/agent:7.55.2"
image: "gcr.io/datadoghq/agent:7.57.2"
imagePullPolicy: IfNotPresent
command:
- bash
Expand Down
Loading

0 comments on commit 0e81823

Please sign in to comment.