Skip to content

Commit 8413066

Browse files
Merge pull request openshift#7979 from jlojosnegros/revert-7692
CNF-10170: Revert "bootkube.sh: Render kernel boot arguments for SNO"
2 parents c2420d8 + e5f8742 commit 8413066

File tree

1 file changed

+0
-39
lines changed

1 file changed

+0
-39
lines changed

data/data/bootstrap/files/usr/local/bin/bootkube.sh.template

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -348,45 +348,6 @@ then
348348
record_service_stage_success
349349
fi
350350

351-
if [ "$BOOTSTRAP_INPLACE" = true ] && [ ! -f cmdbootline-nto-bootstrap.done ]; then
352-
record_service_stage_start "cmdbootline-nto-bootstrap"
353-
354-
rm --recursive --force cmdbootline-nto-bootstrap
355-
356-
# Create folders for overlay and podman command to use them
357-
tmpfolder=$(mktemp -d)
358-
echo ${tmpfolder}
359-
podmancmd="bootkube_podman_run --attach=stderr --rm "
360-
for folder in var/lib/tuned/profile-data etc/modprobe.d etc/sysconfig etc/kubernetes etc/sysctl.d etc/systemd run sys lib/modules var/lib/kubelet usr/lib/tuned etc/tuned; do
361-
lowerfolder="/${folder}"
362-
if [ ! -d "$lowerfolder" ]; then
363-
echo "Skipping mounting $lowerfolder"
364-
continue
365-
fi
366-
upperfolder="${tmpfolder}/${folder}/upper"
367-
workfolder="${tmpfolder}/${folder}/work"
368-
mkdir -p ${upperfolder}
369-
mkdir -p ${workfolder}
370-
podmancmd="${podmancmd} -v ${lowerfolder}:/${folder}:O,upperdir=${upperfolder},workdir=${workfolder}"
371-
done
372-
373-
podmancmd="${podmancmd} --volume $PWD:/assets:z --env=CLUSTER_NODE_TUNED_BOOTSTRAP_SAFE_ENV=true --name tuned ${NODE_TUNING_OPERATOR_IMAGE}"
374-
podmancmd="${podmancmd} render-bootcmd-mc --asset-input-dir=/assets/manifests --asset-output-dir=/assets/cmdbootline-nto-bootstrap --mcp-name=master"
375-
376-
# execute podmancmd
377-
$podmancmd
378-
379-
#read machineconfig from --asset-ouput-dir
380-
# Copy over manifests if they were generated by NTO
381-
if [ -n "$(ls -A cmdbootline-nto-bootstrap)" ]; then
382-
cp cmdbootline-nto-bootstrap/* manifests/
383-
fi
384-
385-
rm -rf ${tmpfolder}
386-
touch cmdbootline-nto-bootstrap.done
387-
record_service_stage_success
388-
fi
389-
390351
if [ ! -f mco-bootstrap.done ]
391352
then
392353
record_service_stage_start "mco-bootstrap"

0 commit comments

Comments
 (0)