mirror of
https://github.com/rancher/rke.git
synced 2025-07-31 06:49:54 +00:00
Merge pull request #1863 from kinarashah/fwdrt
[forwardport] kdm vendor update for rke-tools
This commit is contained in:
Kinara Shah
GitHub
commit
038f81c5c1
2
go.mod
2
go.mod
@ -47,7 +47,7 @@ require (
|
||||
github.com/mattn/go-colorable v0.1.0
|
||||
github.com/mcuadros/go-version v0.0.0-20180611085657-6d5863ca60fa
|
||||
github.com/pkg/errors v0.8.1
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191226173708-9fb202ebb7a5
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191227195213-6047fe3b660d
|
||||
github.com/rancher/norman v0.0.0-20191209163739-5b9227fe3222
|
||||
github.com/rancher/types v0.0.0-20191220141525-65ed56d888c6
|
||||
github.com/sirupsen/logrus v1.4.2
|
||||
|
||||
4
go.sum
4
go.sum
@ -517,8 +517,8 @@ github.com/prometheus/tsdb v0.8.0/go.mod h1:fSI0j+IUQrDd7+ZtR9WKIGtoYAYAJUKcKhYL
|
||||
github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
|
||||
github.com/rancher/client-go v1.16.0-rancher.3 h1:bOA0zwtJi8wUeldqfrCGyDRuN6oW+zJ092i/OhWP2nU=
|
||||
github.com/rancher/client-go v1.16.0-rancher.3/go.mod h1:J69/JveO6XESwVgG53q3Uz5OSfgsv4uxpScmmyYOOlk=
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191226173708-9fb202ebb7a5 h1:sD+/ovYyFQHvGTWwjFF9WRcRTdN+oNsqMtK6EM6xtnQ=
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191226173708-9fb202ebb7a5/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I=
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191227195213-6047fe3b660d h1:A0OIe46KMVlSzOoPOgM+xMvGnf0IyEkVV0PC+VCJ34g=
|
||||
github.com/rancher/kontainer-driver-metadata v0.0.0-20191227195213-6047fe3b660d/go.mod h1:VBeI/67gB2g/zn1R3Tu7VvCCKTiYCX0HfsFVvnm7v2I=
|
||||
github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36 h1:N0ZUBJRq/ydy2ULiuqKhmiKShmEtpDOWXxKzVZxTzHk=
|
||||
github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
|
||||
github.com/rancher/norman v0.0.0-20191126010027-3afadb987c81 h1:40IyRSjbSj/jNHpJFOHGOlUvOCIQKUMF6p8Tcc/w1vs=
|
||||
|
||||
53
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go
generated
vendored
53
vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go
generated
vendored
@ -1382,6 +1382,35 @@ 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.4
|
||||
"v1.14.9-rancher1-2": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.14.9-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.52"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.52"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.52"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.52"),
|
||||
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.3.0"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"),
|
||||
FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"),
|
||||
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:nginx-0.25.1-rancher1"),
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"),
|
||||
CoreDNS: m("coredns/coredns:1.3.1"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"),
|
||||
},
|
||||
// Experimental in Rancher v2.2.5
|
||||
"v1.15.0-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
|
||||
@ -1659,10 +1688,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
|
||||
"v1.15.7-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.15.7-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.51"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.51"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.51"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.52"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.52"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.52"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.52"),
|
||||
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"),
|
||||
@ -1818,10 +1847,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
|
||||
"v1.16.4-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.3.15-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.16.4-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.51"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.51"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.51"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.52"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.52"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.52"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.52"),
|
||||
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"),
|
||||
@ -1882,10 +1911,10 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
|
||||
"v1.17.0-rancher1-2": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.4.3-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.17.0-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.51"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.51"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.51"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.51"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.52"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.52"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.52"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.52"),
|
||||
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/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -129,7 +129,7 @@ github.com/prometheus/procfs
|
||||
github.com/prometheus/procfs/internal/util
|
||||
github.com/prometheus/procfs/nfs
|
||||
github.com/prometheus/procfs/xfs
|
||||
# github.com/rancher/kontainer-driver-metadata v0.0.0-20191226173708-9fb202ebb7a5
|
||||
# github.com/rancher/kontainer-driver-metadata v0.0.0-20191227195213-6047fe3b660d
|
||||
github.com/rancher/kontainer-driver-metadata/rke
|
||||
github.com/rancher/kontainer-driver-metadata/rke/templates
|
||||
# github.com/rancher/norman v0.0.0-20191209163739-5b9227fe3222
|
||||
|
||||
Loading…
Reference in New Issue
Block a user