From d126ceb507de52acd9f41b434a7c776003b9c632 Mon Sep 17 00:00:00 2001 From: Luis Sergio Carneiro Date: Fri, 26 Jul 2024 11:02:42 -0300 Subject: [PATCH] fix(#5706): removing trait prefix from condition type --- pkg/trait/trait_condition_types.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/trait/trait_condition_types.go b/pkg/trait/trait_condition_types.go index 86abc5ea2d..f1febd59a4 100644 --- a/pkg/trait/trait_condition_types.go +++ b/pkg/trait/trait_condition_types.go @@ -76,15 +76,23 @@ func NewIntegrationConditionPlatformDisabledCatalogMissing() *TraitCondition { } func (tc *TraitCondition) integrationCondition() (v1.IntegrationConditionType, corev1.ConditionStatus, string, string) { - return v1.IntegrationConditionType(fmt.Sprintf("%s%s", tc.traitID, tc.integrationConditionType)), + return v1.IntegrationConditionType(tc.typeForCondition()), tc.conditionStatus, tc.reason, tc.message } func (tc *TraitCondition) integrationKitCondition() (v1.IntegrationKitConditionType, corev1.ConditionStatus, string, string) { - return v1.IntegrationKitConditionType(fmt.Sprintf("%s%s", tc.traitID, tc.integrationConditionType)), + return v1.IntegrationKitConditionType(tc.typeForCondition()), tc.conditionStatus, tc.reason, tc.message } + +func (tc *TraitCondition) typeForCondition() string { + conditionType := string(tc.integrationConditionType) + if conditionType == "TraitInfo" { + conditionType = fmt.Sprintf("%s%s", tc.traitID, tc.integrationConditionType) + } + return conditionType +}