From c5616eea21ca41e2eaf4edb703b66d9d6f3cde0a Mon Sep 17 00:00:00 2001 From: moelsayed Date: Thu, 15 Feb 2018 03:35:59 +0200 Subject: [PATCH 1/2] Add ingress controller images to SystemImages --- apis/management.cattle.io/v3/rke_types.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index 4b15ceeb..acb2795a 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -56,7 +56,7 @@ type RKESystemImages struct { // KubeDNS autoscaler image KubeDNSAutoscaler string `yaml:"kubedns_autoscaler" json:"kubednsAutoscaler,omitempty"` // Kubernetes image - Kubernetes string `yaml:"kubernetes" json:"kubernetes,omitempty" norman:"default=rancher/k8s:v1.8.5-rancher4"` + Kubernetes string `yaml:"kubernetes" json:"kubernetes,omitempty"` // Flannel image Flannel string `yaml:"flannel" json:"flannel,omitempty"` // Flannel CNI image @@ -81,6 +81,10 @@ type RKESystemImages struct { WeaveCNI string `yaml:"weave_cni" json:"weaveCni,omitempty"` // Pod infra container image PodInfraContainer string `yaml:"pod_infra_container" json:"podInfraContainer,omitempty"` + // Ingress Controller image + Ingress string `yaml:"ingress" json:"ingress,omitempty"` + // Ingress Controller Backend image + IngressBackend string `yaml:"ingress_backend" json:"ingressBackend,omitempty"` } type RKEConfigNode struct { From 4d5164c0e4e3a6b9c49d84166cbaf5393378f9b9 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Thu, 15 Feb 2018 03:36:24 +0200 Subject: [PATCH 2/2] generated code --- client/management/v3/zz_generated_rke_system_images.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/management/v3/zz_generated_rke_system_images.go b/client/management/v3/zz_generated_rke_system_images.go index fb089175..f848a083 100644 --- a/client/management/v3/zz_generated_rke_system_images.go +++ b/client/management/v3/zz_generated_rke_system_images.go @@ -15,6 +15,8 @@ const ( RKESystemImagesFieldEtcd = "etcd" RKESystemImagesFieldFlannel = "flannel" RKESystemImagesFieldFlannelCNI = "flannelCni" + RKESystemImagesFieldIngress = "ingress" + RKESystemImagesFieldIngressBackend = "ingressBackend" RKESystemImagesFieldKubeDNS = "kubedns" RKESystemImagesFieldKubeDNSAutoscaler = "kubednsAutoscaler" RKESystemImagesFieldKubeDNSSidecar = "kubednsSidecar" @@ -40,6 +42,8 @@ type RKESystemImages struct { Etcd string `json:"etcd,omitempty"` Flannel string `json:"flannel,omitempty"` FlannelCNI string `json:"flannelCni,omitempty"` + Ingress string `json:"ingress,omitempty"` + IngressBackend string `json:"ingressBackend,omitempty"` KubeDNS string `json:"kubedns,omitempty"` KubeDNSAutoscaler string `json:"kubednsAutoscaler,omitempty"` KubeDNSSidecar string `json:"kubednsSidecar,omitempty"`