feat: create new ttr for tiertemplate updates #1130
+302
−44
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mfrancisc
requested review from
MatousJobanek,
xcoulon and
alexeykazakov
as code owners
mfrancisc
requested review from
rajivnathan,
ranakan19,
rsoaresd,
fbm3307 and
metlos
as code owners
|
/retest updated e2e |
metlos
reviewed
Jan 29, 2025
Co-authored-by: Lukas Krejci <[email protected]>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1130 +/- ##
==========================================
- Coverage 79.52% 79.41% -0.11%
==========================================
Files 80 81 +1
Lines 8087 8129 +42
==========================================
+ Hits 6431 6456 +25
- Misses 1471 1484 +13
- Partials 185 189 +4
|
MatousJobanek
approved these changes
Feb 5, 2025
Comment on lines
+38
to
+49
| _, inUse := item.Status.Revisions[obj.GetName()] | ||
| if !inUse { | ||
| // this tier doesn't use the template | ||
| continue | ||
| } | ||
| // the tier uses this template | ||
| req = append(req, reconcile.Request{ | ||
| NamespacedName: types.NamespacedName{ | ||
| Namespace: item.Namespace, | ||
| Name: item.Name, | ||
| }, | ||
| }) |
There was a problem hiding this comment.
could be simplified to
Suggested change
| _, inUse := item.Status.Revisions[obj.GetName()] | |
| if !inUse { | |
| // this tier doesn't use the template | |
| continue | |
| } | |
| // the tier uses this template | |
| req = append(req, reconcile.Request{ | |
| NamespacedName: types.NamespacedName{ | |
| Namespace: item.Namespace, | |
| Name: item.Name, | |
| }, | |
| }) | |
| if _, inUse := item.Status.Revisions[obj.GetName()]; inUse { | |
| // the tier uses this template | |
| req = append(req, reconcile.Request{ | |
| NamespacedName: types.NamespacedName{ | |
| Namespace: item.Namespace, | |
| Name: item.Name, | |
| }, | |
| }) | |
| } |
| // given | ||
| // both tiers are without revisions | ||
| base1nsTier := tiertest.Base1nsTier(t, tiertest.CurrentBase1nsTemplates) | ||
| otherTier := tiertest.AppStudioEnvTier(t, tiertest.AppStudioEnvTemplates) |
There was a problem hiding this comment.
btw, the tests don't verify when the NSTemplateTier has revisions, but not the specific TierTemplate:
Suggested change
| otherTier := tiertest.AppStudioEnvTier(t, tiertest.AppStudioEnvTemplates) | |
| otherTier := tiertest.AppStudioEnvTier(t, tiertest.AppStudioEnvTemplates) | |
| prepareTierWithRevisions(otherTier) | |
| delete(otherTier.Status.Revisions, "base1ns-clusterresources-123456new") |
| @@ -338,6 +316,119 @@ func TestReconcile(t *testing.T) { | |||
|
|
|||
| } | |||
|
|
|||
| func TestUpdateNSTemplateTier(t *testing.T) { | |||
| logf.SetLogger(zap.New(zap.UseDevMode(true))) | |||
There was a problem hiding this comment.
out of curiosity - why do we need to configure the logger in the unit test?
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: MatousJobanek, mfrancisc The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR triggers a TTR creation when the tiertemlpate content changes or there is a change in the NSTemplateTier parameters field.
follow up from #1103
Paired with: codeready-toolchain/toolchain-e2e#1102
Jira: https://issues.redhat.com/browse/KUBESAW-257