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

vendor bump

Browse Source
This commit is contained in:
moelsayed
2018-07-20 22:55:08 +02:00
committed by Denise
parent 82af829b8c
commit b483981539
4 changed files with 70 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@@ -25,4 +25,4 @@ github.com/Microsoft/go-winio ab35fc04b6365e8fcb18e6e9e41ea4a02b10b17
github.com/go-ini/ini 06f5f3d67269ccec1fe5fe4134ba6e982984f7f5 github.com/go-ini/ini 06f5f3d67269ccec1fe5fe4134ba6e982984f7f5
github.com/rancher/norman c032c4611f2eec1652ef37d254f0e8ccf90c80aa github.com/rancher/norman c032c4611f2eec1652ef37d254f0e8ccf90c80aa
github.com/rancher/types 01217d321d6b73f122b851a39c87ccf8925f8708 github.com/rancher/types 556fa1f61dfa7fb20b449a0fadf8d45e341acb9b

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

@@ -69,6 +69,7 @@ type ClusterSpec struct {
AmazonElasticContainerServiceConfig *AmazonElasticContainerServiceConfig `json:"amazonElasticContainerServiceConfig,omitempty"` AmazonElasticContainerServiceConfig *AmazonElasticContainerServiceConfig `json:"amazonElasticContainerServiceConfig,omitempty"`
DefaultPodSecurityPolicyTemplateName string `json:"defaultPodSecurityPolicyTemplateName,omitempty" norman:"type=reference[podSecurityPolicyTemplate]"` DefaultPodSecurityPolicyTemplateName string `json:"defaultPodSecurityPolicyTemplateName,omitempty" norman:"type=reference[podSecurityPolicyTemplate]"`
DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" norman:"type=reference[roleTemplate]"` DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" norman:"type=reference[roleTemplate]"`
DockerRootDir string `json:"dockerRootDir,omitempty" norman:"default=/var/lib/docker"`
} }
type ImportedConfig struct { type ImportedConfig struct {

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

@@ -3,7 +3,7 @@ package v3
import "github.com/rancher/types/image" import "github.com/rancher/types/image"
const ( const (
DefaultK8s = "v1.10.5-rancher1-1" DefaultK8s = "v1.11.1-rancher1-1"
) )
var ( var (
@@ -33,7 +33,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
}, },
@@ -59,7 +59,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
}, },
@@ -85,7 +85,33 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
},
"v1.9.7-rancher2-2": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2"),
Alpine: m("rancher/rke-tools:v0.1.11"),
NginxProxy: m("rancher/rke-tools:v0.1.11"),
CertDownloader: m("rancher/rke-tools:v0.1.11"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.11"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7"),
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.9.1"),
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"),
CalicoNode: m("quay.io/calico/node:v3.1.1"),
CalicoCNI: m("quay.io/calico/cni:v3.1.1"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v3.1.1"),
CanalCNI: m("quay.io/calico/cni:v3.1.1"),
CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"),
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.0"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
}, },
@@ -111,7 +137,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
}, },
@@ -137,7 +163,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
}, },
@@ -163,7 +189,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
}, },
@@ -189,7 +215,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
}, },
@@ -219,13 +245,39 @@ var (
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
}, },
"v1.10.5-rancher1-2": {
Etcd: m("quay.io/coreos/etcd:v3.1.12"),
Kubernetes: m("rancher/hyperkube:v1.10.5-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.11"),
NginxProxy: m("rancher/rke-tools:v0.1.11"),
CertDownloader: m("rancher/rke-tools:v0.1.11"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.11"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8"),
DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8"),
KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8"),
KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"),
Flannel: m("quay.io/coreos/flannel:v0.9.1"),
FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"),
CalicoNode: m("quay.io/calico/node:v3.1.1"),
CalicoCNI: m("quay.io/calico/cni:v3.1.1"),
CalicoCtl: m("quay.io/calico/ctl:v2.0.0"),
CanalNode: m("quay.io/calico/node:v3.1.1"),
CanalCNI: m("quay.io/calico/cni:v3.1.1"),
CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"),
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.11.1-rancher1-1": { "v1.11.1-rancher1-1": {
Etcd: m("quay.io/coreos/etcd:v3.2.18"), Etcd: m("quay.io/coreos/etcd:v3.2.18"),
Kubernetes: m("rancher/hyperkube:v1.11.1-rancher1"), Kubernetes: m("rancher/hyperkube:v1.11.1-rancher1"),
Alpine: m("rancher/rke-tools:v0.1.10"), Alpine: m("rancher/rke-tools:v0.1.11"),
NginxProxy: m("rancher/rke-tools:v0.1.10"), NginxProxy: m("rancher/rke-tools:v0.1.11"),
CertDownloader: m("rancher/rke-tools:v0.1.10"), CertDownloader: m("rancher/rke-tools:v0.1.11"),
KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.10"), KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.11"),
KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.10"), 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"), 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"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.10"),
@@ -241,7 +293,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"),
Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"),
}, },
@@ -317,7 +369,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
}, },
"v1.8.11-rancher1": { "v1.8.11-rancher1": {
@@ -342,7 +394,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
}, },
"v1.8.11-rancher2-1": { "v1.8.11-rancher2-1": {
@@ -367,7 +419,7 @@ var (
WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveNode: m("weaveworks/weave-kube:2.1.2"),
WeaveCNI: m("weaveworks/weave-npc:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"),
PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"),
Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"),
IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"),
}, },
} }

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

@@ -42,7 +42,6 @@ type LoggingCommonSpec struct {
OutputFlushInterval int `json:"outputFlushInterval,omitempty" norman:"default=3"` OutputFlushInterval int `json:"outputFlushInterval,omitempty" norman:"default=3"`
OutputTags map[string]string `json:"outputTags,omitempty"` OutputTags map[string]string `json:"outputTags,omitempty"`
DockerRootDir string `json:"dockerRootDir" norman:"default=/var/lib/docker/containers"`
ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty"` ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty"`
SplunkConfig *SplunkConfig `json:"splunkConfig,omitempty"` SplunkConfig *SplunkConfig `json:"splunkConfig,omitempty"`
KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty"` KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty"`