Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to openshift-node-config in prep for removing openshift start node #9327

Merged
merged 1 commit into from
Jul 25, 2018
Merged

Switch to openshift-node-config in prep for removing openshift start node #9327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion roles/openshift_node_group/files/sync.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
echo "info: Configuration changed, restarting kubelet" 2>&1
# TODO: kubelet doesn't relabel nodes, best effort for now
# https://github.com/kubernetes/kubernetes/issues/59314
if args="$(openshift start node --write-flags --config /etc/origin/node/node-config.yaml)"; then
if args="$(openshift-node-config --config /etc/origin/node/node-config.yaml)"; then
labels=$(tr ' ' '\n' <<<$args | sed -ne '/^--node-labels=/ { s/^--node-labels=//; p; }' | tr ',\n' ' ')
if [[ -n "${labels}" ]]; then
echo "info: Applying node labels $labels" 2>&1
Expand Down