rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-08-01 21:07:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #222 from moelsayed/ingress_images

Browse Source 
Add Ingress images
This commit is contained in:
Alena Prokharchyk 2018-02-16 12:35:09 -08:00 committed by GitHub
commit ee7eede0cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apis/management.cattle.io/v3/rke_types.go
View File

@ -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 {

4
client/management/v3/zz_generated_rke_system_images.go
View File

@ -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"`