1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2025-03-15 04:57:56 +00:00

Merge pull request #248 from marquiz/devel/fixes

Change the sed delimiter in deployment instructions
This commit is contained in:
Kubernetes Prow Robot 2019-05-15 06:04:27 -07:00 committed by GitHub
commit bc3fd5009d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -444,7 +444,7 @@ Nfd-master runs as a DaemonSet, by default in the master node(s) only. You can
use the template spec provided to deploy nfd-master. You only need to update the use the template spec provided to deploy nfd-master. You only need to update the
template to use the correct image: template to use the correct image:
``` ```
sed -E s'/^(\s*)image:.+$/\1image: <YOUR_IMAGE_REPO>:<YOUR_IMAGE_TAG>/' nfd-master.yaml.template > nfd-master.yaml sed -E s',^(\s*)image:.+$,\1image: <YOUR_IMAGE_REPO>:<YOUR_IMAGE_TAG>,' nfd-master.yaml.template > nfd-master.yaml
kubectl create -f nfd-master.yaml kubectl create -f nfd-master.yaml
``` ```
Nfd-master listens for connections from nfd-worker(s) and connects to the Nfd-master listens for connections from nfd-worker(s) and connects to the
@ -463,7 +463,7 @@ example spec that can be used as a template, or, as is when just trying out the
service. Similarly to nfd-master above, you need to update the service. Similarly to nfd-master above, you need to update the
template with the correct image: template with the correct image:
``` ```
sed -E s'/^(\s*)image:.+$/\1image: <YOUR_IMAGE_REPO>:<YOUR_IMAGE_TAG>/' nfd-worker-daemonset.yaml.template > nfd-worker-daemonset.yaml sed -E s',^(\s*)image:.+$,\1image: <YOUR_IMAGE_REPO>:<YOUR_IMAGE_TAG>,' nfd-worker-daemonset.yaml.template > nfd-worker-daemonset.yaml
kubectl create -f nfd-worker-daemonset.yaml kubectl create -f nfd-worker-daemonset.yaml
``` ```
@ -488,7 +488,7 @@ For example, if some node is tainted NoSchedule or fails to start a job for some
You can also run nfd-master and nfd-worker inside a single pod: You can also run nfd-master and nfd-worker inside a single pod:
``` ```
sed -E s'/^(\s*)image:.+$/\1image: <YOUR_IMAGE_REPO>:<YOUR_IMAGE_TAG>/' nfd-daemonset-combined.yaml.template > nfd-daemonset-combined.yaml sed -E s',^(\s*)image:.+$,\1image: <YOUR_IMAGE_REPO>:<YOUR_IMAGE_TAG>,' nfd-daemonset-combined.yaml.template > nfd-daemonset-combined.yaml
kubectl apply -f nfd-daemonset-combined.yaml kubectl apply -f nfd-daemonset-combined.yaml
``` ```
Similar to the nfd-worker setup above, this creates a DaemonSet that schedules Similar to the nfd-worker setup above, this creates a DaemonSet that schedules

View file

@ -14,6 +14,6 @@ NumNodes=$(kubectl get nodes | grep -i ' ready ' | wc -l)
# We set the NODE_NAME environemnt variable to get the Kubernetes node object. # We set the NODE_NAME environemnt variable to get the Kubernetes node object.
sed -E -e "s/COMPLETION_COUNT/$NumNodes/" \ sed -E -e "s/COMPLETION_COUNT/$NumNodes/" \
-e "s/PARALLELISM_COUNT/$NumNodes/" \ -e "s/PARALLELISM_COUNT/$NumNodes/" \
-e "s/^(\s*)image:.+$/\1image: $1/" \ -e "s,^(\s*)image:.+$,\1image: $1," \
nfd-worker-job.yaml.template > nfd-worker-job.yaml nfd-worker-job.yaml.template > nfd-worker-job.yaml
kubectl create -f nfd-worker-job.yaml kubectl create -f nfd-worker-job.yaml