Skip to content

Commit

Permalink
Merge pull request #116 from octarinesec/fix-node-agent-not-installed
Browse files Browse the repository at this point in the history
Fix node agent not installed
  • Loading branch information
BenRub authored Aug 3, 2022
2 parents 781e437 + 833ffd6 commit ac2b79a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.17 as builder
FROM golang:1.18 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
8 changes: 4 additions & 4 deletions cbcontainers/state/components/sensor_daemon_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func (obj *SensorDaemonSetK8sObject) mutateContainersList(daemonSet *appsV1.Daem
var runtimeContainer coreV1.Container
var clusterScannerContainer coreV1.Container

templatePodSpec := daemonSet.Spec.Template.Spec
templatePodSpec := &daemonSet.Spec.Template.Spec

desiredContainers := make([]coreV1.Container, 0, 2)
runtimeEnabled := false
Expand Down Expand Up @@ -274,7 +274,7 @@ func (obj *SensorDaemonSetK8sObject) mutateRuntimeContainer(container *coreV1.Co
container.Ports = []coreV1.ContainerPort{{Name: "metrics", ContainerPort: int32(sensorSpec.Prometheus.Port)}}
}
obj.mutateRuntimeEnvVars(container, agentSpec)
obj.mutateSecurityContext(container, agentSpec)
obj.mutateSecurityContext(container)
}

func (obj *SensorDaemonSetK8sObject) mutateRuntimeEnvVars(container *coreV1.Container, agentSpec *cbContainersV1.CBContainersAgentSpec) {
Expand All @@ -298,7 +298,7 @@ func (obj *SensorDaemonSetK8sObject) mutateRuntimeEnvVars(container *coreV1.Cont
commonState.MutateEnvVars(container, envVarBuilder)
}

func (obj *SensorDaemonSetK8sObject) mutateSecurityContext(container *coreV1.Container, agentSpec *cbContainersV1.CBContainersAgentSpec) {
func (obj *SensorDaemonSetK8sObject) mutateSecurityContext(container *coreV1.Container) {
if container.SecurityContext == nil {
container.SecurityContext = &coreV1.SecurityContext{}
}
Expand All @@ -320,7 +320,7 @@ func (obj *SensorDaemonSetK8sObject) mutateClusterScannerContainer(container *co
}
obj.mutateClusterScannerEnvVars(container, agentSpec)
obj.mutateClusterScannerVolumesMounts(container, agentSpec)
obj.mutateSecurityContext(container, agentSpec)
obj.mutateSecurityContext(container)
}

func (obj *SensorDaemonSetK8sObject) mutateClusterScannerEnvVars(container *coreV1.Container, agentSpec *cbContainersV1.CBContainersAgentSpec) {
Expand Down

0 comments on commit ac2b79a

Please sign in to comment.