Skip to content

Commit

Permalink
Merge pull request #9327 from smarterclayton/remove_start
Browse files Browse the repository at this point in the history
Switch to openshift-node-config in prep for removing openshift start node
  • Loading branch information
vrutkovs authored Jul 25, 2018
2 parents db2ca31 + 9b397a3 commit 40a6f80
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion roles/openshift_node_group/files/sync.yaml
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

0 comments on commit 40a6f80

Please sign in to comment.