Apply suggestions from code review

Co-authored-by: Richard Su <[email protected]>

Author: andfasano

docs/user/agent/add-nodes.md

@@ -8,8 +8,7 @@
 1. Download the [node-joiner.sh](./node-joiner.sh) script in a working directory in
    the user host (the "assets folder").
 2. Create a `nodes-config.yaml` in the assets folder. This configuration file must contain the 
-   list of all the nodes that the user wants to add to the target cluster. For each node it must be
-   specified at least the name and the primary interface mac address, for example:
+   list of all the nodes that the user wants to add to the target cluster. At minimum, the name and primary interface MAC address must be specified. For example:
 ```
 hosts:
     - hostname: extra-worker-0
@@ -25,7 +24,7 @@ hosts:
         - name: eth0
           macAddress: 00:02:46:e3:9e:9c
 ```
-3. Optionally, it's possible to specify - for each node - an `NMState` configuration block
+3. Optionally, it's possible to specify - for each node - an `NMState` configuration block denoted below as `networkConfig`
    (it will be applied during the first boot), for example:
 ```
 hosts:

docs/user/agent/node-joiner.sh

@@ -4,13 +4,13 @@ set -eu
 
 # Config file
 nodesConfigFile=${1:-"nodes-config.yaml"}
-if [ ! -f $nodesConfigFile ]; then
+if [ ! -f "$nodesConfigFile" ]; then
   echo "Cannot find the config file $nodesConfigFile"
   exit 1
 fi
 
 # Generate a random namespace name
-namespace="openshift-node-joiner-$(cat /dev/urandom | tr -dc 'a-z' | head -c 10)"
+namespace="openshift-node-joiner-$(tr -dc '[:lower:]' < /dev/urandom | head -c 10)"
 
 # Extract the installer image pullspec and release version.
 nodeJoinerPullspec=$(oc get is installer -n openshift -o=jsonpath='{.spec.tags[0].from.name}')
@@ -67,7 +67,7 @@ EOF
 echo "$staticResources" | oc apply -f -
 
 # Generate a configMap to store the user configuration
-oc create configmap nodes-config --from-file=nodes-config.yaml=${nodesConfigFile} -n ${namespace} -o yaml --dry-run=client | oc apply -f -
+oc create configmap nodes-config --from-file=nodes-config.yaml="${nodesConfigFile}" -n "${namespace}" -o yaml --dry-run=client | oc apply -f -
 
 # Runt the node-joiner pod to generate the ISO
 nodeJoinerPod=$(cat <<EOF
@@ -109,20 +109,20 @@ EOF
 echo "$nodeJoinerPod" | oc apply -f -
 
 while true; do 
-  if oc exec node-joiner -n ${namespace} -- test -e /assets/exit_code >/dev/null 2>&1; then
+  if oc exec node-joiner -n "${namespace}" -- test -e /assets/exit_code >/dev/null 2>&1; then
     break
   else 
     echo "Waiting for node-joiner pod to complete..."
     sleep 10s
   fi
 done
 
-res=$(oc exec node-joiner -n ${namespace} -- cat /assets/exit_code)
+res=$(oc exec node-joiner -n "${namespace}" -- cat /assets/exit_code)
 if [ "$res" = 0 ]; then
   echo "node-joiner successfully completed, extracting ISO image..."
-  oc cp -n ${namespace} node-joiner:/assets/agent-addnodes.x86_64.iso agent-addnodes.x86_64.iso
+  oc cp -n "${namespace}" node-joiner:/assets/agent-addnodes.x86_64.iso agent-addnodes.x86_64.iso
 else
-  oc logs node-joiner -n ${namespace}
+  oc logs node-joiner -n "${namespace}"
   echo "node-joiner failed"
 fi
 

pkg/nodejoiner/addnodes.go

@@ -1,6 +1,7 @@
 package nodejoiner
 
 import (
+	"context"
 	"os"
 	"path/filepath"
 
@@ -28,7 +29,7 @@ func NewAddNodesCommand(directory string, kubeConfig string) error {
 	}
 
 	fetcher := store.NewAssetsFetcher(directory)
-	err = fetcher.FetchAndPersist([]asset.WritableAsset{
+	err = fetcher.FetchAndPersist(context.Background(), []asset.WritableAsset{
 		&workflow.AgentWorkflowAddNodes{},
 		&image.AgentImage{},
 	})