rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-17 15:29:10 +00:00
Code Issues Releases Wiki Activity

Add DNS provider config and CoreDNS images

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2019-01-21 22:51:51 +01:00
committed by Alena Prokharchyk
parent 0fc5fb4f58
commit e1d14d99e5
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -668,6 +668,8 @@ var (
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
CoreDNS: m("coredns/coredns:1.2.2"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
},
"v1.12.1-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
@@ -694,6 +696,8 @@ var (
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
CoreDNS: m("coredns/coredns:1.2.2"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
},
"v1.12.3-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
@@ -720,6 +724,8 @@ var (
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
CoreDNS: m("coredns/coredns:1.2.2"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
},
"v1.12.4-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
@@ -746,6 +752,8 @@ var (
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
CoreDNS: m("coredns/coredns:1.2.2"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
},
"v1.12.5-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
@@ -772,6 +780,8 @@ var (
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
CoreDNS: m("coredns/coredns:1.2.2"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
},
"v1.13.1-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
@@ -798,6 +808,8 @@ var (
Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher1"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
CoreDNS: m("coredns/coredns:1.2.6"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
},
}
)

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

@@ -45,6 +45,8 @@ type RancherKubernetesEngineConfig struct {
Restore RestoreConfig `yaml:"restore" json:"restore,omitempty"`
// Rotating Certificates Option
RotateCertificates *RotateCertificates `yaml:"rotate_certificates,omitempty" json:"rotateCertificates,omitempty"`
// DNS Config
DNS DNSConfig `yaml:"dns" json:"dns,omitempty"`
}
type BastionHost struct {
@@ -92,6 +94,10 @@ type RKESystemImages struct {
KubeDNSSidecar string `yaml:"kubedns_sidecar" json:"kubednsSidecar,omitempty"`
// KubeDNS autoscaler image
KubeDNSAutoscaler string `yaml:"kubedns_autoscaler" json:"kubednsAutoscaler,omitempty"`
// CoreDNS image
CoreDNS string `yaml:"coredns" json:"coredns,omitempty"`
// CoreDNS autoscaler image
CoreDNSAutoscaler string `yaml:"coredns_autoscaler" json:"corednsAutoscaler,omitempty"`
// Kubernetes image
Kubernetes string `yaml:"kubernetes" json:"kubernetes,omitempty"`
// Flannel image
@@ -599,3 +605,14 @@ type RotateCertificates struct {
// Services to rotate their certs
Services []string `json:"services,omitempty" norman:"type=enum,options=etcd|kubelet|kube-apiserver|kube-proxy|kube-scheduler|kube-controller-manager"`
}
type DNSConfig struct {
// DNS provider
Provider string `yaml:"provider" json:"provider,omitempty" norman:"default=kube-dns"`
// Upstream nameservers
UpstreamNameservers []string `yaml:"upstreamnameservers" json:"upstreamnameservers,omitempty"`
// ReverseCIDRs
ReverseCIDRs []string `yaml:"reversecidrs" json:"reversecidrs,omitempty"`
// NodeSelector key pair
NodeSelector map[string]string `yaml:"node_selector" json:"nodeSelector,omitempty"`
}