Skip to content

Commit

Permalink
Merge pull request openshift#1656 from QiWang19/resourcequantity
Browse files Browse the repository at this point in the history
OCPBUGS-15934: use *resource.Quantity to not automatically set 0
  • Loading branch information
openshift-merge-bot[bot] authored Nov 15, 2023
2 parents 19181c1 + 7fa9012 commit 27d4f9b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
4 changes: 2 additions & 2 deletions machineconfiguration/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -679,12 +679,12 @@ type ContainerRuntimeConfiguration struct {
// Negative numbers indicate that no size limit is imposed.
// If it is positive, it must be >= 8192 to match/exceed conmon's read buffer.
// +optional
LogSizeMax resource.Quantity `json:"logSizeMax,omitempty"`
LogSizeMax *resource.Quantity `json:"logSizeMax,omitempty"`

// overlaySize specifies the maximum size of a container image.
// This flag can be used to set quota on the size of container images. (default: 10GB)
// +optional
OverlaySize resource.Quantity `json:"overlaySize,omitempty"`
OverlaySize *resource.Quantity `json:"overlaySize,omitempty"`

// defaultRuntime is the name of the OCI runtime to be used as the default.
// +optional
Expand Down
12 changes: 10 additions & 2 deletions machineconfiguration/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 27d4f9b

Please sign in to comment.