Skip to content

Bug 1794493: add ctrcfg e2e test #1414

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

Merged
openshift-merge-robot merged 4 commits into from
Feb 7, 2020
Merged

Bug 1794493: add ctrcfg e2e test #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
606bd2b
Update and refill templates for CRI-O 1.16
umohnani8 Jan 23, 2020
ea5d1d4
update to cri-o 1.16.2
haircommander Jan 29, 2020
af07f46
ctrcfg: Fix LogSizeMax value check
haircommander Feb 3, 2020
ff58ebb
add crio e2e test
haircommander Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 3 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module github.com/openshift/machine-config-operator
go 1.12

require (
github.com/14rcole/gopopulate v0.0.0-20180821133914-b175b219e774 // indirect
github.com/BurntSushi/toml v0.3.1
github.com/InVisionApp/go-health v2.1.0+incompatible
github.com/Masterminds/goutils v1.1.0 // indirect
Expand All @@ -15,16 +14,13 @@ require (
github.com/ashcrow/osrelease v0.0.0-20180626175927-9b292693c55c
github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6 // indirect
github.com/containers/image v3.0.2+incompatible
github.com/containers/storage v1.13.4
github.com/containers/storage v1.13.5
github.com/coreos/container-linux-config-transpiler v0.9.0
github.com/coreos/ignition v0.33.0
github.com/creack/pty v1.1.9 // indirect
github.com/cri-o/cri-o v1.9.0-beta.2.0.20191003162030-4775e1c05c26
github.com/cri-o/cri-o v1.16.2
github.com/davecgh/go-spew v1.1.1
github.com/docker/docker-credential-helpers v0.6.3 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/elazarl/goproxy v0.0.0-20190911111923-ecfe977594f1 // indirect
github.com/elazarl/goproxy/ext v0.0.0-20190911111923-ecfe977594f1 // indirect
github.com/emicklei/go-restful v2.10.0+incompatible // indirect
github.com/ghodss/yaml v1.0.0
github.com/go-bindata/go-bindata v3.1.1+incompatible
Expand All @@ -33,14 +29,12 @@ require (
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/groupcache v0.0.0-20191002201903-404acd9df4cc // indirect
github.com/golangci/golangci-lint v1.18.0
github.com/google/go-cmp v0.3.1 // indirect
github.com/google/renameio v0.1.0
github.com/googleapis/gnostic v0.3.1 // indirect
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/huandu/xstrings v1.2.0 // indirect
github.com/imdario/mergo v0.3.7
github.com/joho/godotenv v1.3.0
github.com/onsi/ginkgo v1.10.2 // indirect
github.com/opencontainers/go-digest v1.0.0-rc1
github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible
github.com/openshift/client-go v0.0.0-20191001081553-3b0e988f8cb0
Expand All @@ -58,7 +52,7 @@ require (
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3 // indirect
golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed // indirect
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0
gonum.org/v1/gonum v0.0.0-20190929233944-b20cf7805fc4 // indirect
gonum.org/v1/netlib v0.0.0-20190926062253-2d6e29b73a19 // indirect
k8s.io/api v0.17.1
Expand Down
65 changes: 65 additions & 0 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pkg/controller/container-runtime-config/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ type tomlConfigCRIO struct {
Runtime struct{ crioconfig.RuntimeConfig } `toml:"runtime"`
Image struct{ crioconfig.ImageConfig } `toml:"image"`
Network struct{ crioconfig.NetworkConfig } `toml:"network"`
Metrics struct{ crioconfig.MetricsConfig } `toml:"metrics"`
} `toml:"crio"`
}

Expand Down Expand Up @@ -194,7 +195,7 @@ func updateCRIOConfig(data []byte, internal *mcfgv1.ContainerRuntimeConfiguratio
if internal.PidsLimit > 0 {
tomlConf.Crio.Runtime.PidsLimit = internal.PidsLimit
}
if internal.LogSizeMax != (resource.Quantity{}) {
if internal.LogSizeMax.Value() != 0 {
tomlConf.Crio.Runtime.LogSizeMax = internal.LogSizeMax.Value()
}
if internal.LogLevel != "" {
Expand Down
Loading