From 7e1c0e3ebdd1d483f349f859b5e5dffd51074f4f Mon Sep 17 00:00:00 2001 From: Celene Date: Tue, 2 Jul 2024 11:55:35 -0400 Subject: [PATCH 1/2] remove v1alpha1 datadogagent examples --- .../{v2alpha1 => }/datadog-agent-all.yaml | 0 .../{v2alpha1 => }/datadog-agent-minimum.yaml | 0 .../datadog-agent-on-openshift.yaml | 0 .../datadog-agent-with-apm-hostport.yaml | 0 ...atadog-agent-with-cluster-agent-confd.yaml | 0 .../datadog-agent-with-clusteragent.yaml | 0 .../datadog-agent-with-credential-secret.yaml | 0 ...og-agent-with-dca-clusterchecksrunner.yaml | 0 ...t-with-dca-with-orchestrator-explorer.yaml | 0 .../datadog-agent-with-extraconfd.yaml | 0 ...tadog-agent-with-ksm-core-custom-conf.yaml | 0 .../datadog-agent-with-logs-apm.yaml | 0 ...g-agent-with-orchestrator-custom-conf.yaml | 0 .../datadog-agent-with-otlp.yaml | 0 ...metheus-autodiscovery-advanced-config.yaml | 0 ...g-agent-with-prometheus-autodiscovery.yaml | 0 .../datadog-agent-with-registry.yaml | 0 ...tadog-agent-with-remote-configuration.yaml | 0 .../datadog-agent-with-secret-backend.yaml | 0 .../datadog-agent-with-secret-keys.yaml | 0 .../datadog-agent-with-tolerations.yaml | 0 .../datadog-agent-with-unix-socket.yaml | 0 .../v1alpha1/datadog-agent-all.yaml | 29 --------- .../v1alpha1/datadog-agent-apm.yaml | 12 ---- .../datadog-agent-cluster-agent-confd.yaml | 30 --------- .../datadog-agent-ksm-core-custom-conf.yaml | 65 ------------------- .../v1alpha1/datadog-agent-logs-apm.yaml | 13 ---- .../v1alpha1/datadog-agent-logs.yaml | 11 ---- .../v1alpha1/datadog-agent-openshift.yaml | 29 --------- ...atadog-agent-orchestrator-custom-conf.yaml | 59 ----------------- .../v1alpha1/datadog-agent-otlp.yaml | 18 ----- .../datadog-agent-secret-backend.yaml | 47 -------------- .../v1alpha1/datadog-agent-unix-socket.yaml | 18 ----- .../datadog-agent-with-clusteragent.yaml | 18 ----- .../datadog-agent-with-credential-secret.yaml | 20 ------ ...og-agent-with-dca-clusterchecksrunner.yaml | 21 ------ ...t-with-dca-with-orchestrator-explorer.yaml | 18 ----- ...metheus-autodiscovery-advanced-config.yaml | 29 --------- ...g-agent-with-prometheus-autodiscovery.yaml | 18 ----- .../v1alpha1/datadog-agent-with-registry.yaml | 21 ------ .../datadog-agent-with-tolerations.yaml | 11 ---- .../datadogagent/v1alpha1/datadog-agent.yaml | 8 --- 42 files changed, 495 deletions(-) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-all.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-minimum.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-on-openshift.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-apm-hostport.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-cluster-agent-confd.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-clusteragent.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-credential-secret.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-dca-clusterchecksrunner.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-dca-with-orchestrator-explorer.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-extraconfd.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-ksm-core-custom-conf.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-logs-apm.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-orchestrator-custom-conf.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-otlp.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-prometheus-autodiscovery-advanced-config.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-prometheus-autodiscovery.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-registry.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-remote-configuration.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-secret-backend.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-secret-keys.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-tolerations.yaml (100%) rename examples/datadogagent/{v2alpha1 => }/datadog-agent-with-unix-socket.yaml (100%) delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-all.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-apm.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-cluster-agent-confd.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-ksm-core-custom-conf.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-logs-apm.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-logs.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-openshift.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-orchestrator-custom-conf.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-otlp.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-secret-backend.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-unix-socket.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-with-clusteragent.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-with-credential-secret.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-with-dca-clusterchecksrunner.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-with-dca-with-orchestrator-explorer.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-with-prometheus-autodiscovery-advanced-config.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-with-prometheus-autodiscovery.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-with-registry.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent-with-tolerations.yaml delete mode 100644 examples/datadogagent/v1alpha1/datadog-agent.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-all.yaml b/examples/datadogagent/datadog-agent-all.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-all.yaml rename to examples/datadogagent/datadog-agent-all.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-minimum.yaml b/examples/datadogagent/datadog-agent-minimum.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-minimum.yaml rename to examples/datadogagent/datadog-agent-minimum.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-on-openshift.yaml b/examples/datadogagent/datadog-agent-on-openshift.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-on-openshift.yaml rename to examples/datadogagent/datadog-agent-on-openshift.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-apm-hostport.yaml b/examples/datadogagent/datadog-agent-with-apm-hostport.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-apm-hostport.yaml rename to examples/datadogagent/datadog-agent-with-apm-hostport.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-cluster-agent-confd.yaml b/examples/datadogagent/datadog-agent-with-cluster-agent-confd.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-cluster-agent-confd.yaml rename to examples/datadogagent/datadog-agent-with-cluster-agent-confd.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-clusteragent.yaml b/examples/datadogagent/datadog-agent-with-clusteragent.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-clusteragent.yaml rename to examples/datadogagent/datadog-agent-with-clusteragent.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-credential-secret.yaml b/examples/datadogagent/datadog-agent-with-credential-secret.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-credential-secret.yaml rename to examples/datadogagent/datadog-agent-with-credential-secret.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-dca-clusterchecksrunner.yaml b/examples/datadogagent/datadog-agent-with-dca-clusterchecksrunner.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-dca-clusterchecksrunner.yaml rename to examples/datadogagent/datadog-agent-with-dca-clusterchecksrunner.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-dca-with-orchestrator-explorer.yaml b/examples/datadogagent/datadog-agent-with-dca-with-orchestrator-explorer.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-dca-with-orchestrator-explorer.yaml rename to examples/datadogagent/datadog-agent-with-dca-with-orchestrator-explorer.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-extraconfd.yaml b/examples/datadogagent/datadog-agent-with-extraconfd.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-extraconfd.yaml rename to examples/datadogagent/datadog-agent-with-extraconfd.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-ksm-core-custom-conf.yaml b/examples/datadogagent/datadog-agent-with-ksm-core-custom-conf.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-ksm-core-custom-conf.yaml rename to examples/datadogagent/datadog-agent-with-ksm-core-custom-conf.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-logs-apm.yaml b/examples/datadogagent/datadog-agent-with-logs-apm.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-logs-apm.yaml rename to examples/datadogagent/datadog-agent-with-logs-apm.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-orchestrator-custom-conf.yaml b/examples/datadogagent/datadog-agent-with-orchestrator-custom-conf.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-orchestrator-custom-conf.yaml rename to examples/datadogagent/datadog-agent-with-orchestrator-custom-conf.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-otlp.yaml b/examples/datadogagent/datadog-agent-with-otlp.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-otlp.yaml rename to examples/datadogagent/datadog-agent-with-otlp.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-prometheus-autodiscovery-advanced-config.yaml b/examples/datadogagent/datadog-agent-with-prometheus-autodiscovery-advanced-config.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-prometheus-autodiscovery-advanced-config.yaml rename to examples/datadogagent/datadog-agent-with-prometheus-autodiscovery-advanced-config.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-prometheus-autodiscovery.yaml b/examples/datadogagent/datadog-agent-with-prometheus-autodiscovery.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-prometheus-autodiscovery.yaml rename to examples/datadogagent/datadog-agent-with-prometheus-autodiscovery.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-registry.yaml b/examples/datadogagent/datadog-agent-with-registry.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-registry.yaml rename to examples/datadogagent/datadog-agent-with-registry.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-remote-configuration.yaml b/examples/datadogagent/datadog-agent-with-remote-configuration.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-remote-configuration.yaml rename to examples/datadogagent/datadog-agent-with-remote-configuration.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-secret-backend.yaml b/examples/datadogagent/datadog-agent-with-secret-backend.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-secret-backend.yaml rename to examples/datadogagent/datadog-agent-with-secret-backend.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-secret-keys.yaml b/examples/datadogagent/datadog-agent-with-secret-keys.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-secret-keys.yaml rename to examples/datadogagent/datadog-agent-with-secret-keys.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-tolerations.yaml b/examples/datadogagent/datadog-agent-with-tolerations.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-tolerations.yaml rename to examples/datadogagent/datadog-agent-with-tolerations.yaml diff --git a/examples/datadogagent/v2alpha1/datadog-agent-with-unix-socket.yaml b/examples/datadogagent/datadog-agent-with-unix-socket.yaml similarity index 100% rename from examples/datadogagent/v2alpha1/datadog-agent-with-unix-socket.yaml rename to examples/datadogagent/datadog-agent-with-unix-socket.yaml diff --git a/examples/datadogagent/v1alpha1/datadog-agent-all.yaml b/examples/datadogagent/v1alpha1/datadog-agent-all.yaml deleted file mode 100644 index fa45ac3a0..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-all.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - agent: - apm: - enabled: true - process: - enabled: true - processCollectionEnabled: true - log: - enabled: true - systemProbe: - bpfDebugEnabled: true - security: - compliance: - enabled: true - runtime: - enabled: false - clusterAgent: - config: - externalMetrics: - enabled: true - admissionController: - enabled: true diff --git a/examples/datadogagent/v1alpha1/datadog-agent-apm.yaml b/examples/datadogagent/v1alpha1/datadog-agent-apm.yaml deleted file mode 100644 index f9805ef16..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-apm.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - agent: - apm: - enabled: true - hostPort: 8126 diff --git a/examples/datadogagent/v1alpha1/datadog-agent-cluster-agent-confd.yaml b/examples/datadogagent/v1alpha1/datadog-agent-cluster-agent-confd.yaml deleted file mode 100644 index 040686892..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-cluster-agent-confd.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - clusterName: foo - credentials: - apiKey: - appKey: - features: - orchestratorExplorer: - enabled: true - kubeStateMetricsCore: - enabled: true - clusterAgent: - config: - confd: - configMapName: cluster-agent-confd - items: - - key: test - path: test.d/test.yaml ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: cluster-agent-confd -data: - test: |- - init_config: - instances: diff --git a/examples/datadogagent/v1alpha1/datadog-agent-ksm-core-custom-conf.yaml b/examples/datadogagent/v1alpha1/datadog-agent-ksm-core-custom-conf.yaml deleted file mode 100644 index 18de43988..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-ksm-core-custom-conf.yaml +++ /dev/null @@ -1,65 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - clusterName: foo - credentials: - apiKey: - appKey: - features: - orchestratorExplorer: - enabled: true - kubeStateMetricsCore: - enabled: true - conf: - configMap: - name: cluster-agent-ksm-conf - agent: - clusterAgent: - config: - clusterChecksEnabled: true - clusterChecksRunner: - enabled: true ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: cluster-agent-ksm-conf -data: - pods.yaml: |- - cluster_check: true - init_config: - instances: - - collectors: - - pods - nodes.yaml: |- - cluster_check: true - init_config: - instances: - - collectors: - - nodes - others.yaml: |- - cluster_check: true - init_config: - instances: - - collectors: - - secrets - - services - - resourcequotas - - replicationcontrollers - - limitranges - - persistentvolumeclaims - - persistentvolumes - - namespaces - - endpoints - - daemonsets - - deployments - - replicasets - - statefulsets - - cronjobs - - jobs - - horizontalpodautoscalers - - poddisruptionbudgets - - storageclasses - - volumeattachments diff --git a/examples/datadogagent/v1alpha1/datadog-agent-logs-apm.yaml b/examples/datadogagent/v1alpha1/datadog-agent-logs-apm.yaml deleted file mode 100644 index baf64bfe3..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-logs-apm.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - agent: - apm: - enabled: true - log: - enabled: true diff --git a/examples/datadogagent/v1alpha1/datadog-agent-logs.yaml b/examples/datadogagent/v1alpha1/datadog-agent-logs.yaml deleted file mode 100644 index 7cb88fd05..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-logs.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - agent: - log: - enabled: true diff --git a/examples/datadogagent/v1alpha1/datadog-agent-openshift.yaml b/examples/datadogagent/v1alpha1/datadog-agent-openshift.yaml deleted file mode 100644 index c427873ba..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-openshift.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog - namespace: datadog -spec: - credentials: - apiKey: - appKey: - agent: - rbac: - serviceAccountName: datadog-agent-scc - config: - securityContext: - runAsUser: 0 - seLinuxOptions: - level: s0 - role: system_r - type: spc_t - user: system_u - criSocket: - criSocketPath: /var/run/crio/crio.sock - log: - enabled: true - apm: - enabled: true - process: - enabled: true - processCollectionEnabled: true diff --git a/examples/datadogagent/v1alpha1/datadog-agent-orchestrator-custom-conf.yaml b/examples/datadogagent/v1alpha1/datadog-agent-orchestrator-custom-conf.yaml deleted file mode 100644 index 4d71c787d..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-orchestrator-custom-conf.yaml +++ /dev/null @@ -1,59 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - clusterName: foo - credentials: - apiKey: - appKey: - features: - orchestratorExplorer: - enabled: true - conf: - configMap: - name: orchestrator-conf - clusterAgent: - config: - clusterChecksEnabled: true - clusterChecksRunner: - enabled: true ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: orchestrator-conf -data: - pods.yaml: |- - cluster_check: true - init_config: - instances: - - collectors: - - pods - skip_leader_election: true - jobs.yaml: |- - cluster_check: true - init_config: - instances: - - collectors: - - jobs - - cronjobs - skip_leader_election: true - workloads.yaml: |- - cluster_check: true - init_config: - instances: - - collectors: - - deployments - - replicasets - - daemonsets - - statefulsets - skip_leader_election: true - others.yaml: |- - cluster_check: true - init_config: - instances: - - collectors: - - nodes - - services - skip_leader_election: true diff --git a/examples/datadogagent/v1alpha1/datadog-agent-otlp.yaml b/examples/datadogagent/v1alpha1/datadog-agent-otlp.yaml deleted file mode 100644 index 817efba82..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-otlp.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - agent: - apm: - enabled: true - otlp: - receiver: - protocols: - grpc: - enabled: true - http: - enabled: true diff --git a/examples/datadogagent/v1alpha1/datadog-agent-secret-backend.yaml b/examples/datadogagent/v1alpha1/datadog-agent-secret-backend.yaml deleted file mode 100644 index 36bdf143d..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-secret-backend.yaml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: ENC[api_key] - appKey: ENC[app_key] - useSecretBackend: true - agent: - env: - - name: DD_SECRET_BACKEND_COMMAND - value: "/readsecret.sh" - - name: DD_SECRET_BACKEND_ARGUMENTS - value: "/etc/secret-volume" - config: - volumes: - - name: secret-volume - secret: - secretName: test-secret - volumeMounts: - - name: secret-volume - mountPath: /etc/secret-volume - process: - volumeMounts: - - name: secret-volume - mountPath: /etc/secret-volume - apm: - enabled: true - volumeMounts: - - name: secret-volume - mountPath: /etc/secret-volume - clusterAgent: - enabled: true - config: - env: - - name: DD_SECRET_BACKEND_COMMAND - value: "/readsecret.sh" - - name: DD_SECRET_BACKEND_ARGUMENTS - value: "/etc/secret-volume" - volumes: - - name: secret-volume - secret: - secretName: test-secret - volumeMounts: - - name: secret-volume - mountPath: /etc/secret-volume diff --git a/examples/datadogagent/v1alpha1/datadog-agent-unix-socket.yaml b/examples/datadogagent/v1alpha1/datadog-agent-unix-socket.yaml deleted file mode 100644 index 81e6cb0dc..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-unix-socket.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - agent: - apm: - enabled: true - unixDomainSocket: - enabled: true - config: - dogstatsd: - dogstatsdOriginDetection: true - unixDomainSocket: - enabled: true diff --git a/examples/datadogagent/v1alpha1/datadog-agent-with-clusteragent.yaml b/examples/datadogagent/v1alpha1/datadog-agent-with-clusteragent.yaml deleted file mode 100644 index 5b332b5d9..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-with-clusteragent.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - token: - agent: - config: - tolerations: - - operator: Exists - clusterAgent: - config: - externalMetrics: - enabled: true - replicas: 2 diff --git a/examples/datadogagent/v1alpha1/datadog-agent-with-credential-secret.yaml b/examples/datadogagent/v1alpha1/datadog-agent-with-credential-secret.yaml deleted file mode 100644 index 34a65c684..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-with-credential-secret.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# ----------------------------------------------------------# -# Example about how to use an existing secret to store the # -# Datadog credentials # -# ----------------------------------------------------------# -# First, create the datadog-secret with the folling command: -# kubectl create secret generic datadog-secret --from-literal api-key=$DD_API_KEY --from-literal app-key=$DD_APP_KEY - -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - clusterName: foo - credentials: - apiSecret: - secretName: datadog-secret - keyName: api-key - appSecret: - secretName: datadog-secret - keyName: app-key diff --git a/examples/datadogagent/v1alpha1/datadog-agent-with-dca-clusterchecksrunner.yaml b/examples/datadogagent/v1alpha1/datadog-agent-with-dca-clusterchecksrunner.yaml deleted file mode 100644 index 4883bd8f5..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-with-dca-clusterchecksrunner.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - token: - agent: - config: - tolerations: - - operator: Exists - clusterAgent: - config: - externalMetrics: - enabled: true - clusterChecksEnabled: true - replicas: 2 - clusterChecksRunner: - enabled: true diff --git a/examples/datadogagent/v1alpha1/datadog-agent-with-dca-with-orchestrator-explorer.yaml b/examples/datadogagent/v1alpha1/datadog-agent-with-dca-with-orchestrator-explorer.yaml deleted file mode 100644 index 555736469..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-with-dca-with-orchestrator-explorer.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - token: - features: - orchestratorExplorer: - enabled: true - agent: - config: - tolerations: - - operator: Exists - clusterAgent: - replicas: 2 diff --git a/examples/datadogagent/v1alpha1/datadog-agent-with-prometheus-autodiscovery-advanced-config.yaml b/examples/datadogagent/v1alpha1/datadog-agent-with-prometheus-autodiscovery-advanced-config.yaml deleted file mode 100644 index 92822826f..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-with-prometheus-autodiscovery-advanced-config.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - token: - features: - prometheusScrape: - enabled: true - serviceEndpoints: true - additionalConfigs: |- - - autodiscovery: - kubernetes_annotations: - include: - custom_label: 'true' - kubernetes_container_names: - - my-app - configurations: - - send_distribution_buckets: true - timeout: 5 - agent: - config: - tolerations: - - operator: Exists - clusterAgent: - replicas: 2 diff --git a/examples/datadogagent/v1alpha1/datadog-agent-with-prometheus-autodiscovery.yaml b/examples/datadogagent/v1alpha1/datadog-agent-with-prometheus-autodiscovery.yaml deleted file mode 100644 index 77d688d5b..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-with-prometheus-autodiscovery.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - token: - features: - prometheusScrape: - enabled: true - agent: - config: - tolerations: - - operator: Exists - clusterAgent: - replicas: 2 diff --git a/examples/datadogagent/v1alpha1/datadog-agent-with-registry.yaml b/examples/datadogagent/v1alpha1/datadog-agent-with-registry.yaml deleted file mode 100644 index 2e4f18fd0..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-with-registry.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# ----------------------------------------------------------# -# An example of using an existing secret to store the # -# Datadog credentials # -# ----------------------------------------------------------# -# First, create the datadog-secret with the folling command: -# kubectl create secret generic datadog-secret --from-literal api-key=$DD_API_KEY --from-literal app-key=$DD_APP_KEY - -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - clusterName: foo - registry: public.ecr.aws/datadog - credentials: - apiSecret: - secretName: datadog-secret - keyName: api-key - appSecret: - secretName: datadog-secret - keyName: app-key diff --git a/examples/datadogagent/v1alpha1/datadog-agent-with-tolerations.yaml b/examples/datadogagent/v1alpha1/datadog-agent-with-tolerations.yaml deleted file mode 100644 index 93c3ac0a7..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent-with-tolerations.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - agent: - config: - tolerations: - - operator: Exists diff --git a/examples/datadogagent/v1alpha1/datadog-agent.yaml b/examples/datadogagent/v1alpha1/datadog-agent.yaml deleted file mode 100644 index 82afbb86e..000000000 --- a/examples/datadogagent/v1alpha1/datadog-agent.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - agent: From 2abbf493b34fac588f173a12b265fe793139b3e1 Mon Sep 17 00:00:00 2001 From: Celene Date: Tue, 2 Jul 2024 12:04:23 -0400 Subject: [PATCH 2/2] clean up config/samples also --- config/samples/datadog-agent-apm.yaml | 13 ------- config/samples/datadog-agent-logs-apm.yaml | 15 -------- config/samples/datadog-agent-logs.yaml | 13 ------- config/samples/datadog-agent-openshift.yaml | 32 ----------------- ...t-with-clusteragent-with-orchestrator.yaml | 22 ------------ .../datadog-agent-with-clusteragent.yaml | 22 ------------ ...og-agent-with-dca-clusterchecksrunner.yaml | 26 -------------- .../datadog-agent-with-tolerations.yaml | 13 ------- config/samples/datadog-agent.yaml | 10 ------ ...datadog-operator-hub-example-v1alpha1.yaml | 36 ------------------- 10 files changed, 202 deletions(-) delete mode 100644 config/samples/datadog-agent-apm.yaml delete mode 100644 config/samples/datadog-agent-logs-apm.yaml delete mode 100644 config/samples/datadog-agent-logs.yaml delete mode 100644 config/samples/datadog-agent-openshift.yaml delete mode 100644 config/samples/datadog-agent-with-clusteragent-with-orchestrator.yaml delete mode 100644 config/samples/datadog-agent-with-clusteragent.yaml delete mode 100644 config/samples/datadog-agent-with-dca-clusterchecksrunner.yaml delete mode 100644 config/samples/datadog-agent-with-tolerations.yaml delete mode 100644 config/samples/datadog-agent.yaml delete mode 100644 config/samples/datadog-operator-hub-example-v1alpha1.yaml diff --git a/config/samples/datadog-agent-apm.yaml b/config/samples/datadog-agent-apm.yaml deleted file mode 100644 index 95aed5118..000000000 --- a/config/samples/datadog-agent-apm.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - agent: - image: - name: "gcr.io/datadoghq/agent:latest" - apm: - enabled: true diff --git a/config/samples/datadog-agent-logs-apm.yaml b/config/samples/datadog-agent-logs-apm.yaml deleted file mode 100644 index 2a9aa60f2..000000000 --- a/config/samples/datadog-agent-logs-apm.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - agent: - image: - name: "gcr.io/datadoghq/agent:latest" - apm: - enabled: true - log: - enabled: true diff --git a/config/samples/datadog-agent-logs.yaml b/config/samples/datadog-agent-logs.yaml deleted file mode 100644 index ddbfe5fe3..000000000 --- a/config/samples/datadog-agent-logs.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - agent: - image: - name: "gcr.io/datadoghq/agent:latest" - log: - enabled: true diff --git a/config/samples/datadog-agent-openshift.yaml b/config/samples/datadog-agent-openshift.yaml deleted file mode 100644 index fb879b270..000000000 --- a/config/samples/datadog-agent-openshift.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - agent: - image: - name: "gcr.io/datadoghq/agent:latest" - config: - criSocket: - criSocketPath: /var/run/crio/crio.sock - useCriSocketVolume: true - env: - - name: DD_KUBELET_TLS_VERIFY - value: "false" - log: - enabled: false - clusterAgent: - image: - name: "gcr.io/datadoghq/cluster-agent:latest" - config: - externalMetrics: - enabled: true - port: 5010 - clusterChecksRunnerEnabled: true - replicas: 2 - clusterChecksRunner: - image: - name: "gcr.io/datadoghq/agent:latest" diff --git a/config/samples/datadog-agent-with-clusteragent-with-orchestrator.yaml b/config/samples/datadog-agent-with-clusteragent-with-orchestrator.yaml deleted file mode 100644 index 72d19675c..000000000 --- a/config/samples/datadog-agent-with-clusteragent-with-orchestrator.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - token: - features: - orchestratorExplorer: - enabled: true - agent: - image: - name: "gcr.io/datadoghq/agent:latest" - config: - tolerations: - - operator: Exists - clusterAgent: - image: - name: "gcr.io/datadoghq/cluster-agent:latest" - replicas: 2 diff --git a/config/samples/datadog-agent-with-clusteragent.yaml b/config/samples/datadog-agent-with-clusteragent.yaml deleted file mode 100644 index fb423a1e9..000000000 --- a/config/samples/datadog-agent-with-clusteragent.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - token: - agent: - image: - name: "gcr.io/datadoghq/agent:latest" - config: - tolerations: - - operator: Exists - clusterAgent: - image: - name: "gcr.io/datadoghq/cluster-agent:latest" - config: - externalMetrics: - enabled: true - replicas: 2 diff --git a/config/samples/datadog-agent-with-dca-clusterchecksrunner.yaml b/config/samples/datadog-agent-with-dca-clusterchecksrunner.yaml deleted file mode 100644 index de1713b9e..000000000 --- a/config/samples/datadog-agent-with-dca-clusterchecksrunner.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - appKey: - token: - agent: - image: - name: "gcr.io/datadoghq/agent:latest" - config: - tolerations: - - operator: Exists - clusterAgent: - image: - name: "gcr.io/datadoghq/cluster-agent:latest" - config: - externalMetrics: - enabled: true - clusterChecksEnabled: true - replicas: 2 - clusterChecksRunner: - image: - name: "gcr.io/datadoghq/agent:latest" diff --git a/config/samples/datadog-agent-with-tolerations.yaml b/config/samples/datadog-agent-with-tolerations.yaml deleted file mode 100644 index 59b81f100..000000000 --- a/config/samples/datadog-agent-with-tolerations.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - agent: - image: - name: "gcr.io/datadoghq/agent:latest" - config: - tolerations: - - operator: Exists diff --git a/config/samples/datadog-agent.yaml b/config/samples/datadog-agent.yaml deleted file mode 100644 index 5340cf35d..000000000 --- a/config/samples/datadog-agent.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - credentials: - apiKey: - agent: - image: - name: "gcr.io/datadoghq/agent:latest" diff --git a/config/samples/datadog-operator-hub-example-v1alpha1.yaml b/config/samples/datadog-operator-hub-example-v1alpha1.yaml deleted file mode 100644 index af2c0543c..000000000 --- a/config/samples/datadog-operator-hub-example-v1alpha1.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: datadoghq.com/v1alpha1 -kind: DatadogAgent -metadata: - name: datadog -spec: - clusterName: - credentials: - apiKey: - appKey: - token: - agent: - apm: - enabled: false - process: - enabled: true - processCollection: false - log: - enabled: false - logsConfigContainerCollectAll: false - systemProbe: - bpfDebugEnabled: false - security: - compliance: - enabled: false - runtime: - enabled: false - clusterAgent: - replicas: 2 - config: - externalMetrics: - enabled: false - admissionController: - enabled: false - clusterChecksEnabled: false - clusterChecksRunner: - replicas: 2