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

[CONTP-519] Support k8s admin events in operator #1575

Merged
merged 3 commits into from
Dec 18, 2024
+168 −22
Merged

[CONTP-519] Support k8s admin events in operator #1575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88e40cd
Support k8s admin events in operator
gabedos Dec 17, 2024
b786e54
Undo licnese changes
gabedos Dec 17, 2024
d0c213b
Typo fix on expected envvar
gabedos Dec 17, 2024
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
9 changes: 9 additions & 0 deletions api/datadoghq/v2alpha1/datadogagent_default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ const (
defaultAdmissionControllerMutationEnabled bool = true
defaultAdmissionControllerMutateUnlabelled bool = false
defaultAdmissionServiceName string = "datadog-admission-controller"

defaultAdmissionControllerKubernetesAdmissionEventsEnabled bool = false

// DefaultAdmissionControllerCWSInstrumentationEnabled default CWS Instrumentation enabled value
DefaultAdmissionControllerCWSInstrumentationEnabled bool = false
// DefaultAdmissionControllerCWSInstrumentationMode default CWS Instrumentation mode
Expand Down Expand Up @@ -495,6 +498,12 @@ func defaultFeaturesConfig(ddaSpec *DatadogAgentSpec) {
apiutils.DefaultBooleanIfUnset(&agentSidecarInjection.ClusterAgentCommunicationEnabled, defaultAdmissionControllerAgentSidecarClusterAgentEnabled)
}

// K8s Admission Events in AdmissonController Feature
if ddaSpec.Features.AdmissionController.KubernetesAdmissionEvents == nil {
ddaSpec.Features.AdmissionController.KubernetesAdmissionEvents = &KubernetesAdmissionEventsConfig{}
}
apiutils.DefaultBooleanIfUnset(&ddaSpec.Features.AdmissionController.KubernetesAdmissionEvents.Enabled, defaultAdmissionControllerKubernetesAdmissionEventsEnabled)

// CWS Instrumentation in AdmissionController Feature
if ddaSpec.Features.AdmissionController.CWSInstrumentation == nil {
ddaSpec.Features.AdmissionController.CWSInstrumentation = &CWSInstrumentationConfig{}
Expand Down
42 changes: 42 additions & 0 deletions api/datadoghq/v2alpha1/datadogagent_default_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(DefaultAdmissionControllerCWSInstrumentationEnabled),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
PrometheusScrape: &PrometheusScrapeFeatureConfig{
Enabled: apiutils.NewBoolPointer(defaultPrometheusScrapeEnabled),
Expand Down Expand Up @@ -479,6 +482,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(valueFalse),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(valueFalse),
},
},
ExternalMetricsServer: &ExternalMetricsServerFeatureConfig{
Enabled: apiutils.NewBoolPointer(valueFalse),
Expand Down Expand Up @@ -624,6 +630,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(DefaultAdmissionControllerCWSInstrumentationEnabled),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
PrometheusScrape: &PrometheusScrapeFeatureConfig{
Enabled: apiutils.NewBoolPointer(defaultPrometheusScrapeEnabled),
Expand Down Expand Up @@ -765,6 +774,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(DefaultAdmissionControllerCWSInstrumentationEnabled),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
PrometheusScrape: &PrometheusScrapeFeatureConfig{
Enabled: apiutils.NewBoolPointer(defaultPrometheusScrapeEnabled),
Expand Down Expand Up @@ -901,6 +913,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(DefaultAdmissionControllerCWSInstrumentationEnabled),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
PrometheusScrape: &PrometheusScrapeFeatureConfig{
Enabled: apiutils.NewBoolPointer(defaultPrometheusScrapeEnabled),
Expand Down Expand Up @@ -1039,6 +1054,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(DefaultAdmissionControllerCWSInstrumentationEnabled),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
PrometheusScrape: &PrometheusScrapeFeatureConfig{
Enabled: apiutils.NewBoolPointer(defaultPrometheusScrapeEnabled),
Expand Down Expand Up @@ -1182,6 +1200,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(DefaultAdmissionControllerCWSInstrumentationEnabled),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
PrometheusScrape: &PrometheusScrapeFeatureConfig{
Enabled: apiutils.NewBoolPointer(defaultPrometheusScrapeEnabled),
Expand Down Expand Up @@ -1321,6 +1342,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(DefaultAdmissionControllerCWSInstrumentationEnabled),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
PrometheusScrape: &PrometheusScrapeFeatureConfig{
Enabled: apiutils.NewBoolPointer(defaultPrometheusScrapeEnabled),
Expand Down Expand Up @@ -1457,6 +1481,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(DefaultAdmissionControllerCWSInstrumentationEnabled),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
PrometheusScrape: &PrometheusScrapeFeatureConfig{
Enabled: apiutils.NewBoolPointer(defaultPrometheusScrapeEnabled),
Expand All @@ -1483,6 +1510,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(true),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
},
},
Expand Down Expand Up @@ -1605,6 +1635,9 @@ func Test_defaultFeatures(t *testing.T) {
Enabled: apiutils.NewBoolPointer(valueTrue),
Mode: apiutils.NewStringPointer(DefaultAdmissionControllerCWSInstrumentationMode),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
PrometheusScrape: &PrometheusScrapeFeatureConfig{
Enabled: apiutils.NewBoolPointer(defaultPrometheusScrapeEnabled),
Expand Down Expand Up @@ -1742,6 +1775,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(DefaultAdmissionControllerCWSInstrumentationEnabled),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
PrometheusScrape: &PrometheusScrapeFeatureConfig{
Enabled: apiutils.NewBoolPointer(defaultPrometheusScrapeEnabled),
Expand Down Expand Up @@ -1900,6 +1936,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(DefaultAdmissionControllerCWSInstrumentationEnabled),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
PrometheusScrape: &PrometheusScrapeFeatureConfig{
Enabled: apiutils.NewBoolPointer(defaultPrometheusScrapeEnabled),
Expand Down Expand Up @@ -2049,6 +2088,9 @@ func Test_defaultFeatures(t *testing.T) {
CWSInstrumentation: &CWSInstrumentationConfig{
Enabled: apiutils.NewBoolPointer(DefaultAdmissionControllerCWSInstrumentationEnabled),
},
KubernetesAdmissionEvents: &KubernetesAdmissionEventsConfig{
Enabled: apiutils.NewBoolPointer(defaultAdmissionControllerKubernetesAdmissionEventsEnabled),
},
},
PrometheusScrape: &PrometheusScrapeFeatureConfig{
Enabled: apiutils.NewBoolPointer(defaultPrometheusScrapeEnabled),
Expand Down
11 changes: 11 additions & 0 deletions api/datadoghq/v2alpha1/datadogagent_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,10 @@ type AdmissionControllerFeatureConfig struct {
// +optional
Registry *string `json:"registry,omitempty"`

// KubernetesAdmissionEvents holds the Kubernetes Admission Events configuration.
// +optional
KubernetesAdmissionEvents *KubernetesAdmissionEventsConfig `json:"kubernetesAdmissionEvents,omitempty"`

// CWSInstrumentation holds the CWS Instrumentation endpoint configuration
// +optional
CWSInstrumentation *CWSInstrumentationConfig `json:"cwsInstrumentation,omitempty"`
Expand Down Expand Up @@ -809,6 +813,13 @@ type Profile struct {
ResourceRequirements *corev1.ResourceRequirements `json:"resources,omitempty"`
}

type KubernetesAdmissionEventsConfig struct {
// Enable the Kubernetes Admission Events feature.
// Default: false
// +optional
Enabled *bool `json:"enabled,omitempty"`
}

// CWSInstrumentationConfig contains the configuration of the CWS Instrumentation admission controller endpoint.
type CWSInstrumentationConfig struct {
// Enable the CWS Instrumentation admission controller endpoint.
Expand Down
25 changes: 25 additions & 0 deletions api/datadoghq/v2alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

18 changes: 18 additions & 0 deletions config/crd/bases/v1/datadoghq.com_datadogagents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,15 @@ spec:
failurePolicy:
description: FailurePolicy determines how unrecognized and timeout errors are handled.
type: string
kubernetesAdmissionEvents:
description: KubernetesAdmissionEvents holds the Kubernetes Admission Events configuration.
properties:
enabled:
description: |-
Enable the Kubernetes Admission Events feature.
Default: false
type: boolean
type: object
mutateUnlabelled:
description: |-
MutateUnlabelled enables config injection without the need of pod label 'admission.datadoghq.com/enabled="true"'.
Expand Down Expand Up @@ -7170,6 +7179,15 @@ spec:
failurePolicy:
description: FailurePolicy determines how unrecognized and timeout errors are handled.
type: string
kubernetesAdmissionEvents:
description: KubernetesAdmissionEvents holds the Kubernetes Admission Events configuration.
properties:
enabled:
description: |-
Enable the Kubernetes Admission Events feature.
Default: false
type: boolean
type: object
mutateUnlabelled:
description: |-
MutateUnlabelled enables config injection without the need of pod label 'admission.datadoghq.com/enabled="true"'.
Expand Down
22 changes: 22 additions & 0 deletions config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,17 @@
"description": "FailurePolicy determines how unrecognized and timeout errors are handled.",
"type": "string"
},
"kubernetesAdmissionEvents": {
"additionalProperties": false,
"description": "KubernetesAdmissionEvents holds the Kubernetes Admission Events configuration.",
"properties": {
"enabled": {
"description": "Enable the Kubernetes Admission Events feature.\nDefault: false",
"type": "boolean"
}
},
"type": "object"
},
"mutateUnlabelled": {
"description": "MutateUnlabelled enables config injection without the need of pod label 'admission.datadoghq.com/enabled=\"true\"'.\nDefault: false",
"type": "boolean"
Expand Down Expand Up @@ -7103,6 +7114,17 @@
"description": "FailurePolicy determines how unrecognized and timeout errors are handled.",
"type": "string"
},
"kubernetesAdmissionEvents": {
"additionalProperties": false,
"description": "KubernetesAdmissionEvents holds the Kubernetes Admission Events configuration.",
"properties": {
"enabled": {
"description": "Enable the Kubernetes Admission Events feature.\nDefault: false",
"type": "boolean"
}
},
"type": "object"
},
"mutateUnlabelled": {
"description": "MutateUnlabelled enables config injection without the need of pod label 'admission.datadoghq.com/enabled=\"true\"'.\nDefault: false",
"type": "boolean"
Expand Down
1 change: 1 addition & 0 deletions docs/configuration.v2alpha1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ spec:
| features.admissionController.cwsInstrumentation.mode | Defines the behavior of the CWS Instrumentation endpoint, and can be either "init_container" or "remote_copy". Default: "remote_copy" |
| features.admissionController.enabled | Enables the Admission Controller. Default: true |
| features.admissionController.failurePolicy | FailurePolicy determines how unrecognized and timeout errors are handled. |
| features.admissionController.kubernetesAdmissionEvents.enabled | Enable the Kubernetes Admission Events feature. Default: false |
| features.admissionController.mutateUnlabelled | MutateUnlabelled enables config injection without the need of pod label 'admission.datadoghq.com/enabled="true"'. Default: false |
| features.admissionController.mutation.enabled | Enables the Admission Controller mutation webhook. Default: true |
| features.admissionController.registry | Defines an image registry for the admission controller. |
Expand Down
Loading
Loading