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

v1.7 backports 2020-06-30 #12337

Merged
merged 3 commits into from
Jul 13, 2020
Merged

v1.7 backports 2020-06-30 #12337

merged 3 commits into from
Jul 13, 2020

Conversation

nebril
Copy link
Member

@nebril nebril commented Jun 30, 2020

Once this PR is merged, you can update the PR labels via:

$ for pr in 11231; do contrib/backporting/set-labels.py $pr done 1.7; done

…ync was successful

[ upstream commit e2cd4b7 ]

Cloud APIs can get into a bad state. This could result in the operator
being restarted. If that happens and the Cloud API synchronization then
failed the CiliumNode resource would have its status overwritten. This
is not desirable. Require a sucessful Cloud API sync before updating the
CiliumNode resource.

Fixes: #11052

Signed-off-by: Thomas Graf <thomas@cilium.io>
Signed-off-by: Maciej Kwiek <maciej@isovalent.com>
[ upstream commit 7947ac9 ]

The initial synchronization is blocking but did not return the error so
far. Treat the initial synchronization as critical. If that can't
succeed, restart the operator to indicate the problem.

IP allocation will not succeed anyway.

Signed-off-by: Thomas Graf <thomas@cilium.io>
Signed-off-by: Maciej Kwiek <maciej@isovalent.com>
@nebril nebril requested a review from a team as a code owner June 30, 2020 13:49
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.7 kind/backports This PR provides functionality previously merged into master. labels Jun 30, 2020
@nebril nebril requested a review from tgraf June 30, 2020 13:49
@nebril
Copy link
Member Author

nebril commented Jun 30, 2020

test-backport-1.7

@nebril nebril force-pushed the pr/1.7-backports-30-06.2020 branch from cb9d515 to a5a6460 Compare June 30, 2020 14:00
@nebril
Copy link
Member Author

nebril commented Jun 30, 2020

test-backport-1.7

@nebril
Copy link
Member Author

nebril commented Jun 30, 2020

test-missed-k8s

Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

First two commits look good.

Third commit is a bit less straightforward to trace. I have one question below, would be nice if after your response we have someone else take a look over this PR as well.

pkg/aws/eni/node_manager.go Show resolved Hide resolved
@aanm aanm assigned aanm and nebril and unassigned aanm Jul 1, 2020
…nstable

[ upstream commit b5c5ca9 ]

It is possible for the cloud APIs being used by the operator to get into
a state where POST and PATCH operations are still succeeding while GET
operations are failing. This can result in the operator to continously
creating resources while being unable to ever synchronize the state
successfully. Require a successful synchronization of all resources in
order to continue performing mutating operations.

Signed-off-by: Thomas Graf <thomas@cilium.io>
Signed-off-by: Maciej Kwiek <maciej@isovalent.com>
@nebril nebril force-pushed the pr/1.7-backports-30-06.2020 branch from a5a6460 to 09ed88c Compare July 1, 2020 13:09
@nebril
Copy link
Member Author

nebril commented Jul 1, 2020

test-backport-1.7

@nebril
Copy link
Member Author

nebril commented Jul 1, 2020

test-missed-k8s

@nebril
Copy link
Member Author

nebril commented Jul 1, 2020

@joestringer fixed, but I think it would be good to have @tgraf take a look as original author

@tgraf tgraf merged commit 641615a into v1.7 Jul 13, 2020
@tgraf tgraf deleted the pr/1.7-backports-30-06.2020 branch July 13, 2020 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants