Merge pull request #433 from rhatdan/v0.33
Revert change to journald as default
OpenShift Merge Robot authored 3 years ago
GitHub committed 3 years ago
| 176 | 176 |
|
| 177 | 177 |
Indicates whether the container engine uses MAC(SELinux) container separation via labeling. This option is ignored on disabled systems.
|
| 178 | 178 |
|
| 179 | |
**log_driver**="journald"
|
|
179 |
**log_driver**="k8s-file"
|
| 180 | 180 |
|
| 181 | 181 |
Logging driver for the container. Available options: `k8s-file` and `journald`.
|
| 182 | 182 |
|
| 25 | 25 |
gomega.Expect(err).To(gomega.BeNil())
|
| 26 | 26 |
gomega.Expect(defaultConfig.Containers.ApparmorProfile).To(gomega.Equal(apparmor.Profile))
|
| 27 | 27 |
gomega.Expect(defaultConfig.Containers.PidsLimit).To(gomega.BeEquivalentTo(2048))
|
| 28 | |
gomega.Expect(defaultConfig.Containers.LogDriver).To(gomega.BeEquivalentTo("journald"))
|
| 29 | 28 |
})
|
| 30 | 29 |
|
| 31 | 30 |
It("should succeed with devices", func() {
|
|
| 46 | 45 |
It("should fail wrong max log size", func() {
|
| 47 | 46 |
// Given
|
| 48 | 47 |
sut.Containers.LogSizeMax = 1
|
| 49 | |
sut.Containers.LogDriver = "k8s-file"
|
| 50 | 48 |
|
| 51 | 49 |
// When
|
| 52 | 50 |
err := sut.Validate()
|
|
| 303 | 301 |
gomega.Expect(err).To(gomega.BeNil())
|
| 304 | 302 |
gomega.Expect(config).ToNot(gomega.BeNil())
|
| 305 | 303 |
gomega.Expect(config.Containers.ApparmorProfile).To(gomega.Equal("overridden-default"))
|
| 306 | |
gomega.Expect(config.Containers.LogDriver).To(gomega.BeEquivalentTo("k8s-file"))
|
| 307 | 304 |
})
|
| 308 | 305 |
|
| 309 | 306 |
It("should fail with invalid value", func() {
|
| 157 | 157 |
|
| 158 | 158 |
# Logging driver for the container. Available options: k8s-file and journald.
|
| 159 | 159 |
#
|
| 160 | |
# log_driver = "journald"
|
|
160 |
# log_driver = "k8s-file"
|
| 161 | 161 |
|
| 162 | 162 |
# Maximum size allowed for the container log file. Negative numbers indicate
|
| 163 | 163 |
# that no size limit is imposed. If positive, it must be >= 8192 to match or
|
| 101 | 101 |
// SystemdCgroupsManager represents systemd native cgroup manager
|
| 102 | 102 |
SystemdCgroupsManager = "systemd"
|
| 103 | 103 |
// DefaultLogDriver is the default type of log files
|
| 104 | |
DefaultLogDriver = "journald"
|
|
104 |
DefaultLogDriver = "k8s-file"
|
| 105 | 105 |
// DefaultLogSizeMax is the default value for the maximum log size
|
| 106 | 106 |
// allowed for a container. Negative values mean that no limit is imposed.
|
| 107 | 107 |
DefaultLogSizeMax = -1
|
| 0 | 0 |
[containers]
|
| 1 | 1 |
|
| 2 | 2 |
apparmor_profile = "overridden-default"
|
| 3 | |
log_driver = "k8s-file"
|
| 0 | 0 |
package version
|
| 1 | 1 |
|
| 2 | 2 |
// Version is the version of the build.
|
| 3 | |
const Version = "0.33.2"
|
|
3 |
const Version = "0.33.3"
|