From 3ce1be2d3b4baf9662511f72224cd5a3d1dd13a2 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Fri, 15 Dec 2017 00:08:29 +0200 Subject: [PATCH] Add strict docker version check option --- apis/management.cattle.io/v3/rke_types.go | 2 ++ ...erated_rancher_kubernetes_engine_config.go | 36 ++++++++++--------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 43b6d78c..5f61d300 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -17,6 +17,8 @@ type RancherKubernetesEngineConfig struct { SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"` // Authorization mode configuration used in the cluster Authorization AuthzConfig `yaml:"authorization" json:"authorization,omitempty"` + // Enable/disable strict docker version checking + StrictDockerVersion bool `yaml:"strict_docker_version" json:"strictDockerVersion"` } type RKEConfigNode struct { diff --git a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go index 8d05fd05..34182ea5 100644 --- a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go +++ b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go @@ -1,24 +1,26 @@ package client const ( - RancherKubernetesEngineConfigType = "rancherKubernetesEngineConfig" - RancherKubernetesEngineConfigFieldAddons = "addons" - RancherKubernetesEngineConfigFieldAuthentication = "authentication" - RancherKubernetesEngineConfigFieldAuthorization = "authorization" - RancherKubernetesEngineConfigFieldNetwork = "network" - RancherKubernetesEngineConfigFieldNodes = "nodes" - RancherKubernetesEngineConfigFieldSSHKeyPath = "sshKeyPath" - RancherKubernetesEngineConfigFieldServices = "services" - RancherKubernetesEngineConfigFieldSystemImages = "systemImages" + RancherKubernetesEngineConfigType = "rancherKubernetesEngineConfig" + RancherKubernetesEngineConfigFieldAddons = "addons" + RancherKubernetesEngineConfigFieldAuthentication = "authentication" + RancherKubernetesEngineConfigFieldAuthorization = "authorization" + RancherKubernetesEngineConfigFieldNetwork = "network" + RancherKubernetesEngineConfigFieldNodes = "nodes" + RancherKubernetesEngineConfigFieldSSHKeyPath = "sshKeyPath" + RancherKubernetesEngineConfigFieldServices = "services" + RancherKubernetesEngineConfigFieldStrictDockerVersion = "strictDockerVersion" + RancherKubernetesEngineConfigFieldSystemImages = "systemImages" ) type RancherKubernetesEngineConfig struct { - Addons string `json:"addons,omitempty"` - Authentication *AuthnConfig `json:"authentication,omitempty"` - Authorization *AuthzConfig `json:"authorization,omitempty"` - Network *NetworkConfig `json:"network,omitempty"` - Nodes []RKEConfigNode `json:"nodes,omitempty"` - SSHKeyPath string `json:"sshKeyPath,omitempty"` - Services *RKEConfigServices `json:"services,omitempty"` - SystemImages map[string]string `json:"systemImages,omitempty"` + Addons string `json:"addons,omitempty"` + Authentication *AuthnConfig `json:"authentication,omitempty"` + Authorization *AuthzConfig `json:"authorization,omitempty"` + Network *NetworkConfig `json:"network,omitempty"` + Nodes []RKEConfigNode `json:"nodes,omitempty"` + SSHKeyPath string `json:"sshKeyPath,omitempty"` + Services *RKEConfigServices `json:"services,omitempty"` + StrictDockerVersion *bool `json:"strictDockerVersion,omitempty"` + SystemImages map[string]string `json:"systemImages,omitempty"` }