Skip to content

[poc] [Q branch] Remote SSI #2427

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
julesmcrt wants to merge 6 commits into
base: mark.spicer/apm-crds-poc
Choose a base branch
from
+12 −19
Draft

[poc] [Q branch] Remote SSI #2427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
241c2d6
Add RBAC
julesmcrt Dec 22, 2025
6662d6d
Merge branch 'mark.spicer/apm-crds-poc' into jules.macret/Q/demo/apm-ssi
julesmcrt Dec 22, 2025
8589ff6
Attempt 2
julesmcrt Dec 22, 2025
48b995c
Merge branch 'mark.spicer/apm-crds-poc' into jules.macret/Q/demo/apm-ssi
julesmcrt Dec 22, 2025
397c1db
Revert "Attempt 2"
julesmcrt Dec 22, 2025
95e1d9b
Revert "Update rbac"
julesmcrt Dec 22, 2025
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
2 changes: 1 addition & 1 deletion 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.

2 changes: 1 addition & 1 deletion 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 @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
name: datadogagentinternals.datadoghq.com
spec:
group: datadoghq.com
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
name: datadogagentprofiles.datadoghq.com
spec:
group: datadoghq.com
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
name: datadogagents.datadoghq.com
spec:
group: datadoghq.com
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/v1/datadoghq.com_datadogdashboards.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
name: datadogdashboards.datadoghq.com
spec:
group: datadoghq.com
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/v1/datadoghq.com_datadoggenericresources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
name: datadoggenericresources.datadoghq.com
spec:
group: datadoghq.com
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/v1/datadoghq.com_datadogmetrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
name: datadogmetrics.datadoghq.com
spec:
group: datadoghq.com
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/v1/datadoghq.com_datadogmonitors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
name: datadogmonitors.datadoghq.com
spec:
group: datadoghq.com
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/v1/datadoghq.com_datadogpodautoscalers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
name: datadogpodautoscalers.datadoghq.com
spec:
group: datadoghq.com
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/v1/datadoghq.com_datadogslos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
controller-gen.kubebuilder.io/version: v0.17.3
name: datadogslos.datadoghq.com
spec:
group: datadoghq.com
Expand Down
3 changes: 0 additions & 3 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,6 @@ rules:
- apiservices
verbs:
- '*'
- deletecollection
- list
- watch
- apiGroups:
- apps
resources:
Expand Down
8 changes: 2 additions & 6 deletions internal/controller/datadogagent/component/clusteragent/rbac.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func GetDefaultClusterAgentRolePolicyRules(dda metav1.Object) []rbacv1.PolicyRul
rules = append(rules, rbacv1.PolicyRule{
APIGroups: []string{rbac.DatadogAPIGroup},
Resources: []string{rbac.DatadogServiceMonitorsResource},
Verbs: []string{rbac.GetVerb, rbac.ListVerb, rbac.WatchVerb, rbac.CreateVerb, rbac.UpdateVerb, rbac.PatchVerb, rbac.DeleteVerb},
Verbs: []string{rbac.GetVerb, rbac.ListVerb, rbac.WatchVerb},
})
return rules
}
Expand Down Expand Up @@ -98,10 +98,6 @@ func GetDefaultClusterAgentClusterRolePolicyRules(_ metav1.Object) []rbacv1.Poli
rbac.GetVerb,
rbac.ListVerb,
rbac.WatchVerb,
rbac.CreateVerb,
rbac.UpdateVerb,
rbac.PatchVerb,
rbac.DeleteVerb,
},
},
{
Expand Down Expand Up @@ -131,7 +127,7 @@ func GetDefaultClusterAgentClusterRolePolicyRules(_ metav1.Object) []rbacv1.Poli
// DatadogServiceMonitors for APM auto-instrumentation
APIGroups: []string{rbac.DatadogAPIGroup},
Resources: []string{rbac.DatadogServiceMonitorsResource},
Verbs: []string{rbac.GetVerb, rbac.ListVerb, rbac.WatchVerb, rbac.CreateVerb, rbac.UpdateVerb, rbac.PatchVerb, rbac.DeleteVerb},
Verbs: []string{rbac.GetVerb, rbac.ListVerb, rbac.WatchVerb},
},
}
}
Expand Down
Loading