diff --git a/vendor.conf b/vendor.conf index 86176b38..42bb23f1 100644 --- a/vendor.conf +++ b/vendor.conf @@ -26,4 +26,4 @@ github.com/Microsoft/go-winio ab35fc04b6365e8fcb18e6e9e41ea4a02b10b17 github.com/go-ini/ini 06f5f3d67269ccec1fe5fe4134ba6e982984f7f5 github.com/rancher/norman ff60298f31f081b06d198815b4c178a578664f7d -github.com/rancher/types e68cd7ed66e08a066db9175d7af2288ed5c1844c +github.com/rancher/types 3edc47e40408d2b800a4ca2ca4fdcf7ee68021a9 diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go index 17de0ce9..e0b230bd 100644 --- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go +++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/cluster_types.go @@ -200,6 +200,8 @@ type AzureKubernetesServiceConfig struct { VirtualNetwork string `json:"virtualNetwork,omitempty"` // Subnet to use for the AKS Cluster (must be within the virtual network) Subnet string `json:"subnet,omitempty"` + // The resource group that the virtual network is in. If omited it is assumed to match the resource group of the cluster + VirtualNetworkResourceGroup string `json:"virtualNetworkResourceGroup,omitempty"` } type AmazonElasticContainerServiceConfig struct { 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 4e5974c3..45d22f69 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 @@ -3,7 +3,7 @@ package v3 import "github.com/rancher/types/image" const ( - DefaultK8s = "v1.10.3-rancher2-1" + DefaultK8s = "v1.10.5-rancher1-1" ) var ( @@ -261,6 +261,31 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, + "v1.10.5-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.10.5-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.10"), + NginxProxy: m("rancher/rke-tools:v0.1.10"), + CertDownloader: m("rancher/rke-tools:v0.1.10"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.10"), + 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.10.2-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + }, } // K8sVersionServiceOptions - service options per k8s version @@ -300,7 +325,7 @@ var ( PluginsDocker: m("plugins/docker:17.12"), }, LoggingSystemImages: LoggingSystemImages{ - Fluentd: m("rancher/fluentd:v0.1.8"), + Fluentd: m("rancher/fluentd:v0.1.9"), FluentdHelper: m("rancher/fluentd-helper:v0.1.2"), LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.3"), Elaticsearch: m("quay.io/pires/docker-elasticsearch-kubernetes:5.6.2"),