Merge branch 'add-opt/docker-config' of https://github.com/bharath-12…

…3/kops into add-opt/docker-config
kubernetes · Nov 14, 2020 · b1b3886 · b1b3886
2 parents 9047bfc + 9762825
commit b1b3886
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 0 deletions.
diff --git 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
@@ -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
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go