From 4c5fd3782ac4d050218a41d8d1b903e23e45ab6a Mon Sep 17 00:00:00 2001 From: Nathan Jenan Date: Tue, 23 Jan 2018 14:21:18 -0700 Subject: [PATCH] Adding version field to rke config --- apis/management.cattle.io/v3/rke_types.go | 2 ++ .../v3/zz_generated_rancher_kubernetes_engine_config.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 92adc20f..c54f3dc0 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -19,6 +19,8 @@ type RancherKubernetesEngineConfig struct { Authorization AuthzConfig `yaml:"authorization" json:"authorization,omitempty"` // Enable/disable strict docker version checking IgnoreDockerVersion bool `yaml:"ignore_docker_version" json:"ignoreDockerVersion"` + // Kubernetes version to use (overrides individual Images) + Version string `yaml:"kubernetesVersion"` } 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 376928bb..f7e8e83e 100644 --- a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go +++ b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go @@ -11,6 +11,7 @@ const ( RancherKubernetesEngineConfigFieldSSHKeyPath = "sshKeyPath" RancherKubernetesEngineConfigFieldServices = "services" RancherKubernetesEngineConfigFieldSystemImages = "systemImages" + RancherKubernetesEngineConfigFieldVersion = "version" ) type RancherKubernetesEngineConfig struct { @@ -23,4 +24,5 @@ type RancherKubernetesEngineConfig struct { SSHKeyPath string `json:"sshKeyPath,omitempty"` Services *RKEConfigServices `json:"services,omitempty"` SystemImages map[string]string `json:"systemImages,omitempty"` + Version string `json:"version,omitempty"` }