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.

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

Fixreboot #1521

Merged
merged 7 commits into from
Apr 28, 2020
Merged

Fixreboot #1521

merged 7 commits into from
Apr 28, 2020

Conversation

aojea
Copy link
Contributor

@aojea aojea commented Apr 27, 2020

No description provided.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 27, 2020
@k8s-ci-robot k8s-ci-robot requested review from amwat and neolit123 April 27, 2020 11:49
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 27, 2020
if [ -f /kind/old-ip ]; then
old_ip=$(cat /kind/old-ip)
sed -i "s#${old_ip}#${curr_ip}#" /etc/kubernetes/manifests/*.yaml /var/lib/kubelet/kubeadm-flags.env
curr_ipv4="$( (getent ahostsv4 $(hostname) | head -n1 | cut -d' ' -f1) || true)"
Copy link
Contributor Author

@aojea aojea Apr 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tried to put it in an array but is too brittle, this option has more boilerplate code but is more resilient ... the order of the returned address may change depending on the node configuration, or someone can enable ipv6 addresses later on, who knows 🤷

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we depended on this for something other than host reboot I'd be pretty unhappy with how much || true is going on here, but given the context this seems reasonable..

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

guarding against this more in another commit

@aojea
Copy link
Contributor Author

aojea commented Apr 27, 2020

@BenTheElder please take the last commit , it fixes the reboot on ipv6 and in worker nodes

@aojea
Copy link
Contributor Author

aojea commented Apr 27, 2020

I've tested and it worked to me on Linux, IPv6 and multinode, can't test in mac or windows

@BenTheElder
Copy link
Member

xref: #148 #1475

@BenTheElder
Copy link
Member

BenTheElder commented Apr 28, 2020

rebased, dropped the old base bump, added a new base bump

@BenTheElder
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 28, 2020
@BenTheElder
Copy link
Member

/lgtm cancel
/approve cancel
/hold
this needs to be reworked, this is not safe when there is not an IPv6 for one.

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 28, 2020
fi
echo -n "${curr_ip}" >/kind/old-ip
[[ ! -z "${curr_ipv4}" ]] && echo -n "${curr_ipv4}" >/kind/old-ipv4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this form is cute but exits. an if statement does not set the exit code.

@BenTheElder
Copy link
Member

fixing

@BenTheElder
Copy link
Member

pushing a new node image because this change will otherwise break the default :-)

@BenTheElder
Copy link
Member

/lgtm
/approve

@BenTheElder BenTheElder added this to the v0.8.0 milestone Apr 28, 2020
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 28, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aojea, BenTheElder

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 28, 2020
@aojea
Copy link
Contributor Author

aojea commented Apr 28, 2020

Is still on hold , any particular reason?

@BenTheElder
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 28, 2020
@k8s-ci-robot k8s-ci-robot merged commit 4b0ca09 into kubernetes-sigs:master Apr 28, 2020
@aojea aojea deleted the fixreboot branch August 9, 2020 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants