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 condition error of ManifestApplied. #273

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 8 additions & 9 deletions pkg/addonmanager/controllers/agentdeploy/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -391,15 +391,6 @@ func (c *addonDeployController) buildDeployManifestWorksFunc(addonWorkBuilder *a
})
return nil, nil, err
}
if len(objects) == 0 {
meta.SetStatusCondition(&addon.Status.Conditions, metav1.Condition{
Type: appliedType,
Status: metav1.ConditionTrue,
Reason: addonapiv1alpha1.AddonManifestAppliedReasonManifestsApplied,
Message: "no manifest need to apply",
})
return nil, nil, nil
}

// this is to retrieve the intended mode of the addon.
var mode string
Expand All @@ -425,6 +416,14 @@ func (c *addonDeployController) buildDeployManifestWorksFunc(addonWorkBuilder *a
})
return nil, nil, err
}
if len(appliedWorks) == 0 {
meta.SetStatusCondition(&addon.Status.Conditions, metav1.Condition{
Type: appliedType,
Status: metav1.ConditionTrue,
Reason: addonapiv1alpha1.AddonManifestAppliedReasonManifestsApplied,
Message: "no manifest need to apply",
})
}
return appliedWorks, deleteWorks, nil
}
}
Expand Down
14 changes: 14 additions & 0 deletions pkg/addonmanager/controllers/agentdeploy/hosted_sync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,20 @@ func TestHostingReconcile(t *testing.T) {
if meta.IsStatusConditionFalse(addOn.Status.Conditions, addonapiv1alpha1.ManagedClusterAddOnHostingManifestApplied) {
t.Errorf("Condition Reason is not correct: %v", addOn.Status.Conditions)
}

manifestAppliyedCondition := meta.FindStatusCondition(addOn.Status.Conditions, addonapiv1alpha1.ManagedClusterAddOnManifestApplied)
if manifestAppliyedCondition == nil {
t.Fatal("manifestapplied condition should not be nil")
}
if manifestAppliyedCondition.Reason != addonapiv1alpha1.AddonManifestAppliedReasonManifestsApplied {
t.Errorf("Condition Reason is not correct: %v", manifestAppliyedCondition.Reason)
}
if manifestAppliyedCondition.Message != "no manifest need to apply" {
t.Errorf("Condition Message is not correct: %v", manifestAppliyedCondition.Message)
}
if manifestAppliyedCondition.Status != metav1.ConditionTrue {
t.Errorf("Condition Status is not correct: %v", manifestAppliyedCondition.Status)
}
},
},
{
Expand Down
14 changes: 14 additions & 0 deletions test/integration/cloudevents/agent_hosting_deploy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,20 @@ var _ = ginkgo.Describe("Agent deploy", func() {
if !meta.IsStatusConditionTrue(addon.Status.Conditions, addonapiv1alpha1.ManagedClusterAddOnHostingManifestApplied) {
return fmt.Errorf("Unexpected addon applied condition, %v", addon.Status.Conditions)
}

manifestAppliyedCondition := meta.FindStatusCondition(addon.Status.Conditions, addonapiv1alpha1.ManagedClusterAddOnManifestApplied)
if manifestAppliyedCondition == nil {
return fmt.Errorf("%s Condition is not found", addonapiv1alpha1.ManagedClusterAddOnManifestApplied)
}
if manifestAppliyedCondition.Reason != addonapiv1alpha1.AddonManifestAppliedReasonManifestsApplied {
return fmt.Errorf("Condition Reason is not correct: %v", manifestAppliyedCondition.Reason)
}
if manifestAppliyedCondition.Message != "no manifest need to apply" {
return fmt.Errorf("Condition Message is not correct: %v", manifestAppliyedCondition.Message)
}
if manifestAppliyedCondition.Status != metav1.ConditionTrue {
return fmt.Errorf("Condition Status is not correct: %v", manifestAppliyedCondition.Status)
}
return nil
}, eventuallyTimeout, eventuallyInterval).ShouldNot(gomega.HaveOccurred())

Expand Down
Loading