allow custom namespace

commands/netobserv

@@ -15,6 +15,14 @@ if [ -z "${runBackground+x}" ]; then runBackground="false"; fi
 # options such as filters, background etc
 options=""
 
+# namespace for this run
+namespace="netobserv-cli"
+
+if [ -n "$NETOBSERV_NAMESPACE" ]; then
+  echo "using custom namespace $NETOBSERV_NAMESPACE"
+  namespace="$NETOBSERV_NAMESPACE"
+fi
+
 # CLI image to use
 img="quay.io/netobserv/network-observability-cli:main"
 
@@ -129,7 +137,7 @@ fi
 
 echo "Running network-observability-cli get-$command... "
 ${K8S_CLI_BIN} run \
-  -n netobserv-cli \
+  -n $namespace \
   collector \
   --image=$img\
   --image-pull-policy='Always' \
@@ -138,14 +146,14 @@ ${K8S_CLI_BIN} run \
   --command -- $runCommand
 
 ${K8S_CLI_BIN} wait \
-  -n netobserv-cli \
+  -n $namespace \
   --for=condition=Ready pod/collector || exit 1
 
 captureStarted=true
 
 if [ -n "${execCommand}" ]; then
   ${K8S_CLI_BIN} exec -i --tty \
-    -n netobserv-cli \
+    -n $namespace \
     collector \
     -- $execCommand
 else 

res/collector-service.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: collector
-  namespace: netobserv-cli
+  namespace: "{{NAMESPACE}}"
 spec:
   selector:
     run: collector

res/flow-capture.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: netobserv-cli
-  namespace: netobserv-cli
+  namespace: "{{NAMESPACE}}"
   labels:
     app: netobserv-cli
 spec:
@@ -131,7 +131,7 @@ spec:
                       "write":{
                           "type":"grpc",
                           "grpc":{
-                            "targetHost":"collector.netobserv-cli.svc.cluster.local",
+                            "targetHost":"{{TARGET_HOST}}",
                             "targetPort":9999
                           }
                       }

res/namespace.yml

@@ -1,7 +1,7 @@
 kind: Namespace
 apiVersion: v1
 metadata:
-  name: netobserv-cli
+  name: "{{NAME}}"
   labels:
     app: netobserv
     pod-security.kubernetes.io/enforce: privileged

res/packet-capture.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: netobserv-cli
-  namespace: netobserv-cli
+  namespace: "{{NAMESPACE}}"
   labels:
     app: netobserv-cli
 spec:
@@ -115,7 +115,7 @@ spec:
                       "write":{
                           "type":"grpc",
                           "grpc":{
-                            "targetHost":"collector.netobserv-cli.svc.cluster.local",
+                            "targetHost":"{{TARGET_HOST}}",
                             "targetPort":9999
                           }
                       }

res/service-account.yml

@@ -2,13 +2,13 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: netobserv-cli
-  namespace: netobserv-cli
+  namespace: "{{NAMESPACE}}"
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: netobserv-cli
-  namespace: netobserv-cli
+  namespace: "{{NAMESPACE}}"
 rules:
 # allow running in privileged
   - apiGroups:
@@ -53,11 +53,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: netobserv-cli
-  namespace: netobserv-cli
+  namespace: "{{NAMESPACE}}"
 subjects:
   - kind: ServiceAccount
     name: netobserv-cli
-    namespace: netobserv-cli
+    namespace: "{{NAMESPACE}}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

scripts/functions.sh

@@ -21,6 +21,17 @@ skipCleanup=false
 K8S_CLI_BIN_PATH=$(which oc 2>/dev/null || which kubectl 2>/dev/null)
 K8S_CLI_BIN=$(basename "${K8S_CLI_BIN_PATH}")
 
+# namespace for this run
+namespace="netobserv-cli"
+
+if [ -n "$NETOBSERV_NAMESPACE" ]; then
+  echo "using custom namespace $NETOBSERV_NAMESPACE"
+  namespace="$NETOBSERV_NAMESPACE"
+fi
+
+# collector target host
+targetHost="collector.$namespace.svc.cluster.local"
+
 # eBPF agent image to use
 agentImg="quay.io/netobserv/netobserv-ebpf-agent:main"
 
@@ -36,20 +47,24 @@ function loadYAMLs() {
   if [ -f ./res/namespace.yml ]; then
     namespaceYAML="$(cat ./res/namespace.yml)"
   fi
+  namespaceYAML="${namespaceYAML/"{{NAME}}"/${namespace}}"
 
   saYAML='
     saYAMLContent
   '
   if [ -f ./res/service-account.yml ]; then
     saYAML="$(cat ./res/service-account.yml)"
   fi
+  saYAML="${saYAML//"{{NAMESPACE}}"/${namespace}}"
 
   flowAgentYAML='
     flowAgentYAMLContent
   '
   if [ -f ./res/flow-capture.yml ]; then
     flowAgentYAML="$(cat ./res/flow-capture.yml)"
   fi
+  flowAgentYAML="${flowAgentYAML/"{{NAMESPACE}}"/${namespace}}"
+  flowAgentYAML="${flowAgentYAML/"{{TARGET_HOST}}"/${targetHost}}"
   flowAgentYAML="${flowAgentYAML/"{{AGENT_IMAGE_URL}}"/${agentImg}}"
 
   packetAgentYAML='
@@ -58,6 +73,8 @@ function loadYAMLs() {
   if [ -f ./res/packet-capture.yml ]; then
     packetAgentYAML="$(cat ./res/packet-capture.yml)"
   fi
+  packetAgentYAML="${packetAgentYAML/"{{NAMESPACE}}"/${namespace}}"
+  packetAgentYAML="${packetAgentYAML/"{{TARGET_HOST}}"/${targetHost}}"
   packetAgentYAML="${packetAgentYAML/"{{AGENT_IMAGE_URL}}"/${agentImg}}"
 
   collectorServiceYAML='
@@ -66,6 +83,7 @@ function loadYAMLs() {
   if [ -f ./res/collector-service.yml ]; then
     collectorServiceYAML="$(cat ./res/collector-service.yml)"
   fi
+  collectorServiceYAML="${collectorServiceYAML/"{{NAMESPACE}}"/${namespace}}"
 }
 
 function clusterIsReady() {
@@ -83,19 +101,13 @@ function clusterIsReady() {
 
 function namespaceFound() {
   # ensure namespace doesn't exist, else we should not override content
-  if ${K8S_CLI_BIN} get namespace netobserv-cli --ignore-not-found=true | grep -q "netobserv-cli"; then
+  if ${K8S_CLI_BIN} get namespace "$namespace" --ignore-not-found=true | grep -q "$namespace"; then
     return 0
   else
     return 1
   fi
 }
 
-function namespaceFound() {
-  # ensure namespace doesn't exist, else we should not override content
-  found="$(oc get namespace netobserv-cli --ignore-not-found=true | grep -q 'Active')"
-  return "$found"
-}
-
 FLOWS_MANIFEST_FILE="flow-capture.yml"
 PACKETS_MANIFEST_FILE="packet-capture.yml"
 MANIFEST_OUTPUT_PATH="tmp"
@@ -115,7 +127,7 @@ function setup {
   fi
 
   if namespaceFound; then
-    printf "netobserv-cli namespace already exists. Ensure someone else is not running another capture on this cluster. Else use 'oc netobserv cleanup' to remove the namespace first.\n" >&2
+    printf "%s namespace already exists. Ensure someone else is not running another capture on this cluster. Else use 'oc netobserv cleanup' to remove the namespace first.\n" "$namespace" >&2
     skipCleanup="true"
     exit 1
   fi
@@ -124,7 +136,7 @@ function setup {
   loadYAMLs
 
   # apply yamls
-  echo "creating netobserv-cli namespace"
+  echo "creating $namespace namespace"
   echo "$namespaceYAML" | ${K8S_CLI_BIN} apply -f -
 
   echo "creating service account"
@@ -157,28 +169,28 @@ function setup {
 }
 
 function follow {
-  ${K8S_CLI_BIN} logs collector -n netobserv-cli -f
+  ${K8S_CLI_BIN} logs collector -n "$namespace" -f
 }
 
 function copyOutput {
   echo "Copying collector output files..."
   mkdir -p ./output
-  ${K8S_CLI_BIN} cp -n netobserv-cli collector:output ./output
+  ${K8S_CLI_BIN} cp -n "$namespace" collector:output ./output
 }
 
 function deleteDaemonset {
   printf "\nDeleting daemonset... "
-  ${K8S_CLI_BIN} delete daemonset netobserv-cli -n netobserv-cli --ignore-not-found=true
+  ${K8S_CLI_BIN} delete daemonset netobserv-cli -n "$namespace" --ignore-not-found=true
 }
 
 function deletePod {
   printf "\nDeleting pod... "
-  ${K8S_CLI_BIN} delete pod collector -n netobserv-cli --ignore-not-found=true
+  ${K8S_CLI_BIN} delete pod collector -n "$namespace" --ignore-not-found=true
 }
 
 function deleteNamespace {
   printf "\nDeleting namespace... "
-  ${K8S_CLI_BIN} delete namespace netobserv-cli --ignore-not-found=true
+  ${K8S_CLI_BIN} delete namespace "$namespace" --ignore-not-found=true
 }
 
 function cleanup {
@@ -539,6 +551,6 @@ function check_args_and_apply() {
   done
 
   ${K8S_CLI_BIN} apply -f "$2"
-  ${K8S_CLI_BIN} rollout status daemonset netobserv-cli -n netobserv-cli --timeout 60s
+  ${K8S_CLI_BIN} rollout status daemonset netobserv-cli -n "$namespace" --timeout 60s
   rm -rf ${MANIFEST_OUTPUT_PATH}
 }