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 cluster scoped istio CR #391

Merged
merged 3 commits into from
Jan 9, 2024
Merged

fix cluster scoped istio CR #391

merged 3 commits into from
Jan 9, 2024

Conversation

eguzki
Copy link
Contributor

@eguzki eguzki commented Dec 19, 2023

🤷

Copy link

codecov bot commented Dec 19, 2023

Codecov Report

Merging #391 (86e10d9) into main (f3a0b66) will decrease coverage by 0.73%.
The diff coverage is 100.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #391      +/-   ##
==========================================
- Coverage   65.87%   65.14%   -0.73%     
==========================================
  Files          35       35              
  Lines        3795     3796       +1     
==========================================
- Hits         2500     2473      -27     
- Misses       1112     1128      +16     
- Partials      183      195      +12     
Flag Coverage Δ
integration 70.59% <100.00%> (-1.37%) ⬇️
unit 58.90% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
api/v1beta1 (u) ∅ <ø> (∅)
pkg/common (u) 76.92% <ø> (ø)
pkg/istio (u) 37.11% <ø> (ø)
pkg/log (u) 31.81% <ø> (ø)
pkg/reconcilers (u) 33.21% <ø> (ø)
pkg/rlptools (u) 56.46% <ø> (ø)
controllers (i) 70.59% <100.00%> (-1.37%) ⬇️
Files Coverage Δ
controllers/kuadrant_controller.go 51.23% <100.00%> (-0.70%) ⬇️

... and 5 files with indirect coverage changes

@eguzki eguzki closed this Dec 20, 2023
@eguzki eguzki reopened this Dec 20, 2023
@@ -380,6 +381,10 @@ func controlPlaneProviderName() string {
return env.GetString("ISTIOOPERATOR_NAME", "istiocontrolplane")
}

func istioCRName() string {
return env.GetString("ISTIO_NAME", "default")
Copy link
Contributor

Choose a reason for hiding this comment

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

So we need two environment variables, one for specifying the name of the IstioOperator CR and another one for specifying the name of the Istio CR in case the IstioOperator API is not installed?

Copy link
Member

@adam-cattermole adam-cattermole Jan 4, 2024

Choose a reason for hiding this comment

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

I'm investigating this as well as part of #392. It appears that currently the gateway is only reconciled correctly if the Istio CR is named default, in which case the associated configmap ends up being named istio. If the Istio CR is named anything else the configmap ends up being called istio-<istio-cr-name> and (currently in this case) the gateway is not being reconciled correctly.

Copy link
Member

Choose a reason for hiding this comment

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

I've reached out to the sail team and it appears that the istio CR must be named default to process GW API resources (at least for now). This is due to the way upstream istio handles revisions (they are not fully supported yet) and it may change in the future.

Perhaps to avoid confusion for now we could remove the configuration through an environment variable and instead have it always search for default - I'll push a commit for this - I've also checked the docs and there's no mention of the previous name as they rely on the quickstart script or the Makefile which both use this yaml.

@adam-cattermole adam-cattermole marked this pull request as ready for review January 9, 2024 10:30
@adam-cattermole adam-cattermole requested a review from a team as a code owner January 9, 2024 10:30
Copy link
Contributor

@KevFan KevFan left a comment

Choose a reason for hiding this comment

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

Looks good to me 👍

@adam-cattermole adam-cattermole merged commit 94683a2 into main Jan 9, 2024
22 checks passed
@adam-cattermole adam-cattermole deleted the fix-istio branch January 9, 2024 11:18
adam-cattermole added a commit to adam-cattermole/kuadrant-operator that referenced this pull request Jan 30, 2024
alexsnaps pushed a commit that referenced this pull request Jan 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants