rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-05 08:50:13 +00:00
Code Issues Releases Wiki Activity

update vendor for dns policy support for ingress controller

Browse Source
This commit is contained in:
Chris Kim
2019-08-23 15:53:08 -07:00
committed by Alena Prokharchyk
parent 5cb6699fe3
commit 85c21bc905
6 changed files with 72 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go generated vendored
View File

@@ -1034,6 +1034,35 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
CoreDNS: m("coredns/coredns:1.2.6"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
},
// Enabled in Rancher v2.3
"v1.13.10-rancher1-3": {
Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.13.10-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.44"),
NginxProxy: m("rancher/rke-tools:v0.1.44"),
CertDownloader: m("rancher/rke-tools:v0.1.44"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.44"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"),
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"),
CalicoNode: m("quay.io/calico/node:v3.4.0"),
CalicoCNI: m("quay.io/calico/cni:v3.4.0"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v3.4.0"),
CanalCNI: m("quay.io/calico/cni:v3.4.0"),
CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"),
WeaveNode: m("weaveworks/weave-kube:2.5.0"),
WeaveCNI: m("weaveworks/weave-npc:2.5.0"),
PodInfraContainer: m("gcr.io/google_containers/pause:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"),
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"),
CoreDNS: m("coredns/coredns:1.2.6"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
},
// Enabled in Rancher v2.2.2
"v1.14.1-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
@@ -1179,13 +1208,14 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
CoreDNS: m("coredns/coredns:1.3.1"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
},
// Enabled in Rancher v2.3
"v1.14.6-rancher2-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.14.6-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.43"),
NginxProxy: m("rancher/rke-tools:v0.1.43"),
CertDownloader: m("rancher/rke-tools:v0.1.43"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.43"),
Alpine: m("rancher/rke-tools:v0.1.44"),
NginxProxy: m("rancher/rke-tools:v0.1.44"),
CertDownloader: m("rancher/rke-tools:v0.1.44"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.44"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
@@ -1297,13 +1327,14 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
CoreDNS: m("coredns/coredns:1.3.1"),
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
},
// Enabled in Rancher v2.3
"v1.15.3-rancher2-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.15.3-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.43"),
NginxProxy: m("rancher/rke-tools:v0.1.43"),
CertDownloader: m("rancher/rke-tools:v0.1.43"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.43"),
Alpine: m("rancher/rke-tools:v0.1.44"),
NginxProxy: m("rancher/rke-tools:v0.1.44"),
CertDownloader: m("rancher/rke-tools:v0.1.44"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.44"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),
@@ -1607,13 +1638,14 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
},
// Enabled in Rancher v2.3
"v1.16.0-beta.1-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.16.0-beta.1-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.43"),
NginxProxy: m("rancher/rke-tools:v0.1.43"),
CertDownloader: m("rancher/rke-tools:v0.1.43"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.43"),
Alpine: m("rancher/rke-tools:v0.1.44"),
NginxProxy: m("rancher/rke-tools:v0.1.44"),
CertDownloader: m("rancher/rke-tools:v0.1.44"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.44"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"),

3
vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/nginx-ingress.go generated vendored
View File

@@ -186,6 +186,9 @@ spec:
values:
- windows
hostNetwork: true
{{if .DNSPolicy}}
dnsPolicy: {{.DNSPolicy}}
{{end}}
nodeSelector:
{{ range $k, $v := .NodeSelector }}
{{ $k }}: "{{ $v }}"

2
vendor/github.com/rancher/types/apis/management.cattle.io/v3/rke_types.go generated vendored
View File

@@ -363,6 +363,8 @@ type IngressConfig struct {
NodeSelector map[string]string `yaml:"node_selector" json:"nodeSelector,omitempty"`
// Ingress controller extra arguments
ExtraArgs map[string]string `yaml:"extra_args" json:"extraArgs,omitempty"`
// DNS Policy
DNSPolicy string `yaml:"dns_policy" json:"dnsPolicy,omitempty"`
}
type RKEPlan struct {