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.

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

Jump to bottom

update the crio api to reflect image store #7401

Merged
merged 1 commit into from
Oct 19, 2023
Merged

update the crio api to reflect image store #7401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions internal/criocli/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
fmt.Printf(" %s: %s\n", k, v)
}
fmt.Printf("log path: %s\n", info.LogPath)
fmt.Printf("root: %s\n", info.Root)
fmt.Printf("graph root: %s\n", info.Root)

Check warning on line 108 in internal/criocli/status.go

View check run for this annotation

Codecov / codecov/patch

internal/criocli/status.go#L108 

Added line #L108 was not covered by tests
fmt.Printf("sandbox: %s\n", info.Sandbox)
fmt.Printf("ips: %s\n", strings.Join(info.IPs, ", "))

Expand All @@ -125,7 +125,8 @@

fmt.Printf("cgroup driver: %s\n", info.CgroupDriver)
fmt.Printf("storage driver: %s\n", info.StorageDriver)
fmt.Printf("storage root: %s\n", info.StorageRoot)
fmt.Printf("storage graph root: %s\n", info.StorageRoot)
fmt.Printf("storage image: %s\n", info.StorageImage)

Check warning on line 129 in internal/criocli/status.go

View check run for this annotation

Codecov / codecov/patch

internal/criocli/status.go#L128-L129 

Added lines #L128 - L129 were not covered by tests

fmt.Printf("default GID mappings (format <container>:<host>:<size>):\n")
for _, m := range info.DefaultIDMappings.Gids {
Expand Down
1 change: 1 addition & 0 deletions pkg/types/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ type IDMappings struct {
// CrioInfo stores information about the crio daemon
type CrioInfo struct {
StorageDriver string `json:"storage_driver"`
StorageImage string `json:"storage_image"`
StorageRoot string `json:"storage_root"`
CgroupDriver string `json:"cgroup_driver"`
DefaultIDMappings IDMappings `json:"default_id_mappings"`
Expand Down
1 change: 1 addition & 0 deletions server/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ func (s *Server) getInfo() types.CrioInfo {
return types.CrioInfo{
StorageDriver: s.config.Storage,
StorageRoot: s.config.Root,
StorageImage: s.config.ImageStore,
CgroupDriver: s.config.CgroupManager().Name(),
DefaultIDMappings: s.getIDMappingsInfo(),
}
Expand Down