Enable Dogstatsd UDS in an emptyDir by default (#331)

* Enable Dogstatsd UDS in an emptyDir by default * cleanup some tests * Add missing RBAC for compliance
DataDog · Jul 19, 2021 · 5af66e7 · 5af66e7
1 parent 9dd611c
commit 5af66e7
Show file tree

Hide file tree

Showing 8 changed files with 249 additions and 148 deletions.
diff --git a/Makefile b/Makefile
@@ -90,10 +90,10 @@ docker-push: ## Push the docker image
 
 ##@ Test
 
-test: build manifests verify-license gotest ## Run unit tests and E2E tests
+test: build manifests generate fmt vet verify-license gotest ## Run unit tests and E2E tests
 
 ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
-gotest: manifests generate fmt vet ## Run tests.
+gotest: ## Run tests.
 	source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen

diff --git a/api/v1alpha1/datadogagent_default.go b/api/v1alpha1/datadogagent_default.go
@@ -392,11 +392,10 @@ func DefaultConfigDogstatsd(config *NodeAgentConfig) *DogstatsdConfig {
 }
 
 // DefaultConfigDogstatsdUDS used to default DSDUnixDomainSocketSpec
-// rreturn the defaulted DSDUnixDomainSocketSpec
+// return the defaulted DSDUnixDomainSocketSpec
 func DefaultConfigDogstatsdUDS(dsd *DogstatsdConfig) *DSDUnixDomainSocketSpec {
 	if dsd.UnixDomainSocket == nil {
-		dsd.UnixDomainSocket = &DSDUnixDomainSocketSpec{Enabled: NewBoolPointer(defaultUseDogStatsDSocketVolume)}
-		return dsd.UnixDomainSocket
+		dsd.UnixDomainSocket = &DSDUnixDomainSocketSpec{}
 	}
 
 	udsOverride := &DSDUnixDomainSocketSpec{}
@@ -405,15 +404,12 @@ func DefaultConfigDogstatsdUDS(dsd *DogstatsdConfig) *DSDUnixDomainSocketSpec {
 		udsOverride.Enabled = dsd.UnixDomainSocket.Enabled
 	}
 
-	if !BoolValue(dsd.UnixDomainSocket.Enabled) {
-		return udsOverride
-	}
-
 	if dsd.UnixDomainSocket.HostFilepath == nil {
 		socketPath := path.Join(defaultHostDogstatsdSocketPath, defaultHostDogstatsdSocketName)
 		dsd.UnixDomainSocket.HostFilepath = &socketPath
 		udsOverride.HostFilepath = dsd.UnixDomainSocket.HostFilepath
 	}
+
 	return udsOverride
 }
 

diff --git a/api/v1alpha1/datadogagent_default_test.go b/api/v1alpha1/datadogagent_default_test.go
@@ -31,12 +31,18 @@ func TestDefaultConfigDogstatsd(t *testing.T) {
 			dsd:  NodeAgentConfig{},
 			override: &DogstatsdConfig{
 				DogstatsdOriginDetection: NewBoolPointer(false), // defaultDogstatsdOriginDetection
-				UnixDomainSocket:         &DSDUnixDomainSocketSpec{Enabled: NewBoolPointer(false)},
+				UnixDomainSocket: &DSDUnixDomainSocketSpec{
+					Enabled:      NewBoolPointer(false),
+					HostFilepath: &defaultPath,
+				},
 			},
 			internal: NodeAgentConfig{
 				Dogstatsd: &DogstatsdConfig{
 					DogstatsdOriginDetection: NewBoolPointer(false),
-					UnixDomainSocket:         &DSDUnixDomainSocketSpec{Enabled: NewBoolPointer(false)},
+					UnixDomainSocket: &DSDUnixDomainSocketSpec{
+						Enabled:      NewBoolPointer(false),
+						HostFilepath: &defaultPath,
+					},
 				},
 			},
 		},
@@ -72,14 +78,16 @@ func TestDefaultConfigDogstatsd(t *testing.T) {
 			},
 			override: &DogstatsdConfig{
 				UnixDomainSocket: &DSDUnixDomainSocketSpec{
-					Enabled: NewBoolPointer(false),
+					Enabled:      NewBoolPointer(false),
+					HostFilepath: &defaultPath,
 				},
 			},
 			internal: NodeAgentConfig{
 				Dogstatsd: &DogstatsdConfig{
 					DogstatsdOriginDetection: NewBoolPointer(false),
 					UnixDomainSocket: &DSDUnixDomainSocketSpec{
-						Enabled: NewBoolPointer(false),
+						Enabled:      NewBoolPointer(false),
+						HostFilepath: &defaultPath,
 					},
 				},
 			},
@@ -440,7 +448,10 @@ func TestDefaultDatadogAgentSpecAgent(t *testing.T) {
 					// CriSocket unset as we use latest
 					Dogstatsd: &DogstatsdConfig{
 						DogstatsdOriginDetection: NewBoolPointer(false),
-						UnixDomainSocket:         &DSDUnixDomainSocketSpec{Enabled: NewBoolPointer(false)},
+						UnixDomainSocket: &DSDUnixDomainSocketSpec{
+							Enabled:      NewBoolPointer(false),
+							HostFilepath: NewStringPointer(path.Join(defaultHostDogstatsdSocketPath, defaultHostDogstatsdSocketName)),
+						},
 					},
 				},
 				DeploymentStrategy: &DaemonSetDeploymentStrategy{
@@ -487,7 +498,10 @@ func TestDefaultDatadogAgentSpecAgent(t *testing.T) {
 					HealthPort:           NewInt32Pointer(5555),
 					Dogstatsd: &DogstatsdConfig{
 						DogstatsdOriginDetection: NewBoolPointer(false),
-						UnixDomainSocket:         &DSDUnixDomainSocketSpec{Enabled: NewBoolPointer(false)},
+						UnixDomainSocket: &DSDUnixDomainSocketSpec{
+							Enabled:      NewBoolPointer(false),
+							HostFilepath: NewStringPointer(path.Join(defaultHostDogstatsdSocketPath, defaultHostDogstatsdSocketName)),
+						},
 					},
 				},
 				DeploymentStrategy: &DaemonSetDeploymentStrategy{
@@ -617,7 +631,10 @@ func TestDefaultDatadogAgentSpecAgent(t *testing.T) {
 					},
 					Dogstatsd: &DogstatsdConfig{
 						DogstatsdOriginDetection: NewBoolPointer(false),
-						UnixDomainSocket:         &DSDUnixDomainSocketSpec{Enabled: NewBoolPointer(true), HostFilepath: NewStringPointer("/var/run/datadog/statsd.sock")},
+						UnixDomainSocket: &DSDUnixDomainSocketSpec{
+							Enabled:      NewBoolPointer(true),
+							HostFilepath: NewStringPointer("/var/run/datadog/statsd.sock"),
+						},
 					},
 				},
 				Rbac: &RbacConfig{Create: NewBoolPointer(true)},

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -488,6 +488,14 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - policy
+  resources:
+  - podsecuritypolicies
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - quota.openshift.io
   resources: