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

Consolidated k8s system images for rancher 1.6/2.0

Browse Source
This commit is contained in:
Alena Prokharchyk
2018-03-22 13:42:52 -07:00
committed by Darren Shepherd
parent 55f828d379
commit 86b94d252a
3 changed files with 52 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -4,3 +4,5 @@
*.swp
/.trash-cache
/.idea
/trash.lock
/types

71
apis/management.cattle.io/v3/k8s_defaults.go
View File

@@ -2,20 +2,25 @@ package v3
const (
K8sV18 = "v1.8.9-rancher1-1"
K8sV19 = "v1.9.5-rancher1-1"
)
var (
// K8sVersionToRKESystemImages - images map for 2.0
K8sVersionToRKESystemImages = map[string]RKESystemImages{
"v1.8.9-rancher1-1": v18SystemImages,
"v1.9.4-rancher1-1": v19SystemImages,
"v1.9.5-rancher1-1": v19SystemImages,
}
// RancherK8sVersionToSystemImages versions must match github release version
RancherK8sVersionToSystemImages = map[string]RancherSystemImages{
"v1.9.4-rancher1": v194SystemImages,
"v1.9.5-rancher1": v195SystemImages,
// K8SVersionToSystemImages16 - images map for 1.6. Keeping it sepate in case we have to diverge
K8SVersionToSystemImages16 = map[string]RKESystemImages{
"v1.8.9-rancher1-1": v18SystemImages,
"v1.9.4-rancher1-1": v19SystemImages,
"v1.9.5-rancher1-1": v19SystemImages,
}
// v187SystemImages defaults for rke and rancher 2.0
// v18 system images defaults
v18SystemImages = RKESystemImages{
Etcd: "rancher/coreos-etcd:v3.0.17",
Kubernetes: "rancher/k8s:" + K8sV18,
@@ -42,31 +47,35 @@ var (
IngressBackend: "rancher/nginx-ingress-controller-defaultbackend:1.4",
}
// v194SystemImages defaults for 1.6 with k8s v1.9
v194SystemImages = RancherSystemImages{
RKESystemImages: RKESystemImages{
KubeDNS: "k8s-dns-kube-dns-amd64:1.14.7",
DNSmasq: "k8s-dns-dnsmasq-nanny-amd64:1.14.7",
KubeDNSSidecar: "k8s-dns-sidecar-amd64:1.14.7",
},
Grafana: "heapster-grafana-amd64:v4.4.3",
Heapster: "heapster-amd64:v1.5.0",
Influxdb: "heapster-influxdb-amd64:v1.3.3",
Tiller: "tiller:v2.7.2",
Dashboard: "kubernetes-dashboard-amd64:v1.8.0",
}
// v195SystemImages defaults for 1.6 with k8s v1.9.5
v195SystemImages = RancherSystemImages{
RKESystemImages: RKESystemImages{
KubeDNS: "k8s-dns-kube-dns-amd64:1.14.7",
DNSmasq: "k8s-dns-dnsmasq-nanny-amd64:1.14.7",
KubeDNSSidecar: "k8s-dns-sidecar-amd64:1.14.7",
},
Grafana: "heapster-grafana-amd64:v4.4.3",
Heapster: "heapster-amd64:v1.5.0",
Influxdb: "heapster-influxdb-amd64:v1.3.3",
Tiller: "tiller:v2.7.2",
Dashboard: "kubernetes-dashboard-amd64:v1.8.0",
// v19 system images defaults
v19SystemImages = RKESystemImages{
Etcd: "rancher/coreos-etcd:v3.0.17",
Kubernetes: "rancher/k8s:" + K8sV19,
Alpine: "alpine:latest",
NginxProxy: "rancher/rke-nginx-proxy:v0.1.1",
CertDownloader: "rancher/rke-cert-deployer:v0.1.1",
KubernetesServicesSidecar: "rancher/rke-service-sidekick:v0.1.0",
KubeDNS: "rancher/k8s-dns-kube-dns-amd64:1.14.7",
DNSmasq: "rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.7",
KubeDNSSidecar: "rancher/k8s-dns-sidecar-amd64:1.14.7",
KubeDNSAutoscaler: "rancher/cluster-proportional-autoscaler-amd64:1.0.0",
Flannel: "rancher/coreos-flannel:v0.9.1",
FlannelCNI: "rancher/coreos-flannel-cni:v0.2.0",
CalicoNode: "rancher/calico-node:v3.0.2",
CalicoCNI: "rancher/calico-cni:v2.0.0",
CalicoCtl: "rancher/calico-ctl:v2.0.0",
CanalNode: "rancher/calico-node:v2.6.2",
CanalCNI: "rancher/calico-cni:v1.11.0",
CanalFlannel: "rancher/coreos-flannel:v0.9.1",
WeaveNode: "weaveworks/weave-kube:2.1.2",
WeaveCNI: "weaveworks/weave-npc:2.1.2",
PodInfraContainer: "rancher/pause-amd64:3.0",
Ingress: "rancher/nginx-ingress-controller:0.10.2",
IngressBackend: "rancher/nginx-ingress-controller-defaultbackend:1.4",
Grafana: "rancher/heapster-grafana-amd64:v4.4.3",
Heapster: "rancher/heapster-amd64:v1.5.0",
Influxdb: "rancher/heapster-influxdb-amd64:v1.3.3",
Tiller: "rancher/tiller:v2.7.2",
Dashboard: "rancher/kubernetes-dashboard-amd64:v1.8.0",
}
)

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

@@ -44,29 +44,6 @@ type PrivateRegistry struct {
Password string `yaml:"password" json:"password,omitempty"`
}
type RancherSystemImages struct {
// RKE system images
RKESystemImages `yaml:",inline" json:",inline"`
// Kubectld image
Kubectld string `yaml:"kubectld" json:"kubectld,omitempty"`
// Etc host updater image
EtcHostUpdater string `yaml:"etc_host_updater" json:"etcHostUpdater,omitempty"`
// Kubernetes agent image
K8sAgent string `yaml:"k8s_agent" json:"k8sAgent,omitempty"`
// Kubernetes auth service agent
K8sAuth string `yaml:"k8s_auth" json:"k8sAuth,omitempty"`
// Kubernetes Dashboard image
Dashboard string `yaml:"dashboard" json:"dashboard,omitempty"`
// Heapster addon image
Heapster string `yaml:"heapster" json:"heapster,omitempty"`
// Grafana image for heapster addon
Grafana string `yaml:"grafana" json:"grafana,omitempty"`
// Influxdb image for heapster addon
Influxdb string `yaml:"influxdb" json:"influxdb,omitempty"`
// Tiller addon image
Tiller string `yaml:"tiller" json:"tiller,omitempty"`
}
type RKESystemImages struct {
// etcd image
Etcd string `yaml:"etcd" json:"etcd,omitempty"`
@@ -116,6 +93,16 @@ type RKESystemImages struct {
Ingress string `yaml:"ingress" json:"ingress,omitempty"`
// Ingress Controller Backend image
IngressBackend string `yaml:"ingress_backend" json:"ingressBackend,omitempty"`
// Dashboard image
Dashboard string `yaml:"dashboard" json:"dashboard,omitempty"`
// Heapster addon image
Heapster string `yaml:"heapster" json:"heapster,omitempty"`
// Grafana image for heapster addon
Grafana string `yaml:"grafana" json:"grafana,omitempty"`
// Influxdb image for heapster addon
Influxdb string `yaml:"influxdb" json:"influxdb,omitempty"`
// Tiller addon image
Tiller string `yaml:"tiller" json:"tiller,omitempty"`
}
type RKEConfigNode struct {