Merge pull request #191 from octarinesec/merge-6-0-2

Merge 6 0 2
octarinesec · Oct 19, 2023 · 254c59a · 254c59a
2 parents e32b753 + a409607
commit 254c59a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ The Carbon Black Cloud Container Operator utilizes the operator-framework to cre
 
 | Operator version | Kubernetes Sensor Component Version | Minimum Kubernetes Version |
 |------------------|-------------------------------------|----------------------------|
-| v6.0.x           | 2.10.0, 2.11.0, 2.12.0, 3.0.0       | 1.18                       |
+| v6.0.x           | 2.10.0, 2.11.0, 2.12.0, 3.0.X       | 1.18                       |
 | v5.6.x           | 2.10.0, 2.11.0, 2.12.0              | 1.16                       |
 | v5.5.x           | 2.10.0, 2.11.0                      | 1.16                       |
 
@@ -27,7 +27,7 @@ Kubernetes 1.18+ is supported.
 
 ### From script:
 ```
-export OPERATOR_VERSION=v6.0.1
+export OPERATOR_VERSION=v6.0.2
 export OPERATOR_SCRIPT_URL=https://setup.containers.carbonblack.io/$OPERATOR_VERSION/operator-apply.sh
 curl -s $OPERATOR_SCRIPT_URL | bash
 ```

diff --git a/cbcontainers/state/components/sensor_daemon_set.go b/cbcontainers/state/components/sensor_daemon_set.go
@@ -38,6 +38,7 @@ const (
 	dockerSock                        = "/var/run/docker.sock"
 	crioRuntimeEndpoint               = "/var/run/crio/crio.sock"
 	hostRootPath                      = "/var/opt/root"
+	bootPath                          = "/opt/boot"
 
 	// configuredContainerRuntimeVolumeName is used when the customer has specified a non-standard runtime endpoint in the CRD
 	// as this means we need a special volume+mount for this endpoint
@@ -84,6 +85,7 @@ var (
 	// Optional to have a different mount volume that the host path. If not exits the host path will be used.
 	cndrVolumeMounts = map[string]string{
 		"root": hostRootPath,
+		"boot": bootPath,
 	}
 	cndrReadOnlyMounts = map[string]struct{}{
 		"root":       {},

diff --git a/charts/cbcontainers-agent/cbcontainers-agent-chart/Chart.yaml b/charts/cbcontainers-agent/cbcontainers-agent-chart/Chart.yaml
@@ -3,4 +3,4 @@ name: cbcontainers-agent
 description: A Helm chart for installing the CBContainers Agent
 type: application
 version: 2.0.0
-appVersion: "3.0.1"
+appVersion: "3.0.2"
diff --git a/charts/cbcontainers-operator/cbcontainers-operator-chart/Chart.yaml b/charts/cbcontainers-operator/cbcontainers-operator-chart/Chart.yaml
@@ -3,4 +3,4 @@ name: cbcontainers-operator
 description: A Helm chart for installing the CBContainers operator
 type: application
 version: 2.0.0
-appVersion: v6.0.1
+appVersion: v6.0.2