Use sail dep from istio-ecosystem
Changes
Update the sail integration to use the new(er) https://github.com/istio-ecosystem/sail-operator repo instead of the maistra 3.0 branch.
- Updated go.mod to pull a newer version and unpin original maistra package
- Update the conversion of the mesh config using the sail type
- It's worth noting that we have been storing the config in the original
istiomeshv1alpha1version of the meshConfig; to convert it to thesailv1alpha1version we serialise to and from json. These types look to have the same (serialised) structure and may be unified to the same type
- It's worth noting that we have been storing the config in the original
- Re-enable the sail integration tests on both PRs and merges to main
- Remove the pinned kustomize install of maistra sail-operator and install the new v0.1.0 using helm
Codecov Report
Attention: Patch coverage is 85.71429% with 5 lines in your changes missing coverage. Please review.
Project coverage is 78.97%. Comparing base (
ece13e8) to head (4d48267). Report is 247 commits behind head on main.
| Files with missing lines | Patch % | Lines |
|---|---|---|
| pkg/istio/mesh_config.go | 84.84% | 1 Missing and 4 partials :warning: |
Additional details and impacted files
@@ Coverage Diff @@
## main #696 +/- ##
==========================================
- Coverage 80.20% 78.97% -1.24%
==========================================
Files 64 80 +16
Lines 4492 6226 +1734
==========================================
+ Hits 3603 4917 +1314
- Misses 600 971 +371
- Partials 289 338 +49
| Flag | Coverage Δ | |
|---|---|---|
| bare-k8s-integration | 4.40% <2.85%> (?) |
|
| controllers-integration | 69.36% <20.00%> (?) |
|
| gatewayapi-integration | 10.71% <5.71%> (?) |
|
| integration | ? |
|
| istio-integration | 55.03% <17.14%> (?) |
|
| unit | 31.12% <82.35%> (+1.09%) |
:arrow_up: |
Flags with carried forward coverage won't be shown. Click here to find out more.
| Components | Coverage Δ | |
|---|---|---|
| api/v1beta1 (u) | 38.46% <0.00%> (-32.97%) |
:arrow_down: |
| api/v1beta2 (u) | 74.10% <63.82%> (-17.33%) |
:arrow_down: |
| pkg/common (u) | 88.13% <ø> (-0.70%) |
:arrow_down: |
| pkg/istio (u) | 73.37% <ø> (-0.54%) |
:arrow_down: |
| pkg/log (u) | 94.73% <ø> (ø) |
|
| pkg/reconcilers (u) | ∅ <ø> (∅) |
|
| pkg/rlptools (u) | 83.64% <ø> (+4.19%) |
:arrow_up: |
| controllers (i) | 79.93% <81.24%> (+3.13%) |
:arrow_up: |
| Files with missing lines | Coverage Δ | |
|---|---|---|
| controllers/kuadrant_controller.go | 65.61% <100.00%> (+12.04%) |
:arrow_up: |
| controllers/test_common.go | 100.00% <100.00%> (ø) |
|
| pkg/istio/mesh_config.go | 69.54% <84.84%> (+3.82%) |
:arrow_up: |
I've moved the gateway api v1.1 changes out to it's own PR and will rebase this on top #780
This is awaiting the release of the sail-operator v0.1 milestone to be able to consume the helm charts.
I think this is ready for review with the caveat that this is moving to a pre-release version of the sail-operator. If we decide to merge before the final release we'll need a follow up to update the version
I've updated this to use the v0.1.0 release https://github.com/istio-ecosystem/sail-operator/releases/tag/0.1.0
As most of the changes here are no longer relevant I'm going to close this and open a new pulling in only the changes to install the sail-operator release and I'll test it on top of the ongoing changes in the sotw work.