Skip to content

Commit

Permalink
fix use of custom configmaps and configdata in overrides and features
Browse files Browse the repository at this point in the history
  • Loading branch information
@celenechang
celenechang committed Oct 4, 2022
1 parent cf5242c commit a473d2f
Show file tree
Hide file tree
Showing 37 changed files with 859 additions and 588 deletions.
91 changes: 49 additions & 42 deletions apis/datadoghq/common/const.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ const (
DefaultOrchestratorExplorerConf string = "orchestrator-explorer-config"
// DefaultSystemProbeSocketPath default System Probe socket path
DefaultSystemProbeSocketPath string = "/var/run/sysprobe/sysprobe.sock"
// DefaultCSPMConf default CSPM ConfigMap name
DefaultCSPMConf string = "cspm-config"
// DefaultCWSConf default CWS ConfigMap name
DefaultCWSConf string = "cws-config"

// Liveness probe default config
DefaultLivenessProbeInitialDelaySeconds int32 = 15
Expand Down Expand Up @@ -163,54 +167,57 @@ const (
AgentCustomConfigVolumePath = "/etc/datadog-agent/datadog.yaml"
SystemProbeConfigVolumePath = "/etc/datadog-agent/system-probe.yaml"

LogDatadogVolumeName = "logdatadog"
LogDatadogVolumePath = "/var/log/datadog"
TmpVolumeName = "tmp"
TmpVolumePath = "/tmp"
CertificatesVolumeName = "certificates"
CertificatesVolumePath = "/etc/datadog-agent/certificates"
AuthVolumeName = "datadog-agent-auth"
AuthVolumePath = "/etc/datadog-agent/auth"
InstallInfoVolumeName = "installinfo"
InstallInfoVolumeSubPath = "install_info"
InstallInfoVolumePath = "/etc/datadog-agent/install_info"
InstallInfoVolumeReadOnly = true
PointerVolumeName = "pointerdir"
PointerVolumePath = "/opt/datadog-agent/run"
LogTempStoragePath = "/var/lib/datadog-agent/logs"
PodLogVolumeName = "logpodpath"
PodLogVolumePath = "/var/log/pods"
ContainerLogVolumeName = "logcontainerpath"
ContainerLogVolumePath = "/var/lib/docker/containers"
SymlinkContainerVolumeName = "symlinkcontainerpath"
SymlinkContainerVolumePath = "/var/log/containers"
DogstatsdHostPortName = "dogstatsdport"
DogstatsdHostPortHostPort = 8125
DogstatsdSocketVolumeName = "dsdsocket"
DogstatsdSocketVolumePath = "/var/run/datadog/statsd"
SecurityAgentRuntimeCustomPoliciesVolumeName = "customruntimepolicies"
SecurityAgentRuntimeCustomPoliciesVolumePath = "/etc/datadog-agent-runtime-policies"
SecurityAgentRuntimePoliciesDirVolumeName = "runtimepoliciesdir"
SecurityAgentRuntimePoliciesDirVolumePath = "/etc/datadog-agent/runtime-security.d"
HostCriSocketPathPrefix = "/host"
CriSocketVolumeName = "runtimesocketdir"
RuntimeDirVolumePath = "/var/run"
KubeletAgentCAPath = "/var/run/host-kubelet-ca.crt"
KubeletCAVolumeName = "kubelet-ca"
APMHostPortName = "traceport"
APMHostPortHostPort = 8126
APMSocketVolumeName = "apmsocket"
APMSocketVolumePath = "/var/run/datadog/apm"
AdmissionControllerPortName = "admissioncontrollerport"
OTLPGRPCPortName = "otlpgrpcport"
OTLPHTTPPortName = "otlphttpport"
LogDatadogVolumeName = "logdatadog"
LogDatadogVolumePath = "/var/log/datadog"
TmpVolumeName = "tmp"
TmpVolumePath = "/tmp"
CertificatesVolumeName = "certificates"
CertificatesVolumePath = "/etc/datadog-agent/certificates"
AuthVolumeName = "datadog-agent-auth"
AuthVolumePath = "/etc/datadog-agent/auth"
InstallInfoVolumeName = "installinfo"
InstallInfoVolumeSubPath = "install_info"
InstallInfoVolumePath = "/etc/datadog-agent/install_info"
InstallInfoVolumeReadOnly = true
PointerVolumeName = "pointerdir"
PointerVolumePath = "/opt/datadog-agent/run"
LogTempStoragePath = "/var/lib/datadog-agent/logs"
PodLogVolumeName = "logpodpath"
PodLogVolumePath = "/var/log/pods"
ContainerLogVolumeName = "logcontainerpath"
ContainerLogVolumePath = "/var/lib/docker/containers"
SymlinkContainerVolumeName = "symlinkcontainerpath"
SymlinkContainerVolumePath = "/var/log/containers"
DogstatsdHostPortName = "dogstatsdport"
DogstatsdHostPortHostPort = 8125
DogstatsdSocketVolumeName = "dsdsocket"
DogstatsdSocketVolumePath = "/var/run/datadog/statsd"
SecurityAgentComplianceCustomConfigDirVolumeName = "customcompliancebenchmarks"
SecurityAgentComplianceConfigDirVolumeName = "compliancedir"
SecurityAgentComplianceConfigDirVolumePath = "/etc/datadog-agent/compliance.d"
SecurityAgentRuntimeCustomPoliciesVolumeName = "customruntimepolicies"
SecurityAgentRuntimeCustomPoliciesVolumePath = "/etc/datadog-agent-runtime-policies"
SecurityAgentRuntimePoliciesDirVolumeName = "runtimepoliciesdir"
SecurityAgentRuntimePoliciesDirVolumePath = "/etc/datadog-agent/runtime-security.d"
HostCriSocketPathPrefix = "/host"
CriSocketVolumeName = "runtimesocketdir"
RuntimeDirVolumePath = "/var/run"
KubeletAgentCAPath = "/var/run/host-kubelet-ca.crt"
KubeletCAVolumeName = "kubelet-ca"
APMHostPortName = "traceport"
APMHostPortHostPort = 8126
APMSocketVolumeName = "apmsocket"
APMSocketVolumePath = "/var/run/datadog/apm"
AdmissionControllerPortName = "admissioncontrollerport"
OTLPGRPCPortName = "otlpgrpcport"
OTLPHTTPPortName = "otlphttpport"

AppArmorAnnotationKey = "container.apparmor.security.beta.kubernetes.io"

AgentCustomConfigVolumeName = "custom-datadog-yaml"
AgentCustomConfigVolumeSubPath = "datadog.yaml"

ClusterAgentCustomConfigVolumeName = "custom-datadog-yaml"
ClusterAgentCustomConfigVolumeName = "custom-cluster-agent-yaml"
ClusterAgentCustomConfigVolumePath = "/etc/datadog-agent/datadog-cluster.yaml"
ClusterAgentCustomConfigVolumeSubPath = "datadog-cluster.yaml"
)
Expand Down
3 changes: 3 additions & 0 deletions apis/datadoghq/common/v1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ type KubeletConfig struct {
type AgentContainerName string

const (
// InitVolumeContainerName is the name of the Init Volume init container
InitVolumeContainerName AgentContainerName = "init-volume"

// CoreAgentContainerName is the name of the Core Agent container
CoreAgentContainerName AgentContainerName = "agent"
// TraceAgentContainerName is the name of the Trace Agent container
Expand Down
7 changes: 0 additions & 7 deletions apis/datadoghq/v1alpha1/const.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@ const (
SystemProbeUsrSrcVolumePath = "/usr/src"
OrchestratorExplorerConfigVolumeName = "orchestrator-explorer-config"

SecurityAgentRuntimeCustomPoliciesVolumeName = "customruntimepolicies"
SecurityAgentRuntimePoliciesDirVolumeName = "runtimepoliciesdir"
SecurityAgentRuntimePoliciesDirVolumePath = "/etc/datadog-agent/runtime-security.d"
SecurityAgentComplianceCustomConfigDirVolumeName = "customcompliancebenchmarks"
SecurityAgentComplianceConfigDirVolumeName = "compliancedir"
SecurityAgentComplianceConfigDirVolumePath = "/etc/datadog-agent/compliance.d"

SysteProbeAppArmorAnnotationKey = "container.apparmor.security.beta.kubernetes.io/system-probe"
SysteProbeSeccompAnnotationKey = "container.seccomp.security.alpha.kubernetes.io/system-probe"
SystemProbeOSReleaseDirVolumeName = "host-osrelease"
Expand Down
14 changes: 14 additions & 0 deletions apis/datadoghq/v1alpha1/datadogagent_conversion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,20 @@ func ConvertConfigDirSpec(src *ConfigDirSpec) *v2alpha1.MultiCustomConfig {
}
}

// ConvertConfigDirSpecToCustomConfig converts v1alpha1.ConfigDirSpec to v2alpha1.CustomConfig
func ConvertConfigDirSpecToCustomConfig(src *ConfigDirSpec) *commonv1.CustomConfig {
if src == nil {
return nil
}

return &commonv1.CustomConfig{
ConfigMap: &commonv1.ConfigMapConfig{
Name: src.ConfigMapName,
Items: src.Items,
},
}
}

// Accessors
func getV2GlobalConfig(dst *v2alpha1.DatadogAgent) *v2alpha1.GlobalConfig {
if dst.Spec.Global == nil {
Expand Down
16 changes: 10 additions & 6 deletions apis/datadoghq/v1alpha1/datadogagent_conversion_agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,11 @@ func convertSecurityAgentSpec(src *SecuritySpec, dst *v2alpha1.DatadogAgent) {
features.CSPM.Enabled = src.Compliance.Enabled
features.CSPM.CheckInterval = src.Compliance.CheckInterval
if features.CSPM.CustomBenchmarks != nil {
features.CSPM.CustomBenchmarks = &commonv1.ConfigMapConfig{
Name: src.Compliance.ConfigDir.ConfigMapName,
Items: src.Compliance.ConfigDir.Items,
features.CSPM.CustomBenchmarks = &v2alpha1.CustomConfig{
ConfigMap: &commonv1.ConfigMapConfig{
Name: src.Compliance.ConfigDir.ConfigMapName,
Items: src.Compliance.ConfigDir.Items,
},
}
}

Expand All @@ -427,9 +429,11 @@ func convertSecurityAgentSpec(src *SecuritySpec, dst *v2alpha1.DatadogAgent) {
features.CWS.SyscallMonitorEnabled = src.Runtime.SyscallMonitor.Enabled
}
if features.CWS.CustomPolicies != nil {
features.CWS.CustomPolicies = &commonv1.ConfigMapConfig{
Name: src.Runtime.PoliciesDir.ConfigMapName,
Items: src.Runtime.PoliciesDir.Items,
features.CWS.CustomPolicies = &v2alpha1.CustomConfig{
ConfigMap: &commonv1.ConfigMapConfig{
Name: src.Runtime.PoliciesDir.ConfigMapName,
Items: src.Runtime.PoliciesDir.Items,
},
}
}

Expand Down
8 changes: 4 additions & 4 deletions apis/datadoghq/v2alpha1/datadogagent_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,11 @@ type CSPMFeatureConfig struct {
// +optional
CheckInterval *metav1.Duration `json:"checkInterval,omitempty"`

// ConfigMap contains CSPM benchmarks.
// CustomBenchmarks contains CSPM benchmarks.
// The content of the ConfigMap will be merged with the benchmarks bundled with the agent.
// Any benchmarks with the same name as those existing in the agent will take precedence.
// +optional
CustomBenchmarks *commonv1.ConfigMapConfig `json:"customBenchmarks,omitempty"`
CustomBenchmarks *CustomConfig `json:"customBenchmarks,omitempty"`
}

// CWSFeatureConfig contains CWS (Cloud Workload Security) configuration.
Expand All @@ -241,11 +241,11 @@ type CWSFeatureConfig struct {
// +optional
SyscallMonitorEnabled *bool `json:"syscallMonitorEnabled,omitempty"`

// ConfigMap contains security policies.
// CustomPolicies contains security policies.
// The content of the ConfigMap will be merged with the policies bundled with the agent.
// Any policies with the same name as those existing in the agent will take precedence.
// +optional
CustomPolicies *commonv1.ConfigMapConfig `json:"customPolicies,omitempty"`
CustomPolicies *CustomConfig `json:"customPolicies,omitempty"`
}

// NPMFeatureConfig contains NPM (Network Performance Monitoring) feature configuration.
Expand Down
4 changes: 2 additions & 2 deletions apis/datadoghq/v2alpha1/zz_generated.deepcopy.go
View file

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

Loading

0 comments on commit a473d2f

Please sign in to comment.