rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-04 00:14:49 +00:00
Code Issues Releases Wiki Activity

Vendor go mod changes for kontainer-driver-metadata

Browse Source
This commit is contained in:
rajashree
2019-09-03 11:25:49 -07:00
committed by Alena Prokharchyk
parent ff663b5a59
commit 079b743ad6
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1212,10 +1212,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.14.6-rancher3-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.14.6-rancher3"),
Alpine: m("rancher/rke-tools:v0.1.46"),
NginxProxy: m("rancher/rke-tools:v0.1.46"),
CertDownloader: m("rancher/rke-tools:v0.1.46"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.46"),
Alpine: m("rancher/rke-tools:v0.1.47"),
NginxProxy: m("rancher/rke-tools:v0.1.47"),
CertDownloader: m("rancher/rke-tools:v0.1.47"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.47"),
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"),
@@ -1331,10 +1331,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.15.3-rancher3-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.15.3-rancher3"),
Alpine: m("rancher/rke-tools:v0.1.46"),
NginxProxy: m("rancher/rke-tools:v0.1.46"),
CertDownloader: m("rancher/rke-tools:v0.1.46"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.46"),
Alpine: m("rancher/rke-tools:v0.1.47"),
NginxProxy: m("rancher/rke-tools:v0.1.47"),
CertDownloader: m("rancher/rke-tools:v0.1.47"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.47"),
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"),
@@ -1642,10 +1642,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
"v1.16.0-beta.1-rancher2-1": {
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
Kubernetes: m("rancher/hyperkube:v1.16.0-beta.1-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.46"),
NginxProxy: m("rancher/rke-tools:v0.1.46"),
CertDownloader: m("rancher/rke-tools:v0.1.46"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.46"),
Alpine: m("rancher/rke-tools:v0.1.47"),
NginxProxy: m("rancher/rke-tools:v0.1.47"),
CertDownloader: m("rancher/rke-tools:v0.1.47"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.47"),
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"),

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

@@ -297,6 +297,8 @@ spec:
operator: NotIn
values:
- windows
- key: node-role.kubernetes.io/worker
operator: Exists
terminationGracePeriodSeconds: 60
tolerations:
- effect: NoExecute