rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-07-16 06:25:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #43 from moelsayed/rename_rke_images

Browse Source 
Rename rke_images to system_images
This commit is contained in:
Alena Prokharchyk 2017-12-04 09:55:59 -08:00 committed by GitHub
commit 6106f4926c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/cluster.cattle.io/v1/types.go
View File

@ -121,7 +121,7 @@ type RancherKubernetesEngineConfig struct {
// YAML manifest for user provided addons to be deployed on the cluster
Addons string `yaml:"addons" json:"addons,omitempty"`
// List of images used internally for proxy, cert downlaod and kubedns
RKEImages map[string]string `yaml:"rke_images" json:"rke_images,omitempty"`
SystemImages map[string]string `yaml:"system_images" json:"systemImages,omitempty"`
// SSH Private Key Path
SSHKeyPath string `yaml:"ssh_key_path" json:"sshKeyPath,omitempty"`
}

4
apis/cluster.cattle.io/v1/zz_generated_deepcopy.go
View File

@ -1009,8 +1009,8 @@ 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
if in.SystemImages != nil {
in, out := &in.SystemImages, &out.SystemImages
*out = make(map[string]string, len(*in))
for key, val := range *in {
(*out)[key] = val

4
client/cluster/v1/zz_generated_rancher_kubernetes_engine_config.go
View File

@ -6,9 +6,9 @@ const (
RancherKubernetesEngineConfigFieldAuthentication = "auth"
RancherKubernetesEngineConfigFieldNetwork = "network"
RancherKubernetesEngineConfigFieldNodes = "nodes"
RancherKubernetesEngineConfigFieldRKEImages = "rke_images"
RancherKubernetesEngineConfigFieldSSHKeyPath = "sshKeyPath"
RancherKubernetesEngineConfigFieldServices = "services"
RancherKubernetesEngineConfigFieldSystemImages = "systemImages"
)
type RancherKubernetesEngineConfig struct {
@ -16,7 +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"`
SystemImages map[string]string `json:"systemImages,omitempty"`
}