mirror of
https://github.com/rancher/rke.git
synced 2025-06-26 07:23:19 +00:00
vendor update: types
This commit is contained in:
parent
ba46b8c288
commit
f95ea889c0
@ -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 0557aa4ff31a3a0f007dcb1b684894f23cda390c
|
||||
github.com/rancher/types 68532a907ed4fd6b14b839e779529c9963ae1765
|
||||
github.com/rancher/types e3a7b1174de6d7d1d202bbc4e919d9cc99d6b9a6
|
||||
|
30
vendor/github.com/rancher/types/.drone.yml
generated
vendored
30
vendor/github.com/rancher/types/.drone.yml
generated
vendored
@ -1,9 +1,23 @@
|
||||
---
|
||||
pipeline:
|
||||
build:
|
||||
privileged: true
|
||||
image: rancher/dapper:1.11.2
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
commands:
|
||||
- dapper ci
|
||||
kind: pipeline
|
||||
name: default
|
||||
|
||||
platform:
|
||||
os: linux
|
||||
arch: amd64
|
||||
|
||||
steps:
|
||||
- name: build
|
||||
pull: default
|
||||
image: rancher/dapper:1.11.2
|
||||
commands:
|
||||
- dapper ci
|
||||
privileged: true
|
||||
volumes:
|
||||
- name: socket
|
||||
path: /var/run/docker.sock
|
||||
|
||||
volumes:
|
||||
- name: socket
|
||||
host:
|
||||
path: /var/run/docker.sock
|
||||
|
152
vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go
generated
vendored
152
vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_defaults.go
generated
vendored
@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
DefaultK8s = "v1.13.4-rancher1-2"
|
||||
DefaultK8s = "v1.13.5-rancher1-2"
|
||||
)
|
||||
|
||||
var (
|
||||
@ -24,12 +24,12 @@ var (
|
||||
|
||||
// K8sVersionsCurrent are the latest versions available for installation
|
||||
K8sVersionsCurrent = []string{
|
||||
"v1.11.8-rancher1-1",
|
||||
"v1.11.9-rancher1-1",
|
||||
// When add a new k8s version to 2.2, make sure to add support for it to the 2.1.x branch.
|
||||
// Account for the fact that rke-tools image is different cross branches, and it requires using
|
||||
// different k8s version tag
|
||||
"v1.12.6-rancher1-2",
|
||||
"v1.13.4-rancher1-2",
|
||||
"v1.12.7-rancher1-2",
|
||||
"v1.13.5-rancher1-2",
|
||||
}
|
||||
|
||||
// K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions
|
||||
@ -101,12 +101,12 @@ var (
|
||||
PipelineSystemImages: projectv3.PipelineSystemImages{
|
||||
Jenkins: m("rancher/pipeline-jenkins-server:v0.1.0"),
|
||||
JenkinsJnlp: m("jenkins/jnlp-slave:3.10-1-alpine"),
|
||||
AlpineGit: m("rancher/pipeline-tools:v0.1.8"),
|
||||
AlpineGit: m("rancher/pipeline-tools:v0.1.9"),
|
||||
PluginsDocker: m("plugins/docker:17.12"),
|
||||
Minio: m("minio/minio:RELEASE.2018-05-25T19-49-13Z"),
|
||||
Registry: m("registry:2"),
|
||||
RegistryProxy: m("rancher/pipeline-tools:v0.1.8"),
|
||||
KubeApply: m("rancher/pipeline-tools:v0.1.8"),
|
||||
RegistryProxy: m("rancher/pipeline-tools:v0.1.9"),
|
||||
KubeApply: m("rancher/pipeline-tools:v0.1.9"),
|
||||
},
|
||||
LoggingSystemImages: LoggingSystemImages{
|
||||
Fluentd: m("rancher/fluentd:v0.1.11"),
|
||||
@ -680,6 +680,32 @@ var (
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
|
||||
},
|
||||
"v1.11.9-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.2.18"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.11.9-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.15"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.15"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.15"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.15"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.10"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.10"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.10"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.10.0"),
|
||||
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.3.0"),
|
||||
CalicoNode: m("quay.io/calico/node:v3.1.3"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.1.3"),
|
||||
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
|
||||
CanalNode: m("quay.io/calico/node:v3.1.3"),
|
||||
CanalCNI: m("quay.io/calico/cni:v3.1.3"),
|
||||
CanalFlannel: m("quay.io/coreos/flannel:v0.10.0"),
|
||||
WeaveNode: m("weaveworks/weave-kube:2.1.2"),
|
||||
WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
|
||||
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
|
||||
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.2.1"),
|
||||
},
|
||||
"v1.12.0-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.12.0-rancher1"),
|
||||
@ -848,6 +874,34 @@ var (
|
||||
CoreDNS: m("coredns/coredns:1.2.2"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
|
||||
},
|
||||
"v1.12.7-rancher1-2": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.12.7-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.27"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.27"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.27"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.27"),
|
||||
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"),
|
||||
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.1.3"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.1.3"),
|
||||
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
|
||||
CanalNode: m("quay.io/calico/node:v3.1.3"),
|
||||
CanalCNI: m("quay.io/calico/cni:v3.1.3"),
|
||||
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.2"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
|
||||
},
|
||||
"v1.13.1-rancher1-2": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.13.1-rancher1"),
|
||||
@ -904,6 +958,34 @@ var (
|
||||
CoreDNS: m("coredns/coredns:1.2.6"),
|
||||
CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"),
|
||||
},
|
||||
"v1.13.5-rancher1-2": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.13.5-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.27"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.27"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.27"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.27"),
|
||||
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"),
|
||||
},
|
||||
// k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters
|
||||
// without all clusters being restarted
|
||||
"v1.12.5-rancher1-1": {
|
||||
@ -962,6 +1044,34 @@ var (
|
||||
},
|
||||
// k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters
|
||||
// without all clusters being restarted
|
||||
"v1.12.7-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.12.7-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.16"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.16"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.16"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.13"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.13"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.13"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.10.0"),
|
||||
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.3.0"),
|
||||
CalicoNode: m("quay.io/calico/node:v3.1.3"),
|
||||
CalicoCNI: m("quay.io/calico/cni:v3.1.3"),
|
||||
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
|
||||
CanalNode: m("quay.io/calico/node:v3.1.3"),
|
||||
CanalCNI: m("quay.io/calico/cni:v3.1.3"),
|
||||
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-amd64:3.1"),
|
||||
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"),
|
||||
},
|
||||
// k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters
|
||||
// without all clusters being restarted
|
||||
"v1.13.1-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.13.1-rancher1"),
|
||||
@ -1016,6 +1126,34 @@ var (
|
||||
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
|
||||
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"),
|
||||
},
|
||||
// k8s version from 2.1.x release with old rke-tools to allow upgrade from 2.1.x clusters
|
||||
// without all clusters being restarted
|
||||
"v1.13.5-rancher1-1": {
|
||||
Etcd: m("quay.io/coreos/etcd:v3.2.24"),
|
||||
Kubernetes: m("rancher/hyperkube:v1.13.5-rancher1"),
|
||||
Alpine: m("rancher/rke-tools:v0.1.16"),
|
||||
NginxProxy: m("rancher/rke-tools:v0.1.16"),
|
||||
CertDownloader: m("rancher/rke-tools:v0.1.16"),
|
||||
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16"),
|
||||
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.15.0"),
|
||||
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.15.0"),
|
||||
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.15.0"),
|
||||
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
|
||||
Flannel: m("quay.io/coreos/flannel:v0.10.0"),
|
||||
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.3.0"),
|
||||
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-amd64:3.1"),
|
||||
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"),
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
|
38
vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_windows_default.go
generated
vendored
38
vendor/github.com/rancher/types/apis/management.cattle.io/v3/k8s_windows_default.go
generated
vendored
@ -197,6 +197,14 @@ var (
|
||||
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
|
||||
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
|
||||
},
|
||||
"v1.11.9-rancher1-1": {
|
||||
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
|
||||
KubernetesBinaries: m("rancher/hyperkube:v1.11.9-nanoserver-1803"),
|
||||
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
|
||||
CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"),
|
||||
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
|
||||
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
|
||||
},
|
||||
"v1.12.0-rancher1-1": {
|
||||
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
|
||||
KubernetesBinaries: m("rancher/hyperkube:v1.12.0-nanoserver-1803"),
|
||||
@ -221,6 +229,14 @@ var (
|
||||
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
|
||||
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
|
||||
},
|
||||
"v1.12.7-rancher1-1": {
|
||||
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
|
||||
KubernetesBinaries: m("rancher/hyperkube:v1.12.7-nanoserver-1803"),
|
||||
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
|
||||
CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"),
|
||||
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
|
||||
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
|
||||
},
|
||||
"v1.12.5-rancher1-2": {
|
||||
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
|
||||
KubernetesBinaries: m("rancher/hyperkube:v1.12.5-nanoserver-1803"),
|
||||
@ -233,6 +249,12 @@ var (
|
||||
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
|
||||
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
|
||||
},
|
||||
"v1.12.7-rancher1-2": {
|
||||
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
|
||||
KubernetesBinaries: m("rancher/hyperkube:v1.12.7-nanoserver-1803"),
|
||||
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
|
||||
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
|
||||
},
|
||||
"v1.13.1-rancher1-2": {
|
||||
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
|
||||
KubernetesBinaries: m("rancher/hyperkube:v1.13.1-nanoserver-1803"),
|
||||
@ -255,6 +277,22 @@ var (
|
||||
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
|
||||
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
|
||||
},
|
||||
"v1.13.5-rancher1-1": {
|
||||
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
|
||||
KubernetesBinaries: m("rancher/hyperkube:v1.13.5-nanoserver-1803"),
|
||||
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
|
||||
CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"),
|
||||
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
|
||||
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
|
||||
},
|
||||
"v1.13.5-rancher1-2": {
|
||||
NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"),
|
||||
KubernetesBinaries: m("rancher/hyperkube:v1.13.5-nanoserver-1803"),
|
||||
FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"),
|
||||
CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"),
|
||||
CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),
|
||||
KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"),
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user