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

fix(*) remove circular dependency on the Istio submodule #2742

Merged
merged 1 commit into from
Sep 8, 2021
Merged

fix(*) remove circular dependency on the Istio submodule #2742

merged 1 commit into from
Sep 8, 2021

Conversation

jpeach
Copy link
Contributor

@jpeach jpeach commented Sep 7, 2021

Summary

The Istio submodule imports Kuma config definitions, and Kuma calls
functions from the Istio submodule. Break the circular dependency by
moving the config definitions into the Istio submodule, even though
they more properly belong in Kuma itself.

This makes it possible to run go mod tidy in the Istio submodule.

Full changelog

N/A

Issues resolved

Fix #2087.

Documentation

N/A

Testing

  • Unit tests
  • E2E tests
  • Manual testing on Universal
  • Manual testing on Kubernetes

Backwards compatibility

  • Add backport-to-stable label if the code is backwards compatible. Otherwise, list breaking changes.

@jpeach jpeach requested a review from a team as a code owner September 7, 2021 08:53
@jpeach
Copy link
Contributor Author

jpeach commented Sep 7, 2021

Looks like go mod tidy changed the version of Istio that we import. I didn't verify exactly what it did yet.

The Istio submodule imports Kuma config definitions, and Kuma calls
functions from the Istio submodule. Break the circular dependency by
moving the config definitions into the Istio submodule, even though
they more properly belong in Kuma itself.

This makes it possible to run `go mod tidy` in the Istio submodule.

This fixes #2087.

Signed-off-by: James Peach <james.peach@konghq.com>
@jpeach
Copy link
Contributor Author

jpeach commented Sep 7, 2021

Looks like go mod tidy changed the version of Istio that we import. I didn't verify exactly what it did yet.

I see, this is just a dependency on istio.io/pkg, since toe tooling narrowed the set of packages we depend on.

@codecov-commenter
Copy link

Codecov Report

Merging #2742 (eaebb0b) into master (56881c1) will increase coverage by 0.03%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2742      +/-   ##
==========================================
+ Coverage   51.75%   51.78%   +0.03%     
==========================================
  Files         869      869              
  Lines       50649    50649              
==========================================
+ Hits        26211    26228      +17     
+ Misses      22351    22324      -27     
- Partials     2087     2097      +10     
Impacted Files Coverage Δ
pkg/transparentproxy/istio/istio.go 90.90% <100.00%> (ø)
app/kumactl/cmd/root.go 70.17% <0.00%> (-3.51%) ⬇️
pkg/xds/generator/direct_access_proxy_generator.go 83.90% <0.00%> (+1.14%) ⬆️
pkg/core/resources/model/rest/resource.go 69.23% <0.00%> (+1.28%) ⬆️
pkg/insights/resyncer.go 65.67% <0.00%> (+1.49%) ⬆️
pkg/core/resources/manager/cache.go 81.81% <0.00%> (+2.59%) ⬆️
pkg/events/eventbus.go 92.59% <0.00%> (+7.40%) ⬆️
pkg/core/bootstrap/autoconfig.go 54.46% <0.00%> (+8.03%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 56881c1...eaebb0b. Read the comment docs.

@jpeach jpeach merged commit 6f2b621 into kumahq:master Sep 8, 2021
mergify bot pushed a commit that referenced this pull request Sep 8, 2021
The Istio submodule imports Kuma config definitions, and Kuma calls
functions from the Istio submodule. Break the circular dependency by
moving the config definitions into the Istio submodule, even though
they more properly belong in Kuma itself.

This makes it possible to run `go mod tidy` in the Istio submodule.

This fixes #2087.

Signed-off-by: James Peach <james.peach@konghq.com>
(cherry picked from commit 6f2b621)
@jpeach jpeach deleted the chore/istio-circular-dependency branch September 8, 2021 08:27
nikita15p pushed a commit to nikita15p/kuma that referenced this pull request Sep 28, 2021
The Istio submodule imports Kuma config definitions, and Kuma calls
functions from the Istio submodule. Break the circular dependency by
moving the config definitions into the Istio submodule, even though
they more properly belong in Kuma itself.

This makes it possible to run `go mod tidy` in the Istio submodule.

This fixes kumahq#2087.

Signed-off-by: James Peach <james.peach@konghq.com>
nikita15p pushed a commit to nikita15p/kuma that referenced this pull request Sep 28, 2021
The Istio submodule imports Kuma config definitions, and Kuma calls
functions from the Istio submodule. Break the circular dependency by
moving the config definitions into the Istio submodule, even though
they more properly belong in Kuma itself.

This makes it possible to run `go mod tidy` in the Istio submodule.

This fixes kumahq#2087.

Signed-off-by: James Peach <james.peach@konghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Circular dependency in the Istio plugin module
3 participants