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

[ACM-16286]: Ensure MCO spec addon options are propagated correctly #1718

Merged
merged 14 commits into from
Dec 16, 2024
Merged

[ACM-16286]: Ensure MCO spec addon options are propagated correctly #1718

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7a32bb2
[ACM-16286]: Ensure MCO spec addon options are propagated correctly
saswatamcode Dec 10, 2024
607bb06
[ACM-16286]: Update all observabilityaddon manifests
saswatamcode Dec 10, 2024
5ed10c5
[ACM-16286]: Ensure hub and spoke obsaddon are synced based on spec
saswatamcode Dec 10, 2024
605534c
[ACM-16286]: Allow customizing ObsAddon in spoke ns
saswatamcode Dec 10, 2024
24423df
[ACM-16286]: Comments
saswatamcode Dec 10, 2024
d62f3c1
Add addon source annotation
saswatamcode Dec 11, 2024
242cfec
Add handling for empty map
saswatamcode Dec 11, 2024
a9665f9
Add handling for nil maps
saswatamcode Dec 11, 2024
1e32f01
Add annotation predicate, update in mco mode
saswatamcode Dec 11, 2024
c9b609e
Fix unit test, make addon annotation constant
saswatamcode Dec 12, 2024
1ac83e4
Update comment
saswatamcode Dec 12, 2024
fe15973
Address comments
saswatamcode Dec 15, 2024
20a306f
Use semantic deepequal, add test for setter
saswatamcode Dec 16, 2024
54401ec
Set spoke addon correctly after comparison
saswatamcode Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions operators/multiclusterobservability/controllers/placementrule/manifestwork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,9 +971,11 @@ func getObservabilityAddon(c client.Client, namespace string,
Namespace: spokeNameSpace,
},
Spec: mcoshared.ObservabilityAddonSpec{
EnableMetrics: mco.Spec.ObservabilityAddonSpec.EnableMetrics,
Interval: mco.Spec.ObservabilityAddonSpec.Interval,
Resources: config.GetOBAResources(mco.Spec.ObservabilityAddonSpec, mco.Spec.InstanceSize),
EnableMetrics: mco.Spec.ObservabilityAddonSpec.EnableMetrics,
Interval: mco.Spec.ObservabilityAddonSpec.Interval,
ScrapeSizeLimitBytes: mco.Spec.ObservabilityAddonSpec.ScrapeSizeLimitBytes,
Workers: mco.Spec.ObservabilityAddonSpec.Workers,
Resources: config.GetOBAResources(mco.Spec.ObservabilityAddonSpec, mco.Spec.InstanceSize),
},
}, nil
}
Expand Down
Loading