Merge branch 'main' into develop

octarinesec · Nov 15, 2023 · b194aaa · b194aaa
2 parents 928420f + a03a001
commit b194aaa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/charts/cbcontainers-agent/README.md b/charts/cbcontainers-agent/README.md
@@ -44,7 +44,7 @@ To customize that namespace, see [operator-chart](../cbcontainers-operator).
 The actual namespace where helm tracks the release (see [--namespace flag](https://helm.sh/docs/helm/helm_install/)) is not important to the agent chart, 
 but the recommended approach is to also use the same namespace as the operator chart.
 
-The `agentNamespace` value is only required if the agent chart is responsible for deploying the agent's secret as well. See [secret detection](#secret-creation) for details.
+The `agentNamespace` value is only required if the agent chart is responsible for deploying the agent's secret as well. See [secret creation](#secret-creation) for details.
 If the secret is pre-created before deploying the agent, then `agentNamespace` has no effect.  
 
 ### Secret creation
@@ -83,4 +83,4 @@ Inject this value as part of your pipeline in a secure way!
 
 This means storing the secret as plain text in your `values.yaml` file.
 
-If you prefer to create the `Secret` yourself in an alternative and more secure way, don't set the `companyCode` value and the chart will not create the `Secret` objects.
+If you prefer to create the `Secret` yourself in an alternative and more secure way, don't set the `companyCode` value and the chart will not create the `Secret` objects.
diff --git a/docs/AgentDeployment.md b/docs/AgentDeployment.md
@@ -6,8 +6,8 @@
 kubectl create secret generic cbcontainers-access-token \
 --namespace cbcontainers-dataplane --from-literal=accessToken=\
 {API_Secret_Key}/{API_ID}
+kubectl create secret generic cbcontainers-company-code --namespace cbcontainers-dataplane --from-literal=companyCode=RXXXXXXXXXXG\!XXXX
 ```
-### TODO: extra secret
 ### 2. Apply the Carbon Black Container Agent Custom Resource
 
 The operator implements controllers for the Carbon Black Container custom resources definitions

diff --git a/docs/Main.md b/docs/Main.md
@@ -14,12 +14,8 @@ The Carbon Black Cloud Container Operator utilizes the operator-framework to cre
 
 ## Compatibility Matrix
 
-| Operator version | Kubernetes Sensor Component Version  | Minimum Kubernetes Version |
-|------------------|--------------------------------------|----------------------------|
-| v6.1.x           | 2.10.0, 2.11.0, 2.12.0, 3.0.X, 3.1.X | 1.18                       |
-| v6.0.x           | 2.10.0, 2.11.0, 2.12.0, 3.0.X, 3.1.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                       |
+The updated compatability matrix can be found here:
+[Kubernetes Sensor Operator Compatability Matrix on VMware Docs](https://docs.vmware.com/en/VMware-Carbon-Black-Cloud/services/cbc-k8-sensor-oer/GUID-69F632A4-289F-44C9-9847-25E5A9493BE9.html)
 
 ## Install