From b74e50fda540376bb75babe9dbbdaa3b8419951f Mon Sep 17 00:00:00 2001 From: moelsayed Date: Sat, 2 Dec 2017 04:43:50 +0200 Subject: [PATCH] add REKImages --- apis/cluster.cattle.io/v1/types.go | 2 ++ apis/cluster.cattle.io/v1/zz_generated_deepcopy.go | 7 +++++++ .../v1/zz_generated_rancher_kubernetes_engine_config.go | 2 ++ 3 files changed, 11 insertions(+) diff --git a/apis/cluster.cattle.io/v1/types.go b/apis/cluster.cattle.io/v1/types.go index 1d379e3b..9ba441c3 100644 --- a/apis/cluster.cattle.io/v1/types.go +++ b/apis/cluster.cattle.io/v1/types.go @@ -120,6 +120,8 @@ type RancherKubernetesEngineConfig struct { Addons string `yaml:"addons" json:"addons,omitempty"` // SSH Private Key Path SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"` + // List of images used internally for proxy, cert downlaod and kubedns + RKEImages map[string]string `yaml:"rke_images" json:"rke_images,omitempty"` } type RKEConfigNode struct { diff --git a/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go b/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go index 8f6242a0..8b62bbed 100644 --- a/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go +++ b/apis/cluster.cattle.io/v1/zz_generated_deepcopy.go @@ -961,6 +961,13 @@ func (in *RancherKubernetesEngineConfig) DeepCopyInto(out *RancherKubernetesEngi in.Services.DeepCopyInto(&out.Services) in.Network.DeepCopyInto(&out.Network) in.Authentication.DeepCopyInto(&out.Authentication) + if in.RKEImages != nil { + in, out := &in.RKEImages, &out.RKEImages + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } return } diff --git a/client/cluster/v1/zz_generated_rancher_kubernetes_engine_config.go b/client/cluster/v1/zz_generated_rancher_kubernetes_engine_config.go index d129be86..aa47795c 100644 --- a/client/cluster/v1/zz_generated_rancher_kubernetes_engine_config.go +++ b/client/cluster/v1/zz_generated_rancher_kubernetes_engine_config.go @@ -6,6 +6,7 @@ const ( RancherKubernetesEngineConfigFieldAuthentication = "auth" RancherKubernetesEngineConfigFieldNetwork = "network" RancherKubernetesEngineConfigFieldNodes = "nodes" + RancherKubernetesEngineConfigFieldRKEImages = "rke_images" RancherKubernetesEngineConfigFieldSSHKeyPath = "sshKeyPath" RancherKubernetesEngineConfigFieldServices = "services" ) @@ -15,6 +16,7 @@ type RancherKubernetesEngineConfig struct { Authentication *AuthConfig `json:"auth,omitempty"` Network *NetworkConfig `json:"network,omitempty"` Nodes []RKEConfigNode `json:"nodes,omitempty"` + RKEImages map[string]string `json:"rke_images,omitempty"` SSHKeyPath string `json:"sshKeyPath,omitempty"` Services *RKEConfigServices `json:"services,omitempty"` }