Fixing PR remarks

(cherry picked from commit 268f2dc) Signed-off-by: meorio <[email protected]>
octarinesec · Oct 23, 2023 · e348ca2 · e348ca2
1 parent e406953
commit e348ca2
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ Versions list: [Releases](https://github.com/octarinesec/octarine-operator/relea
 ### OpenShift Deployment:
 For OpenShift clusters, follow the OpenShift Deployment instructions:
 
-[OpenShift Deployment](docs/OpenshiftDeployment.md)
+[OpenShift Deployment and Uninstall](docs/OpenshiftDeployment.md)
 
 
 * For deploying from the source code, follow the instructions in the [Operator Deployment](docs/OperatorDeployment.md) documentation
@@ -92,7 +92,9 @@ spec:
 ### Uninstalling the Carbon Black Cloud Container Operator
 
 ```sh
-make undeploy
+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 -s -- -u 
 ```
 
 * Notice that the above command will delete the Carbon Black Container custom resources definitions and instances.

diff --git a/docs/LegacyCRD.md b/docs/LegacyCRD.md
diff --git a/docs/Main.md b/docs/Main.md
@@ -34,15 +34,17 @@ Then you need to deploy the CBC Agent on top of the operator:
 
 For OpenShift clusters, follow the OpenShift Deployment instructions:
 
-[OpenShift Deployment](OpenshiftDeployment.md)
+[OpenShift Deployment and Uninstall](OpenshiftDeployment.md)
 
 
 ## Full Uninstall
 
 ### Uninstalling the Carbon Black Cloud Container Operator
 
 ```sh
-make undeploy
+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 -s -- -u 
 ```
 
 * Notice that the above command will delete the Carbon Black Container custom resources definitions and instances.
@@ -54,7 +56,6 @@ make undeploy
 4. [Using HTTP proxy](Proxy.md)
 5. [Configuring image sources](ImageSources.md)
 6. [RBAC Configuration](rbac.md)
-7. [Using legacy v1beta1.CustomResourceDefinition](LegacyCRD.md)
 
 ## Developers Guide
 A developers guide for building and configuring the operator:

diff --git a/docs/OpenshiftDeployment.md b/docs/OpenshiftDeployment.md
@@ -84,3 +84,39 @@ volumes:
 users:
 - system:serviceaccount:cbcontainers-dataplane:cbcontainers-agent-node
 ```
+### Uninstalling on Openshift
+
+Add this SecurityContextConstraints
+before running the operator uninstall command
+
+```yaml
+kind: SecurityContextConstraints
+apiVersion: security.openshift.io/v1
+metadata:
+  name: scc-edr-cleaner
+runAsUser:
+  type: RunAsAny
+allowHostPID: true
+allowHostPorts: false
+allowHostNetwork: true
+allowHostDirVolumePlugin: true
+allowHostIPC: false
+allowPrivilegedContainer: true
+readOnlyRootFilesystem: false
+seLinuxContext:
+  type: RunAsAny
+fsGroup:
+  type: RunAsAny
+supplementalGroups:
+  type: RunAsAny
+volumes:
+- configMap
+- downwardAPI
+- emptyDir
+- hostPath
+- persistentVolumeClaim
+- projected
+- secret
+users:
+- system:serviceaccount:cbcontainers-edr-sensor-cleaners:cbcontainers-edr-sensor-cleaner
+```
diff --git a/docs/OperatorDeployment.md b/docs/OperatorDeployment.md
@@ -5,7 +5,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/docs/developers.md b/docs/developers.md
@@ -34,6 +34,13 @@ spec:
 Change {MY-ADAPTER-NAME} to your control plane adapter name.
 The default value is `containers`
 
+### Uninstalling the Carbon Black Cloud Container Operator
+
+```sh
+make undeploy
+```
+* note that this does not clean-up the Carbon Black directory from the data-plane nodes
+
 ### Changing the security context settings
 
 #### Hardening enforcer/state_reporter security context settings