Skip to content

Commit

Permalink
Merge branch 'main' of github.com:DataDog/datadog-operator into v0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
clamoriniere committed May 4, 2021
2 parents 9553476 + 5b6aa3e commit dceb4bf
Show file tree
Hide file tree
Showing 12 changed files with 749 additions and 52 deletions.
56 changes: 56 additions & 0 deletions api/v1alpha1/datadogagent_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,14 @@ type APMSpec struct {
// Make sure to keep requests and limits equal to keep the pods in the Guaranteed QoS class.
// See also: http://kubernetes.io/docs/user-guide/compute-resources/
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`

// Command allows the specification of custom entrypoint for Trace Agent container
// +listType=atomic
Command []string `json:"command,omitempty"`

// Args allows the specification of extra args to `Command` parameter
// +listType=atomic
Args []string `json:"args,omitempty"`
}

// APMUnixDomainSocketSpec contains the APM Unix Domain Socket configuration.
Expand Down Expand Up @@ -428,6 +436,14 @@ type ProcessSpec struct {
// Make sure to keep requests and limits equal to keep the pods in the Guaranteed QoS class.
// See also: http://kubernetes.io/docs/user-guide/compute-resources/
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`

// Command allows the specification of custom entrypoint for Process Agent container
// +listType=atomic
Command []string `json:"command,omitempty"`

// Args allows the specification of extra args to `Command` parameter
// +listType=atomic
Args []string `json:"args,omitempty"`
}

// KubeStateMetricsCore contains the required parameters to enable and override the configuration
Expand Down Expand Up @@ -555,6 +571,14 @@ type SystemProbeSpec struct {
// See also: http://kubernetes.io/docs/user-guide/compute-resources/
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`

// Command allows the specification of custom entrypoint for System Probe container
// +listType=atomic
Command []string `json:"command,omitempty"`

// Args allows the specification of extra args to `Command` parameter
// +listType=atomic
Args []string `json:"args,omitempty"`

// You can modify the security context used to run the containers by
// modifying the label type.
// +optional
Expand Down Expand Up @@ -591,6 +615,14 @@ type SecuritySpec struct {
// Make sure to keep requests and limits equal to keep the pods in the Guaranteed QoS class.
// See also: http://kubernetes.io/docs/user-guide/compute-resources/
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`

// Command allows the specification of custom entrypoint for Security Agent container
// +listType=atomic
Command []string `json:"command,omitempty"`

// Args allows the specification of extra args to `Command` parameter
// +listType=atomic
Args []string `json:"args,omitempty"`
}

// ComplianceSpec contains configuration for continuous compliance.
Expand Down Expand Up @@ -738,6 +770,14 @@ type NodeAgentConfig struct {
// See also: http://kubernetes.io/docs/user-guide/compute-resources/
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`

// Command allows the specification of custom entrypoint for the Agent container
// +listType=atomic
Command []string `json:"command,omitempty"`

// Args allows the specification of extra args to `Command` parameter
// +listType=atomic
Args []string `json:"args,omitempty"`

// Configure the CRI Socket.
CriSocket *CRISocketConfig `json:"criSocket,omitempty"`

Expand Down Expand Up @@ -921,6 +961,14 @@ type ClusterAgentConfig struct {
// Datadog cluster-agent resource requests and limits.
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`

// Command allows the specification of custom entrypoint for Cluster Agent container
// +listType=atomic
Command []string `json:"command,omitempty"`

// Args allows the specification of extra args to `Command` parameter
// +listType=atomic
Args []string `json:"args,omitempty"`

// Confd Provide additional cluster check configurations. Each key will become a file in /conf.d.
// see https://docs.datadoghq.com/agent/autodiscovery/ for more details.
// +optional
Expand Down Expand Up @@ -1003,6 +1051,14 @@ type ClusterChecksRunnerConfig struct {
// Datadog Cluster Checks Runner resource requests and limits.
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`

// Command allows the specification of custom entrypoint for Cluster Checks Runner container
// +listType=atomic
Command []string `json:"command,omitempty"`

// Args allows the specification of extra args to `Command` parameter
// +listType=atomic
Args []string `json:"args,omitempty"`

// Set logging verbosity, valid log levels are:
// trace, debug, info, warn, error, critical, and off
LogLevel *string `json:"logLevel,omitempty"`
Expand Down
70 changes: 70 additions & 0 deletions api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dceb4bf

Please sign in to comment.