From 524fe0feae8b59d9487b3fc25e908c7fbd97b32f Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Mon, 22 Jan 2018 20:49:47 +0200 Subject: [PATCH] Revert back to IgnoreDockerVersion --- apis/management.cattle.io/v3/rke_types.go | 2 +- ...erated_rancher_kubernetes_engine_config.go | 38 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 5667c4ae..92adc20f 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -18,7 +18,7 @@ type RancherKubernetesEngineConfig struct { // Authorization mode configuration used in the cluster Authorization AuthzConfig `yaml:"authorization" json:"authorization,omitempty"` // Enable/disable strict docker version checking - EnforceDockerVersion bool `yaml:"enforce_docker_version" json:"enforceDockerVersion"` + IgnoreDockerVersion bool `yaml:"ignore_docker_version" json:"ignoreDockerVersion"` } 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 566b5b1b..376928bb 100644 --- a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go +++ b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go @@ -1,26 +1,26 @@ package client const ( - RancherKubernetesEngineConfigType = "rancherKubernetesEngineConfig" - RancherKubernetesEngineConfigFieldAddons = "addons" - RancherKubernetesEngineConfigFieldAuthentication = "authentication" - RancherKubernetesEngineConfigFieldAuthorization = "authorization" - RancherKubernetesEngineConfigFieldEnforceDockerVersion = "enforceDockerVersion" - RancherKubernetesEngineConfigFieldNetwork = "network" - RancherKubernetesEngineConfigFieldNodes = "nodes" - RancherKubernetesEngineConfigFieldSSHKeyPath = "sshKeyPath" - RancherKubernetesEngineConfigFieldServices = "services" - RancherKubernetesEngineConfigFieldSystemImages = "systemImages" + RancherKubernetesEngineConfigType = "rancherKubernetesEngineConfig" + RancherKubernetesEngineConfigFieldAddons = "addons" + RancherKubernetesEngineConfigFieldAuthentication = "authentication" + RancherKubernetesEngineConfigFieldAuthorization = "authorization" + RancherKubernetesEngineConfigFieldIgnoreDockerVersion = "ignoreDockerVersion" + RancherKubernetesEngineConfigFieldNetwork = "network" + RancherKubernetesEngineConfigFieldNodes = "nodes" + RancherKubernetesEngineConfigFieldSSHKeyPath = "sshKeyPath" + RancherKubernetesEngineConfigFieldServices = "services" + RancherKubernetesEngineConfigFieldSystemImages = "systemImages" ) type RancherKubernetesEngineConfig struct { - Addons string `json:"addons,omitempty"` - Authentication *AuthnConfig `json:"authentication,omitempty"` - Authorization *AuthzConfig `json:"authorization,omitempty"` - EnforceDockerVersion *bool `json:"enforceDockerVersion,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"` + IgnoreDockerVersion *bool `json:"ignoreDockerVersion,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"` }