Skip to content

Fix #6787: report ErrImagePull in the Integration ready condition #6848

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

Open
harshilv17 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix #6787: report ErrImagePull in the Integration ready condition #6848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fa3ff8
Fix #6787: keep the image pull error in the Integration ready condition
harshilv17 Sep 24, 2026
4a6a636
Fix #6787: keep the original check order, only match ErrImagePull
harshilv17 Sep 24, 2026
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
5 changes: 3 additions & 2 deletions pkg/controller/integration/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,9 @@ func arePodsFailingStatuses(integration *v1.Integration, pendingPods []corev1.Po
containers = append(containers, pod.Status.InitContainerStatuses...)
containers = append(containers, pod.Status.ContainerStatuses...)
for _, container := range containers {
// Check the images are pulled
if waiting := container.State.Waiting; waiting != nil && waiting.Reason == "ImagePullBackOff" {
// Check the images are pulled. The kubelet alternates between both reasons while retrying.
if waiting := container.State.Waiting; waiting != nil &&
(waiting.Reason == "ErrImagePull" || waiting.Reason == "ImagePullBackOff") {
integration.Status.Phase = v1.IntegrationPhaseError
integration.SetReadyConditionError(waiting.Message)

Expand Down
34 changes: 34 additions & 0 deletions pkg/controller/integration/monitor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,40 @@ func TestMonitorFailureIntegration(t *testing.T) {
assert.Equal(t, v1.IntegrationConditionInitializationFailedReason, handledIt.Status.GetCondition(v1.IntegrationConditionReady).Reason)
}

func TestMonitorImagePullFailure(t *testing.T) {
pullErr := `failed to pull image "registry/camel-k-kit": no basic auth credentials`

// The kubelet alternates between both reasons while retrying the pull.
for _, reason := range []string{"ImagePullBackOff", "ErrImagePull"} {
t.Run(reason, func(t *testing.T) {
it := &v1.Integration{
ObjectMeta: metav1.ObjectMeta{Namespace: "ns", Name: "my-it"},
Status: v1.IntegrationStatus{Phase: v1.IntegrationPhaseRunning},
}
pod := corev1.Pod{
Status: corev1.PodStatus{
Phase: corev1.PodPending,
ContainerStatuses: []corev1.ContainerStatus{{
Name: "integration",
State: corev1.ContainerState{Waiting: &corev1.ContainerStateWaiting{Reason: reason, Message: pullErr}},
}},
},
}

a := monitorAction{}
err := a.updateIntegrationPhaseAndReadyCondition(context.TODO(),
&deploymentController{obj: &appsv1.Deployment{}, integration: it}, nil, it, []corev1.Pod{pod}, nil)
require.NoError(t, err)
assert.Equal(t, v1.IntegrationPhaseError, it.Status.Phase)
ready := it.Status.GetCondition(v1.IntegrationConditionReady)
require.NotNil(t, ready)
assert.Equal(t, corev1.ConditionFalse, ready.Status)
assert.Equal(t, v1.IntegrationConditionErrorReason, ready.Reason)
assert.Equal(t, pullErr, ready.Message)
})
}
}

func nominalEnvironment() (client.Client, *v1.Integration, error) {
catalog := &v1.CamelCatalog{
TypeMeta: metav1.TypeMeta{
Expand Down