diff --git a/util/util.go b/util/util.go index 91fa17d3..989f1663 100644 --- a/util/util.go +++ b/util/util.go @@ -14,7 +14,7 @@ import ( const ( WorkerThreads = 50 - DefaultRKETools = "rancher/rke-tools:v0.1.32" + DefaultRKETools = "rancher/rke-tools:v0.1.34" ) func StrToSemVer(version string) (*semver.Version, error) { diff --git a/vendor.conf b/vendor.conf index 77f60e4f..dc83ba52 100644 --- a/vendor.conf +++ b/vendor.conf @@ -28,4 +28,4 @@ github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0e github.com/mattn/go-colorable efa589957cd060542a26d2dd7832fd6a6c6c3ade github.com/mattn/go-isatty 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c github.com/rancher/norman f5744043a6fb81330ee78e4f7a0f04d0ef65c9f1 -github.com/rancher/types 0a1cca6c51dbd43bf54b50a7954497e5694f49b9 +github.com/rancher/types fa18f1e03519d75f7575f7939aa67c0d440f4108 diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go index c1a0d2cc..65c94fda 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go @@ -986,10 +986,10 @@ var ( "v1.12.9-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), Kubernetes: m("rancher/hyperkube:v1.12.9-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.32"), - NginxProxy: m("rancher/rke-tools:v0.1.32"), - CertDownloader: m("rancher/rke-tools:v0.1.32"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.32"), + Alpine: m("rancher/rke-tools:v0.1.34"), + NginxProxy: m("rancher/rke-tools:v0.1.34"), + CertDownloader: m("rancher/rke-tools:v0.1.34"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.34"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.14.13"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.14.13"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.14.13"), @@ -1128,10 +1128,10 @@ var ( "v1.13.7-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), Kubernetes: m("rancher/hyperkube:v1.13.7-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.32"), - NginxProxy: m("rancher/rke-tools:v0.1.32"), - CertDownloader: m("rancher/rke-tools:v0.1.32"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.32"), + Alpine: m("rancher/rke-tools:v0.1.34"), + NginxProxy: m("rancher/rke-tools:v0.1.34"), + CertDownloader: m("rancher/rke-tools:v0.1.34"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.34"), 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"), @@ -1214,10 +1214,10 @@ var ( "v1.14.3-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), Kubernetes: m("rancher/hyperkube:v1.14.3-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.32"), - NginxProxy: m("rancher/rke-tools:v0.1.32"), - CertDownloader: m("rancher/rke-tools:v0.1.32"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.32"), + Alpine: m("rancher/rke-tools:v0.1.34"), + NginxProxy: m("rancher/rke-tools:v0.1.34"), + CertDownloader: m("rancher/rke-tools:v0.1.34"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.34"), 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"), @@ -1243,10 +1243,10 @@ var ( "v1.15.0-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), Kubernetes: m("rancher/hyperkube:v1.15.0-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.32"), - NginxProxy: m("rancher/rke-tools:v0.1.32"), - CertDownloader: m("rancher/rke-tools:v0.1.32"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.32"), + Alpine: m("rancher/rke-tools:v0.1.34"), + NginxProxy: m("rancher/rke-tools:v0.1.34"), + CertDownloader: m("rancher/rke-tools:v0.1.34"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.34"), 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"),