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

Use sail dep from istio-ecosystem #696

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Conversation

adam-cattermole
Copy link
Member

@adam-cattermole adam-cattermole commented Jun 10, 2024

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 istiomeshv1alpha1 version of the meshConfig; to convert it to the sailv1alpha1 version we serialise to and from json. These types look to have the same (serialised) structure and may be unified to the same type
  • 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

@adam-cattermole adam-cattermole self-assigned this Jun 10, 2024
Copy link

codecov bot commented Jun 10, 2024

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 186 commits behind head on main.

Files with missing lines Patch % Lines
pkg/istio/mesh_config.go 84.84% 1 Missing and 4 partials ⚠️
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%) ⬆️

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%) ⬇️
api/v1beta2 (u) 74.10% <63.82%> (-17.33%) ⬇️
pkg/common (u) 88.13% <ø> (-0.70%) ⬇️
pkg/istio (u) 73.37% <ø> (-0.54%) ⬇️
pkg/log (u) 94.73% <ø> (ø)
pkg/reconcilers (u) ∅ <ø> (∅)
pkg/rlptools (u) 83.64% <ø> (+4.19%) ⬆️
controllers (i) 79.93% <81.24%> (+3.13%) ⬆️
Files with missing lines Coverage Δ
controllers/kuadrant_controller.go 65.61% <100.00%> (+12.04%) ⬆️
controllers/test_common.go 100.00% <100.00%> (ø)
pkg/istio/mesh_config.go 69.54% <84.84%> (+3.82%) ⬆️

... and 41 files with indirect coverage changes

@adam-cattermole
Copy link
Member Author

I've moved the gateway api v1.1 changes out to it's own PR and will rebase this on top #780

@adam-cattermole adam-cattermole changed the base branch from main to gwapi-v1.1 July 24, 2024 12:38
Base automatically changed from gwapi-v1.1 to main July 26, 2024 08:08
@adam-cattermole adam-cattermole force-pushed the update-sail-dep branch 4 times, most recently from ce3e5d0 to 6f156b5 Compare July 30, 2024 14:42
@adam-cattermole
Copy link
Member Author

This is awaiting the release of the sail-operator v0.1 milestone to be able to consume the helm charts.

@adam-cattermole adam-cattermole force-pushed the update-sail-dep branch 2 times, most recently from 6b7944e to 1ace568 Compare August 29, 2024 13:51
Comment on lines 6 to 7
# Supported values v1.22.4|v1.23.0
version: v1.22.4
Copy link
Member Author

@adam-cattermole adam-cattermole Aug 30, 2024

Choose a reason for hiding this comment

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

Worth noting that this release of the sail operator only supports newer versions of Istio than the v1.20.8 that we are on for the istioctl install

Copy link
Member Author

Choose a reason for hiding this comment

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

In fact there seems to be an issue with v1.22.4 on the 0.1.0 release which was not present in the rc. The default profile is missing. This works with v1.23.0 however so I've updated in the latest commit

@adam-cattermole
Copy link
Member Author

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

@adam-cattermole adam-cattermole marked this pull request as ready for review August 30, 2024 13:35
Signed-off-by: Adam Cattermole <acatterm@redhat.com>
Signed-off-by: Adam Cattermole <acatterm@redhat.com>
Add back fail-fast removal

Signed-off-by: Adam Cattermole <acatterm@redhat.com>
Signed-off-by: Adam Cattermole <acatterm@redhat.com>
Signed-off-by: Adam Cattermole <acatterm@redhat.com>
Signed-off-by: Adam Cattermole <acatterm@redhat.com>
@adam-cattermole
Copy link
Member Author

I've updated this to use the v0.1.0 release https://github.com/istio-ecosystem/sail-operator/releases/tag/0.1.0

Signed-off-by: Adam Cattermole <acatterm@redhat.com>
@adam-cattermole adam-cattermole requested a review from a team September 19, 2024 10:05
@adam-cattermole adam-cattermole marked this pull request as draft September 19, 2024 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Ready For Review
Development

Successfully merging this pull request may close these issues.

Installing sail operator without kustomize
1 participant