diff --git a/pkg/apis/kops/dockerconfig.go b/pkg/apis/kops/dockerconfig.go index e7be718638d5e..f1b678d71526e 100644 --- a/pkg/apis/kops/dockerconfig.go +++ b/pkg/apis/kops/dockerconfig.go @@ -20,6 +20,8 @@ package kops type DockerConfig struct { // AuthorizationPlugins is a list of authorization plugins AuthorizationPlugins []string `json:"authorizationPlugins,omitempty" flag:"authorization-plugin,repeat"` + // AddRuntime registers an additional OCI compatible runtime (default []) + Runtimes []string `json:"addRuntime,omitempty" flag:"add-runtime,repeat"` // Bridge is the network interface containers should bind onto Bridge *string `json:"bridge,omitempty" flag:"bridge"` // BridgeIP is a specific IP address and netmask for the docker0 bridge, using standard CIDR notation diff --git a/pkg/apis/kops/v1alpha2/dockerconfig.go b/pkg/apis/kops/v1alpha2/dockerconfig.go index 4da2e412c4dd5..c89050479197a 100644 --- a/pkg/apis/kops/v1alpha2/dockerconfig.go +++ b/pkg/apis/kops/v1alpha2/dockerconfig.go @@ -20,6 +20,8 @@ package v1alpha2 type DockerConfig struct { // AuthorizationPlugins is a list of authorization plugins AuthorizationPlugins []string `json:"authorizationPlugins,omitempty" flag:"authorization-plugin,repeat"` + // Runtimes registers an additional OCI compatible runtime (default []) + Runtimes []string `json:"addRuntime,omitempty" flag:"add-runtime,repeat"` // Bridge is the network interface containers should bind onto Bridge *string `json:"bridge,omitempty" flag:"bridge"` // BridgeIP is a specific IP address and netmask for the docker0 bridge, using standard CIDR notation diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index be54ebc6739ee..41aa10410678e 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -2708,6 +2708,7 @@ func Convert_kops_DNSSpec_To_v1alpha2_DNSSpec(in *kops.DNSSpec, out *DNSSpec, s func autoConvert_v1alpha2_DockerConfig_To_kops_DockerConfig(in *DockerConfig, out *kops.DockerConfig, s conversion.Scope) error { out.AuthorizationPlugins = in.AuthorizationPlugins + out.Runtimes = in.Runtimes out.Bridge = in.Bridge out.BridgeIP = in.BridgeIP out.DataRoot = in.DataRoot @@ -2746,6 +2747,7 @@ func Convert_v1alpha2_DockerConfig_To_kops_DockerConfig(in *DockerConfig, out *k func autoConvert_kops_DockerConfig_To_v1alpha2_DockerConfig(in *kops.DockerConfig, out *DockerConfig, s conversion.Scope) error { out.AuthorizationPlugins = in.AuthorizationPlugins + out.Runtimes = in.Runtimes out.Bridge = in.Bridge out.BridgeIP = in.BridgeIP out.DataRoot = in.DataRoot diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go index 7818d804596a2..a2e85b76339ca 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go @@ -1085,6 +1085,11 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.Runtimes != nil { + in, out := &in.Runtimes, &out.Runtimes + *out = make([]string, len(*in)) + copy(*out, *in) + } if in.Bridge != nil { in, out := &in.Bridge, &out.Bridge *out = new(string) diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go index 2e6bd12af2920..e8e33426107b6 100644 --- a/pkg/apis/kops/zz_generated.deepcopy.go +++ b/pkg/apis/kops/zz_generated.deepcopy.go @@ -1208,6 +1208,11 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.Runtimes != nil { + in, out := &in.Runtimes, &out.Runtimes + *out = make([]string, len(*in)) + copy(*out, *in) + } if in.Bridge != nil { in, out := &in.Bridge, &out.Bridge *out = new(string)