Skip to content

Commit 989d3cc

Browse files
OCPNODE-3372: Remove omitempty from defaultRuntime as its handled in MCO with additional test cases
1 parent a263347 commit 989d3cc

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

machineconfiguration/v1/tests/containerruntimeconfigs.machineconfiguration.openshift.io/AAA_ungated.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@ tests:
1313
apiVersion: machineconfiguration.openshift.io/v1
1414
kind: ContainerRuntimeConfig
1515
spec:
16-
containerRuntimeConfig:
17-
defaultRuntime: crun
16+
containerRuntimeConfig: {}

machineconfiguration/v1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ type ContainerRuntimeConfiguration struct {
850850
// When set to `crun`, OpenShift will use crun to execute the container
851851
// When omitted, this means no opinion and the platform is left to choose a reasonable default,
852852
// which is subject to change over time. Currently, the default is `crun`.
853-
// +kubebuilder:validation:Enum=crun;runc
853+
// +kubebuilder:validation:Enum=crun;runc;""
854854
// +optional
855855
DefaultRuntime ContainerRuntimeDefaultRuntime `json:"defaultRuntime,omitempty"`
856856
}

0 commit comments

Comments
 (0)