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

Jump to bottom

fix(kuma-cp) Envoy config is created based on old Dataplane #1848

Merged
merged 5 commits into from
Apr 21, 2021
Merged

fix(kuma-cp) Envoy config is created based on old Dataplane #1848

merged 5 commits into from
Apr 21, 2021

Conversation

lobkovilya
Copy link
Contributor

@lobkovilya lobkovilya commented Apr 19, 2021 •
edited
Loading

Summary

Comment implied that we have to get Dataplane from a non-cached Store, but in practice, it was taken from a cached store:

// we use non-cached ResourceManager to always fetch fresh version of the Dataplane.
// Otherwise, technically MeshCache can use newer version because it uses List operation instead of Get
if err := p.ResManager.Get(ctx, dataplane, core_store.GetBy(key)); err != nil {
    return nil, err
}

Full changelog

  • pass the second (non-cached) store to the proxy builder
  • refactor e2e checker

Issues resolved

Fix #XXX

Documentation

@lobkovilya
fix(kuma-cp) replace cached store with non-cached
1068699 
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya
fix(kuma-cp) make changes specific to 'resolveDataplane'
0be9aa8 
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya lobkovilya requested a review from a team as a code owner April 19, 2021 07:47
jakubdyszkiewicz
jakubdyszkiewicz approved these changes Apr 20, 2021
View reviewed changes
Copy link
Contributor

@jakubdyszkiewicz jakubdyszkiewicz left a comment

Choose a reason for hiding this comment

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

good catch

test/e2e/healthcheck/healthcheck_hybrid_test.go Outdated
}
return "", nil
},
)
}

checkInstance("echo-universal-1")
checkInstance("echo-universal-2")
checkInstances("echo-universal-1", "echo-universal-2")
Copy link
Contributor

Choose a reason for hiding this comment

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

then lambda is unnecessary I think

@lobkovilya
fix(kuma-cp) get rid of lambda
9771c18 
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya
fix(kuma-cp) increase number of retries
093eb59 
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya
fix(kuma-cp) fix instance version
3ce24b1 
Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
@lobkovilya lobkovilya merged commit 847a42d into master Apr 21, 2021
@lobkovilya lobkovilya deleted the fix/cache-problem branch April 21, 2021 09:39
mergify bot pushed a commit that referenced this pull request Apr 21, 2021
@lobkovilya
fix(kuma-cp) Envoy config is created based on old Dataplane (#1848)
fb6486b 
(cherry picked from commit 847a42d)
@mergify mergify bot mentioned this pull request Apr 21, 2021
Merged
nickolaev pushed a commit that referenced this pull request Apr 21, 2021
@mergify @lobkovilya
fix(kuma-cp) Envoy config is created based on old Dataplane (#1848) (#…
cdff8ae 
…1858)

(cherry picked from commit 847a42d)

Co-authored-by: Ilya Lobkov <ilya.lobkov@konghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakubdyszkiewicz jakubdyszkiewicz jakubdyszkiewicz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lobkovilya @jakubdyszkiewicz