From a9178824cd518e1ac2bd8efd03751437ddc1c1fe Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Thu, 22 Mar 2018 16:16:45 -0700 Subject: [PATCH] generated changes --- .../v3/zz_generated_deepcopy.go | 21 ------------------- .../v3/zz_generated_rke_system_images.go | 10 +++++++++ 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index c82df493..d0a7f278 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -679,10 +679,6 @@ func RegisterDeepCopies(scheme *runtime.Scheme) error { in.(*RancherKubernetesEngineConfig).DeepCopyInto(out.(*RancherKubernetesEngineConfig)) return nil }, InType: reflect.TypeOf(&RancherKubernetesEngineConfig{})}, - conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { - in.(*RancherSystemImages).DeepCopyInto(out.(*RancherSystemImages)) - return nil - }, InType: reflect.TypeOf(&RancherSystemImages{})}, conversion.GeneratedDeepCopyFunc{Fn: func(in interface{}, out interface{}, c *conversion.Cloner) error { in.(*Recipient).DeepCopyInto(out.(*Recipient)) return nil @@ -5321,23 +5317,6 @@ func (in *RancherKubernetesEngineConfig) DeepCopy() *RancherKubernetesEngineConf return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *RancherSystemImages) DeepCopyInto(out *RancherSystemImages) { - *out = *in - out.RKESystemImages = in.RKESystemImages - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RancherSystemImages. -func (in *RancherSystemImages) DeepCopy() *RancherSystemImages { - if in == nil { - return nil - } - out := new(RancherSystemImages) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Recipient) DeepCopyInto(out *Recipient) { *out = *in diff --git a/client/management/v3/zz_generated_rke_system_images.go b/client/management/v3/zz_generated_rke_system_images.go index d4dd563c..d28d2f10 100644 --- a/client/management/v3/zz_generated_rke_system_images.go +++ b/client/management/v3/zz_generated_rke_system_images.go @@ -12,9 +12,13 @@ const ( RKESystemImagesFieldCanalNode = "canalNode" RKESystemImagesFieldCertDownloader = "certDownloader" RKESystemImagesFieldDNSmasq = "dnsmasq" + RKESystemImagesFieldDashboard = "dashboard" RKESystemImagesFieldEtcd = "etcd" RKESystemImagesFieldFlannel = "flannel" RKESystemImagesFieldFlannelCNI = "flannelCni" + RKESystemImagesFieldGrafana = "grafana" + RKESystemImagesFieldHeapster = "heapster" + RKESystemImagesFieldInfluxdb = "influxdb" RKESystemImagesFieldIngress = "ingress" RKESystemImagesFieldIngressBackend = "ingressBackend" RKESystemImagesFieldKubeDNS = "kubedns" @@ -24,6 +28,7 @@ const ( RKESystemImagesFieldKubernetesServicesSidecar = "kubernetesServicesSidecar" RKESystemImagesFieldNginxProxy = "nginxProxy" RKESystemImagesFieldPodInfraContainer = "podInfraContainer" + RKESystemImagesFieldTiller = "tiller" RKESystemImagesFieldWeaveCNI = "weaveCni" RKESystemImagesFieldWeaveNode = "weaveNode" ) @@ -39,9 +44,13 @@ type RKESystemImages struct { CanalNode string `json:"canalNode,omitempty" yaml:"canalNode,omitempty"` CertDownloader string `json:"certDownloader,omitempty" yaml:"certDownloader,omitempty"` DNSmasq string `json:"dnsmasq,omitempty" yaml:"dnsmasq,omitempty"` + Dashboard string `json:"dashboard,omitempty" yaml:"dashboard,omitempty"` Etcd string `json:"etcd,omitempty" yaml:"etcd,omitempty"` Flannel string `json:"flannel,omitempty" yaml:"flannel,omitempty"` FlannelCNI string `json:"flannelCni,omitempty" yaml:"flannelCni,omitempty"` + Grafana string `json:"grafana,omitempty" yaml:"grafana,omitempty"` + Heapster string `json:"heapster,omitempty" yaml:"heapster,omitempty"` + Influxdb string `json:"influxdb,omitempty" yaml:"influxdb,omitempty"` Ingress string `json:"ingress,omitempty" yaml:"ingress,omitempty"` IngressBackend string `json:"ingressBackend,omitempty" yaml:"ingressBackend,omitempty"` KubeDNS string `json:"kubedns,omitempty" yaml:"kubedns,omitempty"` @@ -51,6 +60,7 @@ type RKESystemImages struct { KubernetesServicesSidecar string `json:"kubernetesServicesSidecar,omitempty" yaml:"kubernetesServicesSidecar,omitempty"` NginxProxy string `json:"nginxProxy,omitempty" yaml:"nginxProxy,omitempty"` PodInfraContainer string `json:"podInfraContainer,omitempty" yaml:"podInfraContainer,omitempty"` + Tiller string `json:"tiller,omitempty" yaml:"tiller,omitempty"` WeaveCNI string `json:"weaveCni,omitempty" yaml:"weaveCni,omitempty"` WeaveNode string `json:"weaveNode,omitempty" yaml:"weaveNode,omitempty"` }