Skip to content

[OTAGENT-308] Add RBAC Support for the k8sattributes OTel processor #1963

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[OTAGENT-308] Add RBAC Support for the k8sattributes OTel processor #1963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 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 @@ -810,6 +810,12 @@ type OtelCollectorFeatureConfig struct {
// +listType=atomic
Ports []*corev1.ContainerPort `json:"ports,omitempty"`

// Set CreateRbac to false to prevent automatic creation of ClusterRole for the otelCollector.
// If true, check OTel Collector config for k8sattributes processor and create required ClusterRole to access Kubernetes API
// Default: true
// +optional
CreateRbac *bool `json:"createRbac,omitempty"`

// OTelCollector Config Relevant to the Core agent
// +optional
CoreConfig *CoreConfig `json:"coreConfig,omitempty"`
Expand Down
5 changes: 5 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.

7 changes: 7 additions & 0 deletions api/datadoghq/v2alpha1/zz_generated.openapi.go
View file
Open in desktop

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

12 changes: 12 additions & 0 deletions config/crd/bases/v1/datadoghq.com_datadogagentinternals.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1814,6 +1814,12 @@ spec:
the core agent.
type: string
type: object
createRbac:
description: |-
Set CreateRbac to false to prevent automatic creation of ClusterRole for the otelCollector.
If true, check OTel Collector config for k8sattributes processor and create required ClusterRole to access Kubernetes API
Default: true
type: boolean
enabled:
description: |-
Enabled enables the OTel Agent.
Expand Down Expand Up @@ -9214,6 +9220,12 @@ spec:
the core agent.
type: string
type: object
createRbac:
description: |-
Set CreateRbac to false to prevent automatic creation of ClusterRole for the otelCollector.
If true, check OTel Collector config for k8sattributes processor and create required ClusterRole to access Kubernetes API
Default: true
type: boolean
enabled:
description: |-
Enabled enables the OTel Agent.
Expand Down
8 changes: 8 additions & 0 deletions config/crd/bases/v1/datadoghq.com_datadogagentinternals_v1alpha1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1852,6 +1852,10 @@
},
"type": "object"
},
"createRbac": {
"description": "Set CreateRbac to false to prevent automatic creation of ClusterRole for the otelCollector.\nIf true, check OTel Collector config for k8sattributes processor and create required ClusterRole to access Kubernetes API\nDefault: true",
"type": "boolean"
},
"enabled": {
"description": "Enabled enables the OTel Agent.\nDefault: false",
"type": "boolean"
Expand Down Expand Up @@ -9095,6 +9099,10 @@
},
"type": "object"
},
"createRbac": {
"description": "Set CreateRbac to false to prevent automatic creation of ClusterRole for the otelCollector.\nIf true, check OTel Collector config for k8sattributes processor and create required ClusterRole to access Kubernetes API\nDefault: true",
"type": "boolean"
},
"enabled": {
"description": "Enabled enables the OTel Agent.\nDefault: false",
"type": "boolean"
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/v1/datadoghq.com_datadogagentprofiles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1814,6 +1814,12 @@ spec:
the core agent.
type: string
type: object
createRbac:
description: |-
Set CreateRbac to false to prevent automatic creation of ClusterRole for the otelCollector.
If true, check OTel Collector config for k8sattributes processor and create required ClusterRole to access Kubernetes API
Default: true
type: boolean
enabled:
description: |-
Enabled enables the OTel Agent.
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/v1/datadoghq.com_datadogagentprofiles_v1alpha1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1856,6 +1856,10 @@
},
"type": "object"
},
"createRbac": {
"description": "Set CreateRbac to false to prevent automatic creation of ClusterRole for the otelCollector.\nIf true, check OTel Collector config for k8sattributes processor and create required ClusterRole to access Kubernetes API\nDefault: true",
"type": "boolean"
},
"enabled": {
"description": "Enabled enables the OTel Agent.\nDefault: false",
"type": "boolean"
Expand Down
12 changes: 12 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 @@ -1814,6 +1814,12 @@ spec:
the core agent.
type: string
type: object
createRbac:
description: |-
Set CreateRbac to false to prevent automatic creation of ClusterRole for the otelCollector.
If true, check OTel Collector config for k8sattributes processor and create required ClusterRole to access Kubernetes API
Default: true
type: boolean
enabled:
description: |-
Enabled enables the OTel Agent.
Expand Down Expand Up @@ -9264,6 +9270,12 @@ spec:
the core agent.
type: string
type: object
createRbac:
description: |-
Set CreateRbac to false to prevent automatic creation of ClusterRole for the otelCollector.
If true, check OTel Collector config for k8sattributes processor and create required ClusterRole to access Kubernetes API
Default: true
type: boolean
enabled:
description: |-
Enabled enables the OTel Agent.
Expand Down
8 changes: 8 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 @@ -1852,6 +1852,10 @@
},
"type": "object"
},
"createRbac": {
"description": "Set CreateRbac to false to prevent automatic creation of ClusterRole for the otelCollector.\nIf true, check OTel Collector config for k8sattributes processor and create required ClusterRole to access Kubernetes API\nDefault: true",
"type": "boolean"
},
"enabled": {
"description": "Enabled enables the OTel Agent.\nDefault: false",
"type": "boolean"
Expand Down Expand Up @@ -9160,6 +9164,10 @@
},
"type": "object"
},
"createRbac": {
"description": "Set CreateRbac to false to prevent automatic creation of ClusterRole for the otelCollector.\nIf true, check OTel Collector config for k8sattributes processor and create required ClusterRole to access Kubernetes API\nDefault: true",
"type": "boolean"
},
"enabled": {
"description": "Enabled enables the OTel Agent.\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 @@ -153,6 +153,7 @@ spec:
| features.otelCollector.coreConfig.enabled | Marks otelcollector as enabled in core agent. |
| features.otelCollector.coreConfig.extensionTimeout | Extension URL provides the timout of the ddflareextension to the core agent. |
| features.otelCollector.coreConfig.extensionURL | Extension URL provides the URL of the ddflareextension to the core agent. |
| features.otelCollector.createRbac | Set CreateRbac to false to prevent automatic creation of ClusterRole for the otelCollector. If true, check OTel Collector config for k8sattributes processor and create required ClusterRole to access Kubernetes API Default: true |
| features.otelCollector.enabled | Enables the OTel Agent. Default: false |
| features.otelCollector.ports | Contains the ports for the otel-agent. Defaults: otel-grpc:4317 / otel-http:4318. Note: setting 4317 or 4318 manually is *only* supported if name match default names (otel-grpc, otel-http). If not, this will lead to a port conflict. This limitation will be lifted once annotations support is removed. |
| features.otlp.receiver.protocols.grpc.enabled | Enable the OTLP/gRPC endpoint. Host port is enabled by default and can be disabled. |
Expand Down
2 changes: 2 additions & 0 deletions internal/controller/datadogagent/defaults/datadogagent_default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const (
defaultLogContainerSymlinksPath string = "/var/log/containers"

defaultOtelCollectorEnabled bool = false
defaultOtelCollectorCreateRBAC bool = true
defaultLiveProcessCollectionEnabled bool = false
defaultLiveContainerCollectionEnabled bool = true
defaultProcessDiscoveryEnabled bool = true
Expand Down Expand Up @@ -246,6 +247,7 @@ func defaultFeaturesConfig(ddaSpec *v2alpha1.DatadogAgentSpec) {
ddaSpec.Features.OtelCollector = &v2alpha1.OtelCollectorFeatureConfig{}
}
apiutils.DefaultBooleanIfUnset(&ddaSpec.Features.OtelCollector.Enabled, defaultOtelCollectorEnabled)
apiutils.DefaultBooleanIfUnset(&ddaSpec.Features.OtelCollector.CreateRbac, defaultOtelCollectorCreateRBAC)

// LiveProcessCollection Feature
if ddaSpec.Features.LiveProcessCollection == nil {
Expand Down
Loading
Loading