Skip to content

Improve kraken agent logging #411

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
hweawer wants to merge 6 commits into
base: master
Choose a base branch
from
+765 −148
Open

Improve kraken agent logging #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2619b1b
Improve kraken agent logging
hweawer Jul 11, 2025
419a422
Remove puller
hweawer Jul 11, 2025
42cd5ca
Fix errors
hweawer Jul 14, 2025
f4bd0d9
More robust image build process
hweawer Jul 14, 2025
bc60bd2
Debian 12
hweawer Jul 25, 2025
27160b4
Update timeout
hweawer Jul 25, 2025
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
368 changes: 317 additions & 51 deletions agent/agentserver/server.go
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 8 additions & 9 deletions agent/agentserver/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ package agentserver

import (
"bytes"
"context"
"encoding/json"
"errors"
"fmt"
Expand Down Expand Up @@ -232,28 +231,28 @@ func TestReadinessCheckHandler(t *testing.T) {
probeErr: errors.New("test scheduler error"),
buildIndexErr: nil,
trackerErr: nil,
wantErr: "GET http://{address}/readiness 503: agent not ready: test scheduler error",
wantErr: "GET http://{address}/readiness 503: agent not ready: scheduler: test scheduler error",
},
{
desc: "failure (build index not ready)",
probeErr: nil,
buildIndexErr: errors.New("build index not ready"),
trackerErr: nil,
wantErr: "GET http://{address}/readiness 503: agent not ready: build index not ready",
wantErr: "GET http://{address}/readiness 503: agent not ready: build-index: build index not ready",
},
{
desc: "failure (tracker not ready)",
probeErr: nil,
buildIndexErr: nil,
trackerErr: errors.New("tracker not ready"),
wantErr: "GET http://{address}/readiness 503: agent not ready: tracker not ready",
wantErr: "GET http://{address}/readiness 503: agent not ready: tracker: tracker not ready",
},
{
desc: "failure (all conditions fail)",
probeErr: errors.New("test scheduler error"),
buildIndexErr: errors.New("build index not ready"),
trackerErr: errors.New("tracker not ready"),
wantErr: "GET http://{address}/readiness 503: agent not ready: test scheduler error\nbuild index not ready\ntracker not ready",
wantErr: "GET http://{address}/readiness 503: agent not ready: build-index: build index not ready\nscheduler: test scheduler error\ntracker: tracker not ready",
},
} {
t.Run(tc.desc, func(t *testing.T) {
Expand Down Expand Up @@ -356,7 +355,7 @@ func TestReadinessCheckHandlerCache(t *testing.T) {

tc.setupMocks(mocks)

s, addr := mocks.startServer(Config{readinessCacheTTL: tc.readinessCacheTTL})
s, addr := mocks.startServer(Config{ReadinessCacheTTL: tc.readinessCacheTTL})
_, err := httputil.Get(fmt.Sprintf("http://%s/readiness", addr))
if tc.wantFirstCallSuccess {
require.NoError(err)
Expand Down Expand Up @@ -453,7 +452,7 @@ func TestPreloadHandler(t *testing.T) {
url: fmt.Sprintf("/preload/tags/%s", tag),
setup: func(mocks *serverMocks) {
mocks.dockerCli.EXPECT().
PullImage(context.Background(), "repo1", "tag1").Return(nil)
PullImage(gomock.Any(), "repo1", "tag1").Return(nil)
mocks.containerRuntime.EXPECT().
DockerClient().Return(mocks.dockerCli)
},
Expand All @@ -463,7 +462,7 @@ func TestPreloadHandler(t *testing.T) {
url: fmt.Sprintf("/preload/tags/%s?runtime=containerd&namespace=name.space1", tag),
setup: func(mocks *serverMocks) {
mocks.containerdCli.EXPECT().
PullImage(context.Background(), "name.space1", "repo1", "tag1").Return(nil)
PullImage(gomock.Any(), "name.space1", "repo1", "tag1").Return(nil)
mocks.containerRuntime.EXPECT().
ContainerdClient().Return(mocks.containerdCli)
},
Expand All @@ -472,7 +471,7 @@ func TestPreloadHandler(t *testing.T) {
name: "unsupported runtime",
url: fmt.Sprintf("/preload/tags/%s?runtime=crio", tag),
setup: func(_ *serverMocks) {},
expectedError: "/preload/tags/repo1:tag1?runtime=crio 500: unsupported container runtime",
expectedError: "/preload/tags/repo1:tag1?runtime=crio 500: unsupported container runtime: crio",
},
}

Expand Down
Loading
Loading