github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-23 22:17:19 +00:00
Code Issues Projects Releases Wiki Activity

FC: Remove logger.options

Browse Source 
Firecracker has removed `memory.dirty_pages` metric and `logger.options`
configuration.
Related PR: https://github.com/firecracker-microvm/firecracker/pull/1532.
We need to remove according setting in kata-containers.

Fixes: #2504

Signed-off-by: Penny Zheng <penny.zheng@arm.com>
This commit is contained in:
Penny Zheng 2020-02-28 03:24:10 +00:00
parent 2d89766d3a
commit 37b91b3378
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
virtcontainers/fc.go
View File

@ -612,7 +612,6 @@ func (fc *firecracker) fcSetLogger() error {
Level: &fcLogLevel, Level: &fcLogLevel,
LogFifo: &jailedLogFifo, LogFifo: &jailedLogFifo,
MetricsFifo: &jailedMetricsFifo, MetricsFifo: &jailedMetricsFifo,
Options: []string{},
} }
return err return err

3
virtcontainers/pkg/firecracker/client/models/logger.go
View File

@ -31,9 +31,6 @@ type Logger struct {
// Required: true // Required: true
MetricsFifo *string `json:"metrics_fifo"` MetricsFifo *string `json:"metrics_fifo"`
// Additional logging options. Only "LogDirtyPages" is supported.
Options []string `json:"options"`
// Whether or not to output the level in the logs. // Whether or not to output the level in the logs.
ShowLevel *bool `json:"show_level,omitempty"` ShowLevel *bool `json:"show_level,omitempty"`

8
virtcontainers/pkg/firecracker/firecracker.yaml
View File

@ -5,7 +5,7 @@ info:
The API is accessible through HTTP calls on specific URLs The API is accessible through HTTP calls on specific URLs
carrying JSON modeled data. carrying JSON modeled data.
The transport medium is a Unix Domain Socket. The transport medium is a Unix Domain Socket.
version: 0.19.0 version: 0.21.1
termsOfService: "" termsOfService: ""
contact: contact:
email: "compute-capsule@amazon.com" email: "compute-capsule@amazon.com"
@ -508,12 +508,6 @@ definitions:
type: boolean type: boolean
description: Whether or not to include the file path and line number of the log's origin. description: Whether or not to include the file path and line number of the log's origin.
default: false default: false
options:
type: array
items:
type: string
description: Additional logging options. Only "LogDirtyPages" is supported.
default: []
MachineConfiguration: MachineConfiguration:
type: object type: object