diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 95347c83..d400a7d2 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -427,6 +427,10 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*RKEConfigServices).DeepCopyInto(out.(*RKEConfigServices)) return nil }, InType: reflect.TypeOf(&RKEConfigServices{})}, + conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { + in.(*RKESystemImages).DeepCopyInto(out.(*RKESystemImages)) + return nil + }, InType: reflect.TypeOf(&RKESystemImages{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*RancherKubernetesEngineConfig).DeepCopyInto(out.(*RancherKubernetesEngineConfig)) return nil @@ -3298,6 +3302,22 @@ func (in *RKEConfigServices) DeepCopy() *RKEConfigServices { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *RKESystemImages) DeepCopyInto(out *RKESystemImages) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RKESystemImages. +func (in *RKESystemImages) DeepCopy() *RKESystemImages { + if in == nil { + return nil + } + out := new(RKESystemImages) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RancherKubernetesEngineConfig) DeepCopyInto(out *RancherKubernetesEngineConfig) { *out = *in @@ -3311,13 +3331,7 @@ func (in *RancherKubernetesEngineConfig) DeepCopyInto(out *RancherKubernetesEngi in.Services.DeepCopyInto(&out.Services) in.Network.DeepCopyInto(&out.Network) in.Authentication.DeepCopyInto(&out.Authentication) - 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 - } - } + out.SystemImages = in.SystemImages in.Authorization.DeepCopyInto(&out.Authorization) if in.PrivateRegistries != nil { in, out := &in.PrivateRegistries, &out.PrivateRegistries 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 bcf38062..7a9513c3 100644 --- a/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go +++ b/client/management/v3/zz_generated_rancher_kubernetes_engine_config.go @@ -12,7 +12,7 @@ const ( RancherKubernetesEngineConfigFieldSSHKeyPath = "sshKeyPath" RancherKubernetesEngineConfigFieldServices = "services" RancherKubernetesEngineConfigFieldSystemImages = "systemImages" - RancherKubernetesEngineConfigFieldVersion = "version" + RancherKubernetesEngineConfigFieldVersion = "kubernetesVersion" ) type RancherKubernetesEngineConfig struct { @@ -25,6 +25,6 @@ type RancherKubernetesEngineConfig struct { PrivateRegistries []PrivateRegistry `json:"privateRegistries,omitempty"` SSHKeyPath string `json:"sshKeyPath,omitempty"` Services *RKEConfigServices `json:"services,omitempty"` - SystemImages map[string]string `json:"systemImages,omitempty"` - Version string `json:"version,omitempty"` + SystemImages *RKESystemImages `json:"systemImages,omitempty"` + Version string `json:"kubernetesVersion,omitempty"` } diff --git a/client/management/v3/zz_generated_rke_system_images.go b/client/management/v3/zz_generated_rke_system_images.go new file mode 100644 index 00000000..8f4d83e6 --- /dev/null +++ b/client/management/v3/zz_generated_rke_system_images.go @@ -0,0 +1,28 @@ +package client + +const ( + RKESystemImagesType = "rkeSystemImages" + RKESystemImagesFieldAlpine = "alpine" + RKESystemImagesFieldCertDownloader = "certDownloader" + RKESystemImagesFieldDNSmasq = "dnsmasq" + RKESystemImagesFieldEtcd = "etcd" + RKESystemImagesFieldKubeDNS = "kubedns" + RKESystemImagesFieldKubeDNSAutoscaler = "kubednsAutoscaler" + RKESystemImagesFieldKubeDNSSidecar = "kubednsSidecar" + RKESystemImagesFieldKubernetes = "kubernetes" + RKESystemImagesFieldKubernetesServicesSidecar = "kubernetesServicesSidecar" + RKESystemImagesFieldNginxProxy = "nginxProxy" +) + +type RKESystemImages struct { + Alpine string `json:"alpine,omitempty"` + CertDownloader string `json:"certDownloader,omitempty"` + DNSmasq string `json:"dnsmasq,omitempty"` + Etcd string `json:"etcd,omitempty"` + KubeDNS string `json:"kubedns,omitempty"` + KubeDNSAutoscaler string `json:"kubednsAutoscaler,omitempty"` + KubeDNSSidecar string `json:"kubednsSidecar,omitempty"` + Kubernetes string `json:"kubernetes,omitempty"` + KubernetesServicesSidecar string `json:"kubernetesServicesSidecar,omitempty"` + NginxProxy string `json:"nginxProxy,omitempty"` +}